@a2simcode/ui 0.0.264 → 0.0.265

package/dist/components/table/index.d.ts

@@ -4,6 +4,10 @@ declare const JTable: {
             type: StringConstructor;
             default: string;
         };
+        label: {
+            type: StringConstructor;
+            default: string;
+        };
         modelValue: {
             type: import('vue').PropType<Record<string, any>[]>;
             default: () => never[];
@@ -152,6 +156,10 @@ declare const JTable: {
             type: import('vue').PropType<(record: Record<string, any>) => Promise<any[]>>;
             default: null;
         };
+        customMergeCell: {
+            type: import('vue').PropType<import('.').CustomMergeCellOption>;
+            default: null;
+        };
     }>> & Readonly<{
         "onUpdate:modelValue"?: ((value: Record<string, any>[]) => any) | undefined;
         onChange?: ((data: {
@@ -210,6 +218,7 @@ declare const JTable: {
             page: number;
         }) => any;
     }, import('vue').PublicProps, {
+        label: string;
         id: string;
         modelValue: Record<string, any>[];
         rowNum: number;
@@ -255,6 +264,7 @@ declare const JTable: {
         isSubShowNumber: boolean;
         subActions: import('..').ButtonCompType[];
         loadChildren: (record: Record<string, any>) => Promise<any[]>;
+        customMergeCell: import('.').CustomMergeCellOption;
     }, true, {}, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, {
         tableContainer: HTMLDivElement;
     }, HTMLDivElement, import('vue').ComponentProvideOptions, {
@@ -269,6 +279,10 @@ declare const JTable: {
             type: StringConstructor;
             default: string;
         };
+        label: {
+            type: StringConstructor;
+            default: string;
+        };
         modelValue: {
             type: import('vue').PropType<Record<string, any>[]>;
             default: () => never[];
@@ -417,6 +431,10 @@ declare const JTable: {
             type: import('vue').PropType<(record: Record<string, any>) => Promise<any[]>>;
             default: null;
         };
+        customMergeCell: {
+            type: import('vue').PropType<import('.').CustomMergeCellOption>;
+            default: null;
+        };
     }>> & Readonly<{
         "onUpdate:modelValue"?: ((value: Record<string, any>[]) => any) | undefined;
         onChange?: ((data: {
@@ -450,6 +468,7 @@ declare const JTable: {
         setSelection: (records: any[]) => void;
         renderTable: () => void;
     }, {}, {}, {}, {
+        label: string;
         id: string;
         modelValue: Record<string, any>[];
         rowNum: number;
@@ -495,6 +514,7 @@ declare const JTable: {
         isSubShowNumber: boolean;
         subActions: import('..').ButtonCompType[];
         loadChildren: (record: Record<string, any>) => Promise<any[]>;
+        customMergeCell: import('.').CustomMergeCellOption;
     }>;
     __isFragment?: never;
     __isTeleport?: never;
@@ -504,6 +524,10 @@ declare const JTable: {
         type: StringConstructor;
         default: string;
     };
+    label: {
+        type: StringConstructor;
+        default: string;
+    };
     modelValue: {
         type: import('vue').PropType<Record<string, any>[]>;
         default: () => never[];
@@ -652,6 +676,10 @@ declare const JTable: {
         type: import('vue').PropType<(record: Record<string, any>) => Promise<any[]>>;
         default: null;
     };
+    customMergeCell: {
+        type: import('vue').PropType<import('.').CustomMergeCellOption>;
+        default: null;
+    };
 }>> & Readonly<{
     "onUpdate:modelValue"?: ((value: Record<string, any>[]) => any) | undefined;
     onChange?: ((data: {
@@ -710,6 +738,7 @@ declare const JTable: {
         page: number;
     }) => any;
 }, string, {
+    label: string;
     id: string;
     modelValue: Record<string, any>[];
     rowNum: number;
@@ -755,6 +784,7 @@ declare const JTable: {
     isSubShowNumber: boolean;
     subActions: import('..').ButtonCompType[];
     loadChildren: (record: Record<string, any>) => Promise<any[]>;
+    customMergeCell: import('.').CustomMergeCellOption;
 }, {}, string, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, import('vue').ComponentProvideOptions> & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps & {
     install: (app: import('vue').App) => void;
 };

package/dist/components/table/src/interface.d.ts

@@ -1,4 +1,42 @@
 import { BaseSchemaConfig, BaseCompConfig } from '../../comp/src/interface';
+/**
+ * @zh 合并单元格配置类型
+ */
+export type MergeCellOption = boolean | ((v1: unknown, v2: unknown, info: {
+    source: {
+        col: number;
+        row: number;
+    };
+    target: {
+        col: number;
+        row: number;
+    };
+    table: any;
+}) => boolean);
+/**
+ * @zh 自定义合并单元格规则
+ */
+export interface CustomMergeCellRule {
+    /** 合并单元格内的文字 */
+    text?: string;
+    /** 合并的范围 */
+    range: {
+        start: {
+            col: number;
+            row: number;
+        };
+        end: {
+            col: number;
+            row: number;
+        };
+    };
+    /** 合并单元格的样式 */
+    style?: Record<string, any>;
+}
+/**
+ * @zh 自定义合并单元格配置类型
+ */
+export type CustomMergeCellOption = CustomMergeCellRule[] | ((col: number, row: number, table: any) => CustomMergeCellRule | undefined);
 export interface TableColumnConfig {
     /**
      * @zh 列的宽度
@@ -52,6 +90,10 @@ export interface TableColumnConfig {
      * @zh 冻结列 left 左侧冻结 right 右侧冻结
      */
     frozen?: 'left' | 'right';
+    /**
+     * @zh 合并单元格配置，为 true 时自动合并相邻相同值的单元格，也可传入自定义合并函数
+     */
+    mergeCell?: MergeCellOption;
 }
 export type TableColumnCompConfig = TableColumnConfig & BaseCompConfig;
 export interface TableColumnFilter {

package/dist/components/table/src/table.vue.d.ts

@@ -1,4 +1,4 @@
-import { ColumnSchemaConfig } from './interface';
+import { ColumnSchemaConfig, CustomMergeCellOption } from './interface';
 import { ButtonCompType } from '../../buttons/src/interface';
 import { EditConfigType } from '../../input-rows/src/interface';
 import { PropType } from 'vue';
@@ -7,6 +7,10 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         type: StringConstructor;
         default: string;
     };
+    label: {
+        type: StringConstructor;
+        default: string;
+    };
     /**
      * @zh 输入值【作为表单的编辑表格使用】
      * @vModel
@@ -261,6 +265,13 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         type: PropType<(record: Record<string, any>) => Promise<any[]>>;
         default: null;
     };
+    /**
+     * @zh 自定义合并单元格配置，支持回调函数或合并规则数组
+     */
+    customMergeCell: {
+        type: PropType<CustomMergeCellOption>;
+        default: null;
+    };
 }>, {
     getInstance: () => any;
     setRecords: (records: Record<string, any>[]) => void;
@@ -298,6 +309,10 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         type: StringConstructor;
         default: string;
     };
+    label: {
+        type: StringConstructor;
+        default: string;
+    };
     /**
      * @zh 输入值【作为表单的编辑表格使用】
      * @vModel
@@ -552,6 +567,13 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         type: PropType<(record: Record<string, any>) => Promise<any[]>>;
         default: null;
     };
+    /**
+     * @zh 自定义合并单元格配置，支持回调函数或合并规则数组
+     */
+    customMergeCell: {
+        type: PropType<CustomMergeCellOption>;
+        default: null;
+    };
 }>> & Readonly<{
     "onUpdate:modelValue"?: ((value: Record<string, any>[]) => any) | undefined;
     onChange?: ((data: {
@@ -578,6 +600,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         page: number;
     }) => any) | undefined;
 }>, {
+    label: string;
     id: string;
     modelValue: Record<string, any>[];
     rowNum: number;
@@ -623,6 +646,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     isSubShowNumber: boolean;
     subActions: ButtonCompType[];
     loadChildren: (record: Record<string, any>) => Promise<any[]>;
+    customMergeCell: CustomMergeCellOption;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {
     tableContainer: HTMLDivElement;
 }, HTMLDivElement>;