zmdms-webui 2.6.7 → 2.6.9

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

@@ -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,6 +73,7 @@ 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])
@@ -80,7 +81,7 @@ function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys,
                     var v = processedData[i][key];
                     var n = typeof v === "number" ? v : Number(v);
                     if (!isNaN(n))
-                        total += n;
+                        total = plus(total, n);
                 }
                 sumsByKey_1[key] = total;
             }
@@ -90,6 +91,9 @@ function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys,
                 return "合计";
             var key = col.dataIndex;
             if (col.isSummary && sumsByKey_1[key] !== undefined) {
+                if (col.totalCalcCallback) {
+                    return col.totalCalcCallback(sumsByKey_1, processedData);
+                }
                 return sumsByKey_1[key];
             }
             return "";

package/package.json

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