Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(@vben/common-ui): text omission component expansion exception #4139

Merged
merged 2 commits into from
Aug 13, 2024
Merged

fix(@vben/common-ui): text omission component expansion exception #4139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a1dd2e
fix(@vben/common-ui): 修复文本省略组件展开异常
wangjue666 Aug 13, 2024
2702894
chore: 增加点击展开切换的测试
wangjue666 Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/effects/common-ui/src/components/ellipsis-text/__tests__/ellipsis-text.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,16 @@ describe('ellipsis-text.vue', () => {
default: 'This is a very long text that should be truncated.',
},
});

const ellipsis = wrapper.find('.truncate');

// 点击 ellipsis，应该触发 expandChange，参数为 false
await ellipsis.trigger('click');
expect(wrapper.emitted('expandChange')).toBeTruthy();
expect(wrapper.emitted('expandChange')?.[0]).toEqual([true]);

// 再次点击，应该触发 expandChange，参数为 false
await ellipsis.trigger('click');
expect(wrapper.emitted('expandChange')?.length).toBe(2);
expect(wrapper.emitted('expandChange')?.[1]).toEqual([false]);
});
});
34 changes: 11 additions & 23 deletions packages/effects/common-ui/src/components/ellipsis-text/ellipsis-text.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { computed, type CSSProperties, nextTick, ref, watchEffect } from 'vue';
import { computed, type CSSProperties, ref, watchEffect } from 'vue';

import { VbenTooltip } from '@vben-core/shadcn-ui';

Expand Down Expand Up @@ -72,12 +72,10 @@ const textMaxWidth = computed(() => {
}
return props.maxWidth;
});
const showTooltip = ref(false);
const ellipsis = ref();
const isExpand = ref(false);
const defaultTooltipMaxWidth = ref();
watchEffect(() => {
showTooltip.value = props.tooltip;
});

watchEffect(
() => {
if (props.tooltip && ellipsis.value) {
Expand All @@ -88,25 +86,12 @@ watchEffect(
{ flush: 'post' },
);
function onExpand() {
const { style } = ellipsis.value;
const isExpanded = !style['-webkit-line-clamp'];
if (props.tooltip) {
showTooltip.value = !isExpanded;
}

nextTick(() => {
style['-webkit-line-clamp'] = isExpanded ? props.line : '';
});

emit('expandChange', !isExpanded);
isExpand.value = !isExpand.value;
emit('expandChange', isExpand.value);
}

function handleExpand() {
if (props.expand) {
onExpand();
} else {
return false;
}
props.expand && onExpand();
}
</script>
<template>
Expand All @@ -118,7 +103,7 @@ function handleExpand() {
color: tooltipColor,
backgroundColor: tooltipBackgroundColor,
}"
:disabled="!showTooltip"
:disabled="!props.tooltip || isExpand"
:side="placement"
>
<slot name="tooltip">
Expand All @@ -133,7 +118,10 @@ function handleExpand() {
['inline-block truncate']: line === 1,
[$style.ellipsisMultiLine]: line > 1,
}"
:style="`-webkit-line-clamp: ${line}; max-width: ${textMaxWidth};`"
:style="{
'-webkit-line-clamp': isExpand ? '' : line,
'max-width': textMaxWidth,
}"
class="cursor-text overflow-hidden"
@click="handleExpand"
v-bind="$attrs"
Expand Down
Loading