From 75b49bf09e9d780ff7ef6ff225198640e90c485e Mon Sep 17 00:00:00 2001 From: saller Date: Fri, 3 Nov 2023 14:52:37 +0800 Subject: [PATCH] fix(comp:text): text component should inherit attrs (#1731) --- packages/components/text/demo/Maxheight.md | 14 +++++++++++ packages/components/text/demo/Maxheight.vue | 27 +++++++++++++++++++++ packages/components/text/src/Text.tsx | 4 +-- 3 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 packages/components/text/demo/Maxheight.md create mode 100644 packages/components/text/demo/Maxheight.vue diff --git a/packages/components/text/demo/Maxheight.md b/packages/components/text/demo/Maxheight.md new file mode 100644 index 000000000..35ccf06a9 --- /dev/null +++ b/packages/components/text/demo/Maxheight.md @@ -0,0 +1,14 @@ +--- +order: 20 +title: + zh: 最大高度 + en: Max height +--- + +## zh + +可以通过样式覆盖修改最大高度,实现内容纵向滚动 + +## en + +Overwrite style of text component to make text content vertially scrollalbe with max height. diff --git a/packages/components/text/demo/Maxheight.vue b/packages/components/text/demo/Maxheight.vue new file mode 100644 index 000000000..1f7fbeebf --- /dev/null +++ b/packages/components/text/demo/Maxheight.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/packages/components/text/src/Text.tsx b/packages/components/text/src/Text.tsx index 3f4a5ca2c..b6a8eb159 100644 --- a/packages/components/text/src/Text.tsx +++ b/packages/components/text/src/Text.tsx @@ -34,9 +34,8 @@ const rowMeasureElementStyle = { export default defineComponent({ name: 'IxText', - inheritAttrs: false, props: textProps, - setup(props, { attrs, slots }) { + setup(props, { slots }) { const common = useGlobalConfig('common') const config = useGlobalConfig('text') const mergedPrefixCls = computed(() => `${common.prefixCls}-text`) @@ -129,7 +128,6 @@ export default defineComponent({ class={`${prefixCls}-inner`} title={isNative && isEllipsis.value ? getStringBySlot(titleSlot) : undefined} onClick={expandable.value && !hasExpandIcon ? toggleExpanded : undefined} - {...attrs} > {!isSimple.value && isEllipsis.value && !expanded.value && measureStatus.value === 'none' ? renderClampedContent(contentNodes)