From 403ec7cfa3cb0286ac8b80f435e59a4ac01491e4 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Thu, 9 Nov 2023 11:31:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(Table->=20CustomerCell):=20helpMessage?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BC=A0=E9=80=92=20tsx=20=E5=92=8C=20h?=
=?UTF-8?q?=E5=87=BD=E6=95=B0=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Basic/src/BasicHelp.vue | 8 +++++---
src/components/Table/src/types/table.ts | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/components/Basic/src/BasicHelp.vue b/src/components/Basic/src/BasicHelp.vue
index 2076e030..e2182c18 100644
--- a/src/components/Basic/src/BasicHelp.vue
+++ b/src/components/Basic/src/BasicHelp.vue
@@ -1,5 +1,5 @@
<script lang="tsx">
-import type { CSSProperties } from 'vue'
+import type { CSSProperties, PropType, VNodeChild } from 'vue'
import { computed, defineComponent, unref } from 'vue'
import { Tooltip } from 'ant-design-vue'
import { InfoCircleOutlined } from '@ant-design/icons-vue'
@@ -35,7 +35,9 @@ const props = {
/**
* Help text list
*/
- text: { type: [Array, String] as PropType<string[] | string> },
+ text: {
+ type: [Array, String, Object] as PropType<string[] | string | VNodeChild | JSX.Element>,
+ },
}
export default defineComponent({
@@ -65,7 +67,7 @@ export default defineComponent({
)
})
}
- return null
+ return <div>{textList}</div>
}
return () => {
diff --git a/src/components/Table/src/types/table.ts b/src/components/Table/src/types/table.ts
index 7913b864..4526f746 100644
--- a/src/components/Table/src/types/table.ts
+++ b/src/components/Table/src/types/table.ts
@@ -438,7 +438,7 @@ export interface BasicColumn extends ColumnProps<Recordable> {
defaultHidden?: boolean
// Help text for table column header
- helpMessage?: string | string[]
+ helpMessage?: string | string[] | VNodeChild | JSX.Element
format?: CellFormat