zmdms-webui 1.9.9 → 2.0.1

package/dist/es/table/excel.js

@@ -441,9 +441,8 @@ function applyExcelStyles(worksheet, data, numKeys, columns, headerRowCount, has
     };
     var descriptionStyle = {
         font: {
-            bold: true,
             size: 11,
-            color: { argb: "FF2E5BBA" },
+            color: { argb: "FF374151" },
             name: "微软雅黑",
         },
         alignment: {
@@ -453,15 +452,15 @@ function applyExcelStyles(worksheet, data, numKeys, columns, headerRowCount, has
             indent: 1,
         },
         border: {
-            top: { style: "thin", color: { argb: "FFE6E6E6" } },
-            bottom: { style: "thin", color: { argb: "FFE6E6E6" } },
-            left: { style: "thin", color: { argb: "FFE6E6E6" } },
-            right: { style: "thin", color: { argb: "FFE6E6E6" } },
+            top: { style: "thin", color: { argb: "FFE5E7EB" } },
+            bottom: { style: "thin", color: { argb: "FFE5E7EB" } },
+            left: { style: "thin", color: { argb: "FFE5E7EB" } },
+            right: { style: "thin", color: { argb: "FFE5E7EB" } },
         },
         fill: {
             type: "pattern",
             pattern: "solid",
-            fgColor: { argb: "FFF8F9FA" },
+            fgColor: { argb: "FFFFFFFF" },
         },
     };
     var totalCols = Math.max(1, (columns === null || columns === void 0 ? void 0 : columns.length) || 1);

package/dist/es/table/utils.js

@@ -447,6 +447,7 @@ function startColumnInsertTableData(options) {
  * @param mergeKeys 合并字段
  * @param dimensionSummaryKeys 维度合计字段
  * @param summaryKeys 合计字段
+ * @param isDimensionDynamic 维度合并
  */
 function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic) {
     var _a;
@@ -460,7 +461,12 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
     var result = isDimensionDynamic
         ? sortByDimensions(__spreadArray([], records, true), mergeKeys)
         : __spreadArray([], records, true);
-    // 1. 首先插入维度合计行
+    // 1. 如果开启了维度合并，按所有 mergeKeys 的组合来计算合计值
+    if (isDimensionDynamic && mergeKeys.length > 0) {
+        var groupedResult = groupByLastMergeKey(result, mergeKeys, summaryKeys);
+        result = groupedResult;
+    }
+    // 2. 首先插入维度合计行
     if (dimensionSummaryKeys &&
         dimensionSummaryKeys.length > 0 &&
         summaryKeys &&
@@ -468,11 +474,11 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
         result = insertDimensionSummaryRows(result, mergeKeys, // 传入完整的维度字段列表
         dimensionSummaryKeys, summaryKeys);
     }
-    // 2. 为每行初始化合并信息
+    // 3. 为每行初始化合并信息
     for (var i = 0; i < result.length; i++) {
         result[i] = __assign(__assign({}, result[i]), (_a = {}, _a[MERGE_ROW_SPANS] = {}, _a[MERGE_KEY] = Date.now() + Math.floor(Math.random() * 100000), _a[MERGE_INDEX] = -1, _a));
     }
-    // 3. 按层级处理每个合并字段
+    // 4. 按层级处理每个合并字段
     for (var keyIndex = 0; keyIndex < mergeKeys.length; keyIndex++) {
         var currentKey = mergeKeys[keyIndex];
         // 找出所有需要处理的分组起始点
@@ -522,7 +528,7 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
             }
         }
     }
-    // 4. 最后统一计算MERGE_INDEX（合并后的逻辑行号）
+    // 5. 最后统一计算MERGE_INDEX（合并后的逻辑行号）
     var logicalRowIndex = 0;
     var _loop_2 = function (i) {
         // 检查当前行是否是被合并的行（不是第一行）
@@ -702,6 +708,57 @@ function hasParentGroupChanged(records, currentIndex, mergeKeys, currentKeyIndex
         }
     }
     return false;
+}
+/**
+ * 按所有合并键的组合进行分组并计算合计值
+ * 确保相同维度组合的记录被正确分组
+ */
+function groupByLastMergeKey(records, mergeKeys, // 改为传入所有合并键
+summaryKeys) {
+    var groups = new Map();
+    var _loop_6 = function (record) {
+        var key = mergeKeys.map(function (k) { return record[k]; });
+        var keyStr = JSON.stringify(key);
+        if (!groups.has(keyStr)) {
+            groups.set(keyStr, []);
+        }
+        groups.get(keyStr).push(record);
+    };
+    // 按所有合并键的组合进行分组
+    for (var _i = 0, records_2 = records; _i < records_2.length; _i++) {
+        var record = records_2[_i];
+        _loop_6(record);
+    }
+    // 为每个分组创建合计行
+    var result = [];
+    for (var _a = 0, _b = Array.from(groups.entries()); _a < _b.length; _a++) {
+        var _c = _b[_a], keyStr = _c[0], items = _c[1];
+        var summaryRow = {};
+        // 复制第一条记录的所有字段作为基础
+        if (items.length > 0) {
+            Object.assign(summaryRow, items[0]);
+        }
+        // 设置所有合并键的值
+        var keyValues = JSON.parse(keyStr);
+        for (var i = 0; i < mergeKeys.length; i++) {
+            summaryRow[mergeKeys[i]] = keyValues[i];
+        }
+        var _loop_7 = function (summaryKey) {
+            summaryRow[summaryKey] = items
+                .filter(function (item) { return !isSummaryRow(item); }) // 排除已有的合计行
+                .reduce(function (sum, item) {
+                var value = parseFloat(item[summaryKey]) || 0;
+                return plus(sum, value);
+            }, 0);
+        };
+        // 计算合计值
+        for (var _d = 0, summaryKeys_2 = summaryKeys; _d < summaryKeys_2.length; _d++) {
+            var summaryKey = summaryKeys_2[_d];
+            _loop_7(summaryKey);
+        }
+        result.push(summaryRow);
+    }
+    return result;
 }
 
 export { copyColData, flattenRecordsOptimized, getFilterRecords, getNextColumn, getTableColumns, parsePasteData, startColumnInsertTableData };

package/package.json

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