Browse Source

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

invalid w 1 year ago
parent
commit
c373ffd3bf
2 changed files with 6 additions and 4 deletions
  1. 5 3
      src/components/Basic/src/BasicHelp.vue
  2. 1 1
      src/components/Table/src/types/table.ts

+ 5 - 3
src/components/Basic/src/BasicHelp.vue

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

+ 1 - 1
src/components/Table/src/types/table.ts

@@ -440,7 +440,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;