zmdms-webui 1.7.9 → 1.8.0

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;

package/package.json

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