zmdms-webui 2.0.0 → 2.0.1

package/dist/es/table/utils.js

@@ -461,10 +461,9 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
     var result = isDimensionDynamic
         ? sortByDimensions(__spreadArray([], records, true), mergeKeys)
         : __spreadArray([], records, true);
-    // 1. 如果开启了维度合并，按 mergeKeys 的最后一位来计算合计值
+    // 1. 如果开启了维度合并，按所有 mergeKeys 的组合来计算合计值
     if (isDimensionDynamic && mergeKeys.length > 0) {
-        var lastMergeKey = mergeKeys[mergeKeys.length - 1];
-        var groupedResult = groupByLastMergeKey(result, lastMergeKey, summaryKeys);
+        var groupedResult = groupByLastMergeKey(result, mergeKeys, summaryKeys);
         result = groupedResult;
     }
     // 2. 首先插入维度合计行
@@ -711,19 +710,24 @@ function hasParentGroupChanged(records, currentIndex, mergeKeys, currentKeyIndex
     return false;
 }
 /**
- * 按最后一个合并键进行分组并计算合计值
+ * 按所有合并键的组合进行分组并计算合计值
+ * 确保相同维度组合的记录被正确分组
  */
-function groupByLastMergeKey(records, lastMergeKey, summaryKeys) {
+function groupByLastMergeKey(records, mergeKeys, // 改为传入所有合并键
+summaryKeys) {
     var groups = new Map();
-    // 按最后一个合并键分组
-    for (var _i = 0, records_2 = records; _i < records_2.length; _i++) {
-        var record = records_2[_i];
-        var key = record[lastMergeKey];
-        var keyStr = String(key);
+    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 = [];
@@ -734,9 +738,12 @@ function groupByLastMergeKey(records, lastMergeKey, summaryKeys) {
         if (items.length > 0) {
             Object.assign(summaryRow, items[0]);
         }
-        // 设置最后一个合并键的值
-        summaryRow[lastMergeKey] = keyStr;
-        var _loop_6 = function (summaryKey) {
+        // 设置所有合并键的值
+        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) {
@@ -747,7 +754,7 @@ function groupByLastMergeKey(records, lastMergeKey, summaryKeys) {
         // 计算合计值
         for (var _d = 0, summaryKeys_2 = summaryKeys; _d < summaryKeys_2.length; _d++) {
             var summaryKey = summaryKeys_2[_d];
-            _loop_6(summaryKey);
+            _loop_7(summaryKey);
         }
         result.push(summaryRow);
     }

package/package.json

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