zuaa
/
vue-vben-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(Table-> CustomerCell): helpMessage支持传递 tsx 和 h函数的数据

This commit is contained in:
invalid w 2023-11-07 11:16:52 +08:00
parent f91d777e4f
commit c373ffd3bf
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/Basic/src/BasicHelp.vue
View File

@ -1,5 +1,5 @@
<script lang="tsx"> <script lang="tsx">
import type { CSSProperties, PropType } from 'vue'; import type { CSSProperties, PropType, VNodeChild } from 'vue';
import { defineComponent, computed, unref } from 'vue'; import { defineComponent, computed, unref } from 'vue';
import { Tooltip } from 'ant-design-vue'; import { Tooltip } from 'ant-design-vue';
import { InfoCircleOutlined } from '@ant-design/icons-vue'; import { InfoCircleOutlined } from '@ant-design/icons-vue';
@ -36,7 +36,9 @@
/** /**
* Help text list * 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({ export default defineComponent({
@ -71,7 +73,7 @@
); );
}); });
} }
return null; return <div>{textList}</div>;
} }
return () => { return () => {

2
src/components/Table/src/types/table.ts
View File

@ -440,7 +440,7 @@ export interface BasicColumn extends ColumnProps<Recordable> {
defaultHidden?: boolean; defaultHidden?: boolean;
// Help text for table column header // Help text for table column header
helpMessage?: string | string[]; helpMessage?: string | string[] | VNodeChild | JSX.Element;
format?: CellFormat; format?: CellFormat;