zmdms-webui 1.7.9 → 1.8.1

package/dist/es/table/hooks.js

@@ -335,9 +335,9 @@ function useCalcScrollY(isAutoScrollY, subHeight, id) {
 var useMergeKeys = function (columns, isAutoMerge) {
     var mergeKeys = useMemo(function () {
         if (isAutoMerge) {
-            return columns
+            return Array.from(new Set(columns
                 .filter(function (item) { return item.isMerge && item.key !== MERGE_INDEX; })
-                .map(function (item) { return item.key; });
+                .map(function (item) { return item.mergeKey || item.key; })));
         }
         return undefined;
     }, [isAutoMerge, columns]);
@@ -407,7 +407,7 @@ function useAutoMerge(dataSource, columns, _a) {
             if (isAutoMerge && item.isMerge) {
                 item.onCell = function (record) {
                     var _a;
-                    var key = item.key;
+                    var key = item.mergeKey || item.key;
                     if (item.key === MERGE_INDEX) {
                         key = firstMergeKey;
                     }

package/dist/es/table/interface.d.ts

@@ -215,6 +215,10 @@ interface IColumnType<RecordType> extends Omit<ColumnType<RecordType>, "render">
      * 开启合计
      */
     isSummary?: boolean;
+    /**
+     * 开启合并的字段,按其他字段维度合并
+     */
+    mergeKey?: string;
 }
 interface IRenderOptions {
     insertTableFromClipboard: IFuncInsertTableFromClipboard;
@@ -235,9 +239,9 @@ interface IFuncInsertTableFromClipboard {
     (e: any, options: IInserTableFromClipboard): Promise<IFuncInsertTableFromClipboardReturn>;
 }
 interface IColumnGroupType<RecordType> extends Omit<IColumnType<RecordType>, "dataIndex"> {
-    children: IColumnsType<RecordType>;
+    children?: IColumnsType<RecordType>;
 }
-type IColumnsTypeProp<RecordType> = IColumnGroupType<RecordType> | IColumnType<RecordType>;
+type IColumnsTypeProp<RecordType> = IColumnGroupType<RecordType>;
 declare type IColumnsType<RecordType = unknown> = IColumnsTypeProp<RecordType>[];
 interface ITableRefHandel {
     /**

package/dist/es/table/useParseColumns.js

@@ -1,3 +1,4 @@
+import { __assign } from '../_virtual/_tslib.js';
 import { useMemo } from 'react';
 
 /**
@@ -8,7 +9,11 @@ function useParseColumns(columns) {
     return useMemo(function () {
         var newColumns = [];
         if (columns) {
-            columns === null || columns === void 0 ? void 0 : columns.forEach(function (item) {
+            columns === null || columns === void 0 ? void 0 : columns.forEach(function (_item) {
+                var item = __assign({}, _item);
+                if (item.children) {
+                    item.children = item.children.filter(function (child) { return child.isDisplay !== false; });
+                }
                 if (item.isDisplay !== false) {
                     newColumns.push(item);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "1.7.9",
+  "version": "1.8.1",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",