zmdms-webui 2.6.6 → 2.6.8

package/dist/es/canvastable/hooks/useSummaryRow.js

@@ -5,7 +5,7 @@ import 'lodash/isEqual';
 import 'ahooks';
 import '../../node_modules/immutability-helper/index.js';
 import 'react/jsx-runtime';
-import { plus, exactRound, addThousedSeparator } from 'zmdms-utils';
+import { exactRound, addThousedSeparator, plus } from 'zmdms-utils';
 import '../../node_modules/exceljs/dist/exceljs.min.js';
 import 'dayjs';
 import { getAllLeafColumns } from '../utils/columnHelpers.js';
@@ -22,40 +22,61 @@ var useSummaryRow = function (params) {
         if (!hasSummary)
             return null;
         var summaryRecord = {};
-        // 原始值，为转为千分符的
-        var summaryOriginalValues = {};
         // 找到第一个列（包括序号列、选择框列）
         var firstColIndex = leafColumns.length > 0 ? 0 : -1;
         leafColumns.forEach(function (column, colIndex) {
             var dataIndex = column.dataIndex || column.key;
             if (column.isSummary) {
-                var calculatedSum = void 0;
-                // 默认计算逻辑：数值求和
-                var sum_1 = 0;
-                dataSource.forEach(function (record) {
-                    var value = record[dataIndex];
-                    var num = typeof value === "string" ? parseFloat(value) : value;
-                    if (!isNaN(num) &&
-                        num !== null &&
-                        num !== undefined &&
-                        !record[IS_SUMMARY]) {
-                        sum_1 = plus(sum_1, num);
+                // 优先使用自定义合计计算回调
+                if (column.totalCalcCallback) {
+                    // 提取该列的所有值（排除小计行）
+                    var columnValues_1 = [];
+                    dataSource.forEach(function (record) {
+                        if (!record[IS_SUMMARY]) {
+                            columnValues_1.push(record[dataIndex]);
+                        }
+                    });
+                    // 调用自定义计算回调
+                    // 第一个参数：该列所有值数组
+                    // 第二个参数：所有数据（可用于复杂计算）
+                    var calculatedValue = column.totalCalcCallback(columnValues_1, dataSource);
+                    var formattedValue = calculatedValue;
+                    // 应用格式化
+                    if (typeof calculatedValue === "number") {
+                        if (column.precision !== undefined) {
+                            formattedValue = exactRound(calculatedValue, column.precision);
+                        }
+                        if (column.thousand) {
+                            formattedValue = addThousedSeparator(formattedValue);
+                        }
                     }
-                });
-                calculatedSum = sum_1;
-                // 应用格式化（仅在没有自定义回调或回调返回数值时）
-                var formattedSum = calculatedSum;
-                summaryOriginalValues[dataIndex] = calculatedSum;
-                if (typeof calculatedSum === "number") {
-                    if (column.precision !== undefined) {
-                        formattedSum = exactRound(calculatedSum, column.precision);
-                        summaryOriginalValues[dataIndex] = calculatedSum;
-                    }
-                    if (column.thousand) {
-                        formattedSum = addThousedSeparator(formattedSum);
+                    summaryRecord[dataIndex] = formattedValue;
+                }
+                else {
+                    // 默认计算逻辑：数值求和
+                    var sum_1 = 0;
+                    dataSource.forEach(function (record) {
+                        var value = record[dataIndex];
+                        var num = typeof value === "string" ? parseFloat(value) : value;
+                        if (!isNaN(num) &&
+                            num !== null &&
+                            num !== undefined &&
+                            !record[IS_SUMMARY]) {
+                            sum_1 = plus(sum_1, num);
+                        }
+                    });
+                    // 应用格式化
+                    var formattedSum = sum_1;
+                    if (typeof sum_1 === "number") {
+                        if (column.precision !== undefined) {
+                            formattedSum = exactRound(sum_1, column.precision);
+                        }
+                        if (column.thousand) {
+                            formattedSum = addThousedSeparator(formattedSum);
+                        }
                     }
+                    summaryRecord[dataIndex] = formattedSum;
                 }
-                summaryRecord[dataIndex] = formattedSum;
             }
             else if (colIndex === firstColIndex) {
                 // 第一列显示"合计"（可以是序号列、选择框列或数据列）
@@ -65,12 +86,6 @@ var useSummaryRow = function (params) {
                 summaryRecord[dataIndex] = "";
             }
         });
-        leafColumns.forEach(function (column) {
-            if (column.totalCalcCallback) {
-                var dataIndex = column.dataIndex || column.key;
-                summaryRecord[dataIndex] = column.totalCalcCallback(summaryOriginalValues[dataIndex], summaryOriginalValues);
-            }
-        });
         summaryRecord[IS_SUMMARY] = true;
         return summaryRecord;
     }, [columns, dataSource]);

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/modal/useResizable.js

@@ -1,6 +1,7 @@
 import { __assign } from '../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
-import React__default, { useState, useRef, useCallback } from 'react';
+import React__default, { useState, useRef } from 'react';
+import { useMemoizedFn } from 'ahooks';
 
 var useResizable = function (options) {
     var isResize = options.isResize, _a = options.minWidth, minWidth = _a === void 0 ? 100 : _a, _b = options.minHeight, minHeight = _b === void 0 ? 100 : _b, maxWidth = options.maxWidth, maxHeight = options.maxHeight, _c = options.defaultWidth, defaultWidth = _c === void 0 ? "70%" : _c, _d = options.defaultHeight, defaultHeight = _d === void 0 ? "auto" : _d;
@@ -17,7 +18,7 @@ var useResizable = function (options) {
         startHeight: 0,
     });
     // 开始调整大小
-    var onResizeStart = useCallback(function (direction, e) {
+    var onResizeStart = useMemoizedFn(function (direction, e) {
         var _a;
         if (!isResize) {
             return;
@@ -42,9 +43,9 @@ var useResizable = function (options) {
         document.body.style.cursor = getCursor(direction);
         document.body.style.userSelect = "none";
         document.body.classList.add("ztxk-modal-resizing");
-    }, [isResize]);
+    });
     // 调整大小中
-    var onResizeMove = useCallback(function (e) {
+    var onResizeMove = useMemoizedFn(function (e) {
         var _a = resizingRef.current, direction = _a.direction, startX = _a.startX, startY = _a.startY, startWidth = _a.startWidth, startHeight = _a.startHeight;
         if (!direction) {
             return;
@@ -79,16 +80,16 @@ var useResizable = function (options) {
             width: newWidth,
             height: newHeight,
         });
-    }, [minWidth, minHeight, maxWidth, maxHeight]);
+    });
     // 结束调整大小
-    var onResizeEnd = useCallback(function () {
+    var onResizeEnd = useMemoizedFn(function () {
         resizingRef.current.direction = null;
         document.removeEventListener("mousemove", onResizeMove);
         document.removeEventListener("mouseup", onResizeEnd);
         document.body.style.cursor = "";
         document.body.style.userSelect = "";
         document.body.classList.remove("ztxk-modal-resizing");
-    }, [onResizeMove]);
+    });
     // 获取鼠标样式
     var getCursor = function (direction) {
         var cursorMap = {

package/dist/es/table/excel.js

@@ -73,16 +73,34 @@ function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys,
         excelData.leafColumns.forEach(function (col, colIndex) {
             var key = col.dataIndex;
             if (col.isSummary) {
-                var total = 0;
-                for (var i = 0; i < processedData.length; i++) {
-                    if (processedData[i][IS_SUMMARY])
-                        continue;
-                    var v = processedData[i][key];
-                    var n = typeof v === "number" ? v : Number(v);
-                    if (!isNaN(n))
-                        total += n;
+                // 优先使用自定义合计计算回调
+                if (col.totalCalcCallback) {
+                    // 提取该列的所有值（排除小计行）
+                    var columnValues = [];
+                    for (var i = 0; i < processedData.length; i++) {
+                        if (processedData[i][IS_SUMMARY])
+                            continue;
+                        columnValues.push(processedData[i][key]);
+                    }
+                    // 调用自定义计算回调
+                    // 第一个参数：该列所有值数组
+                    // 第二个参数：所有数据（可用于复杂计算）
+                    var calculatedValue = col.totalCalcCallback(columnValues, processedData);
+                    sumsByKey_1[key] = calculatedValue;
+                }
+                else {
+                    // 默认计算逻辑：数值求和
+                    var total = 0;
+                    for (var i = 0; i < processedData.length; i++) {
+                        if (processedData[i][IS_SUMMARY])
+                            continue;
+                        var v = processedData[i][key];
+                        var n = typeof v === "number" ? v : Number(v);
+                        if (!isNaN(n))
+                            total += n;
+                    }
+                    sumsByKey_1[key] = total;
                 }
-                sumsByKey_1[key] = total;
             }
         });
         summaryRow = excelData.leafColumns.map(function (col, index) {

package/package.json

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