zmdms-webui 2.6.8 → 2.7.0

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

@@ -128,7 +128,7 @@ var useCopyToClipboard = function (params) {
             return;
         var handleKeyDown = function (e) {
             // 检查是否为复制快捷键且有选中的单元格
-            if ((e.ctrlKey || e.metaKey) && e.key === "c" && cellSelection) {
+            if ((e.ctrlKey || e.metaKey) && e.code === "KeyC" && cellSelection) {
                 // 检查当前焦点是否在表格容器内，或者事件目标是否在表格容器内
                 var isInContainer = container.contains(document.activeElement) ||
                     container.contains(e.target);

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 { exactRound, addThousedSeparator, plus } from 'zmdms-utils';
+import { plus, exactRound, addThousedSeparator } from 'zmdms-utils';
 import '../../node_modules/exceljs/dist/exceljs.min.js';
 import 'dayjs';
 import { getAllLeafColumns } from '../utils/columnHelpers.js';
@@ -22,61 +22,40 @@ 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) {
-                // 优先使用自定义合计计算回调
-                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);
-                        }
+                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);
                     }
-                    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);
-                        }
+                });
+                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] = formattedSum;
                 }
+                summaryRecord[dataIndex] = formattedSum;
             }
             else if (colIndex === firstColIndex) {
                 // 第一列显示"合计"（可以是序号列、选择框列或数据列）
@@ -86,6 +65,12 @@ 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/table/excel.js

@@ -3,7 +3,7 @@ import ExcelJS from '../node_modules/exceljs/dist/exceljs.min.js';
 import { useMergeKeys, useNumKeys, useDateKeys } from './hooks.js';
 import { useMemoizedFn } from 'ahooks';
 import { IS_SUMMARY, MERGE_ROW_SPANS } from './constant.js';
-import { exactRound } from 'zmdms-utils';
+import { plus, exactRound } from 'zmdms-utils';
 import dayjs from 'dayjs';
 
 // 内部常量，用于标记父数据
@@ -73,34 +73,17 @@ function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys,
         excelData.leafColumns.forEach(function (col, colIndex) {
             var key = col.dataIndex;
             if (col.isSummary) {
-                // 优先使用自定义合计计算回调
-                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;
+                // 默认计算逻辑：数值求和
+                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 = plus(total, n);
                 }
+                sumsByKey_1[key] = total;
             }
         });
         summaryRow = excelData.leafColumns.map(function (col, index) {
@@ -108,6 +91,9 @@ function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys,
                 return "合计";
             var key = col.dataIndex;
             if (col.isSummary && sumsByKey_1[key] !== undefined) {
+                if (col.totalCalcCallback) {
+                    sumsByKey_1[key] = col.totalCalcCallback(sumsByKey_1, processedData);
+                }
                 return sumsByKey_1[key];
             }
             return "";

package/package.json

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