Browse Source

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

main
xingyu 2 years ago
parent
commit
403ec7cfa3
  1. 8
      src/components/Basic/src/BasicHelp.vue
  2. 2
      src/components/Table/src/types/table.ts

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

@ -1,5 +1,5 @@
<script lang="tsx"> <script lang="tsx">
import type { CSSProperties } from 'vue' import type { CSSProperties, PropType, VNodeChild } from 'vue'
import { computed, defineComponent, unref } from 'vue' import { computed, defineComponent, 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'
@ -35,7 +35,9 @@ const props = {
/** /**
* 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({
@ -65,7 +67,7 @@ export default defineComponent({
) )
}) })
} }
return null return <div>{textList}</div>
} }
return () => { return () => {

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

@ -438,7 +438,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

Loading…
Cancel
Save