zmdms-webui 2.6.5 → 2.6.7

package/dist/es/dynamicsetting/dynamicDrawer.js

@@ -215,14 +215,15 @@ var DynamicDrawer = function (props, ref) {
         });
         newDynamicList[pIndex].children = changeCList;
         // 联动父元素
-        var allChildrenChecked = changeCList.length > 0 && changeCList.every(function (child) { return child.checked; });
-        changeCList.some(function (child) { return child.checked; });
-        if (allChildrenChecked) {
-            // 所有子元素都选中，父元素也选中
+        // const allChildrenChecked =
+        //   changeCList.length > 0 && changeCList.every((child) => child.checked);
+        var someChildrenChecked = changeCList.some(function (child) { return child.checked; });
+        if (someChildrenChecked) {
+            // 只要有子元素选中，父元素就应该是 checked = true
             newDynamicList[pIndex].checked = true;
         }
         else {
-            // 部分选中或全不选中，父元素取消选中（配合 indeterminate 显示半选状态）
+            // 所有子元素都不选中，父元素才取消选中
             newDynamicList[pIndex].checked = false;
         }
         setTempDynamicList(sortDynamicListByType(newDynamicList));

package/dist/es/table/utils.js

@@ -486,7 +486,8 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
         summaryKeys &&
         summaryKeys.length > 0) {
         result = insertDimensionSummaryRows(result, mergeKeys, // 传入完整的维度字段列表
-        dimensionSummaryKeys, summaryKeys);
+        dimensionSummaryKeys, summaryKeys, order, dimensionCustomSumKeys // 传入自定义合计配置
+        );
     }
     // 3. 为每行初始化合并信息
     for (var i = 0; i < result.length; i++) {
@@ -733,7 +734,8 @@ function sortByDimensions(records, dimensionKeys, order, columns) {
  */
 function insertDimensionSummaryRows(records, allDimensionKeys, // 完整的维度字段列表
 dimensionSummaryKeys, // 需要合计的维度字段
-summaryKeys, order // 排序配置
+summaryKeys, order, // 排序配置
+dimensionCustomSumKeys // 自定义合计配置
 ) {
     var result = __spreadArray([], records, true);
     // 按维度层级从深到浅处理
@@ -756,7 +758,8 @@ summaryKeys, order // 排序配置
             newResult.push.apply(newResult, group.items);
             // 创建合计行
             var summaryRow = createSummaryRow(group.items, group.key, groupingKeys, allDimensionKeys, // 传入完整的维度字段列表
-            summaryKeys, currentDimensionIndex);
+            summaryKeys, currentDimensionIndex, dimensionCustomSumKeys // 传入自定义合计配置
+            );
             newResult.push(summaryRow);
         }
         result = newResult;
@@ -793,7 +796,8 @@ function groupByDimensions(records, dimensionKeys) {
  */
 function createSummaryRow(items, groupKey, groupingKeys, // 当前分组使用的维度字段
 allDimensionKeys, // 完整的维度字段列表
-summaryKeys, summaryLevelIndex // 在完整维度列表中的索引
+summaryKeys, summaryLevelIndex, // 在完整维度列表中的索引
+dimensionCustomSumKeys // 自定义合计配置
 ) {
     var summaryRow = {};
     // 设置所有维度字段
@@ -825,6 +829,89 @@ summaryKeys, summaryLevelIndex // 在完整维度列表中的索引
         var summaryKey = summaryKeys_1[_i];
         _loop_5(summaryKey);
     }
+    // 处理dimensionCustomSumKeys的额外合并计算逻辑
+    if (dimensionCustomSumKeys && Array.isArray(dimensionCustomSumKeys)) {
+        var _loop_6 = function (customSumKey) {
+            if (typeof customSumKey === "string") {
+                // 如果是字符串，对指定字段进行合计
+                summaryRow[customSumKey] = items
+                    .filter(function (item) { return !isSummaryRow(item); }) // 排除已有的合计行
+                    .reduce(function (sum, item) {
+                    var value = parseFloat(item[customSumKey]) || 0;
+                    return plus(sum, value);
+                }, 0);
+            }
+            else if (typeof customSumKey === "object" && customSumKey.key) {
+                // 如果是对象，使用自定义的key和value函数
+                var key = customSumKey.key, valueFn_1 = customSumKey.value, _b = customSumKey.summaryType, summaryType = _b === void 0 ? "sum" : _b, computedSummary = customSumKey.computedSummary;
+                var filteredItems = items.filter(function (item) { return !isSummaryRow(item); }); // 排除已有的合计行
+                switch (summaryType) {
+                    case "sum":
+                        if (valueFn_1) {
+                            // 默认累加方式
+                            var customValues = filteredItems.map(function (item) {
+                                var result = valueFn_1(item);
+                                return typeof result === "number"
+                                    ? result
+                                    : parseFloat(result) || 0;
+                            });
+                            var customSum = customValues.reduce(function (sum, value) {
+                                return plus(sum, value);
+                            }, 0);
+                            summaryRow[key] = customSum;
+                        }
+                        break;
+                    case "first":
+                        if (valueFn_1) {
+                            // 使用第一条记录的值
+                            if (filteredItems.length > 0) {
+                                var result = valueFn_1(filteredItems[0]);
+                                summaryRow[key] =
+                                    typeof result === "number" ? result : parseFloat(result) || 0;
+                            }
+                            else {
+                                summaryRow[key] = 0;
+                            }
+                        }
+                        break;
+                    case "computed":
+                        // 使用自定义计算函数
+                        if (typeof computedSummary === "function") {
+                            var result = computedSummary(filteredItems, summaryRow);
+                            summaryRow[key] =
+                                typeof result === "number"
+                                    ? result
+                                    : parseFloat(result) || result;
+                        }
+                        else {
+                            console.warn("\u5B57\u6BB5 ".concat(key, " \u8BBE\u7F6E\u4E86 summaryType: 'computed' \u4F46\u6CA1\u6709\u63D0\u4F9B computedSummary \u51FD\u6570"));
+                            summaryRow[key] = 0;
+                        }
+                        break;
+                    default:
+                        console.warn("\u672A\u77E5\u7684 summaryType: ".concat(summaryType, "\uFF0C\u4F7F\u7528\u9ED8\u8BA4\u7684 sum \u65B9\u5F0F"));
+                        if (valueFn_1) {
+                            // 回退到默认的 sum 方式
+                            var defaultValues = filteredItems.map(function (item) {
+                                var result = valueFn_1(item);
+                                return typeof result === "number"
+                                    ? result
+                                    : parseFloat(result) || 0;
+                            });
+                            var defaultSum = defaultValues.reduce(function (sum, value) {
+                                return plus(sum, value);
+                            }, 0);
+                            summaryRow[key] = defaultSum;
+                            break;
+                        }
+                }
+            }
+        };
+        for (var _a = 0, dimensionCustomSumKeys_1 = dimensionCustomSumKeys; _a < dimensionCustomSumKeys_1.length; _a++) {
+            var customSumKey = dimensionCustomSumKeys_1[_a];
+            _loop_6(customSumKey);
+        }
+    }
     // 标记为合计行
     summaryRow[IS_SUMMARY] = true;
     return summaryRow;
@@ -858,7 +945,7 @@ function hasParentGroupChanged(records, currentIndex, mergeKeys, currentKeyIndex
 function groupByLastMergeKey(records, mergeKeys, // 改为传入所有合并键
 summaryKeys, dimensionCustomSumKeys) {
     var groups = new Map();
-    var _loop_6 = function (record) {
+    var _loop_7 = function (record) {
         var key = mergeKeys.map(function (k) { return record[k]; });
         var keyStr = JSON.stringify(key);
         if (!groups.has(keyStr)) {
@@ -869,7 +956,7 @@ summaryKeys, dimensionCustomSumKeys) {
     // 按所有合并键的组合进行分组
     for (var _i = 0, records_2 = records; _i < records_2.length; _i++) {
         var record = records_2[_i];
-        _loop_6(record);
+        _loop_7(record);
     }
     // 为每个分组创建合计行
     var result = [];
@@ -885,7 +972,7 @@ summaryKeys, dimensionCustomSumKeys) {
         for (var i = 0; i < mergeKeys.length; i++) {
             summaryRow[mergeKeys[i]] = keyValues[i];
         }
-        var _loop_7 = function (summaryKey) {
+        var _loop_8 = function (summaryKey) {
             summaryRow[summaryKey] = items
                 .filter(function (item) { return !isSummaryRow(item); }) // 排除已有的合计行
                 .reduce(function (sum, item) {
@@ -896,11 +983,11 @@ summaryKeys, dimensionCustomSumKeys) {
         // 计算合计值
         for (var _d = 0, summaryKeys_2 = summaryKeys; _d < summaryKeys_2.length; _d++) {
             var summaryKey = summaryKeys_2[_d];
-            _loop_7(summaryKey);
+            _loop_8(summaryKey);
         }
         // 处理dimensionCustomSumKeys的额外合并计算逻辑
         if (dimensionCustomSumKeys && Array.isArray(dimensionCustomSumKeys)) {
-            var _loop_8 = function (customSumKey) {
+            var _loop_9 = function (customSumKey) {
                 if (typeof customSumKey === "string") {
                     // 如果是字符串，对指定字段进行合计
                     summaryRow[customSumKey] = items
@@ -912,14 +999,14 @@ summaryKeys, dimensionCustomSumKeys) {
                 }
                 else if (typeof customSumKey === "object" && customSumKey.key) {
                     // 如果是对象，使用自定义的key和value函数
-                    var key = customSumKey.key, valueFn_1 = customSumKey.value, _f = customSumKey.summaryType, summaryType = _f === void 0 ? "sum" : _f, computedSummary = customSumKey.computedSummary;
+                    var key = customSumKey.key, valueFn_2 = customSumKey.value, _f = customSumKey.summaryType, summaryType = _f === void 0 ? "sum" : _f, computedSummary = customSumKey.computedSummary;
                     var filteredItems = items.filter(function (item) { return !isSummaryRow(item); }); // 排除已有的合计行
                     switch (summaryType) {
                         case "sum":
-                            if (valueFn_1) {
+                            if (valueFn_2) {
                                 // 默认累加方式
                                 var customValues = filteredItems.map(function (item) {
-                                    var result = valueFn_1(item);
+                                    var result = valueFn_2(item);
                                     return typeof result === "number"
                                         ? result
                                         : parseFloat(result) || 0;
@@ -931,10 +1018,10 @@ summaryKeys, dimensionCustomSumKeys) {
                             }
                             break;
                         case "first":
-                            if (valueFn_1) {
+                            if (valueFn_2) {
                                 // 使用第一条记录的值
                                 if (filteredItems.length > 0) {
-                                    var result_1 = valueFn_1(filteredItems[0]);
+                                    var result_1 = valueFn_2(filteredItems[0]);
                                     summaryRow[key] =
                                         typeof result_1 === "number"
                                             ? result_1
@@ -961,10 +1048,10 @@ summaryKeys, dimensionCustomSumKeys) {
                             break;
                         default:
                             console.warn("\u672A\u77E5\u7684 summaryType: ".concat(summaryType, "\uFF0C\u4F7F\u7528\u9ED8\u8BA4\u7684 sum \u65B9\u5F0F"));
-                            if (valueFn_1) {
+                            if (valueFn_2) {
                                 // 回退到默认的 sum 方式
                                 var defaultValues = filteredItems.map(function (item) {
-                                    var result = valueFn_1(item);
+                                    var result = valueFn_2(item);
                                     return typeof result === "number"
                                         ? result
                                         : parseFloat(result) || 0;
@@ -978,9 +1065,9 @@ summaryKeys, dimensionCustomSumKeys) {
                     }
                 }
             };
-            for (var _e = 0, dimensionCustomSumKeys_1 = dimensionCustomSumKeys; _e < dimensionCustomSumKeys_1.length; _e++) {
-                var customSumKey = dimensionCustomSumKeys_1[_e];
-                _loop_8(customSumKey);
+            for (var _e = 0, dimensionCustomSumKeys_2 = dimensionCustomSumKeys; _e < dimensionCustomSumKeys_2.length; _e++) {
+                var customSumKey = dimensionCustomSumKeys_2[_e];
+                _loop_9(customSumKey);
             }
         }
         result.push(summaryRow);

package/package.json

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