zmdms-webui 2.7.0 → 2.7.2

package/dist/es/canvastable/interface.d.ts

@@ -143,7 +143,7 @@ interface ICanvasColumnType<RecordType = any> {
      * @param values 所有值的数组
      * @returns 计算后的合计值
      */
-    totalCalcCallback?: (value: any, values: any) => any;
+    totalCalcCallback?: (value: string | number | undefined, values: Record<string, any>) => any;
     /**
      * 开启合并的字段,按其他字段维度合并
      */
@@ -240,7 +240,7 @@ interface IExpandable<RecordType = any> {
     /**
      * 展开状态改变时的回调
      */
-    onExpandedRowsChange?: (expandedKeys: React__default.Key[], row: RecordType, action: 'expand' | 'collapse') => void;
+    onExpandedRowsChange?: (expandedKeys: React__default.Key[], row: RecordType, action: "expand" | "collapse") => void;
     /**
      * 是否默认展开所有行
      */

package/dist/es/table/excel.js

@@ -92,7 +92,7 @@ function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys,
             var key = col.dataIndex;
             if (col.isSummary && sumsByKey_1[key] !== undefined) {
                 if (col.totalCalcCallback) {
-                    sumsByKey_1[key] = col.totalCalcCallback(sumsByKey_1, processedData);
+                    sumsByKey_1[key] = col.totalCalcCallback(sumsByKey_1[key], sumsByKey_1);
                 }
                 return sumsByKey_1[key];
             }

package/dist/es/table/hooks.js

@@ -68,6 +68,12 @@ function useMoveRowChange(dataSourceRef, onTableChange, options) {
         var onContextMenuCapture = function (e) {
             var _a;
             (_a = defaultOnRow === null || defaultOnRow === void 0 ? void 0 : defaultOnRow.onContextMenuCapture) === null || _a === void 0 ? void 0 : _a.call(defaultOnRow, e);
+            // 检查事件目标是否在 Modal 或其他浮层组件内
+            var target = e.target;
+            var isInModal = target.closest('.ant-modal-wrap, .ant-modal-root');
+            if (isInModal) {
+                return; // 如果在 Modal 内，不显示右键菜单
+            }
             menuShow === null || menuShow === void 0 ? void 0 : menuShow({
                 event: e,
             });
@@ -95,6 +101,12 @@ function useMoveRowChange(dataSourceRef, onTableChange, options) {
         var onContextMenuCapture = function (e) {
             var _a;
             (_a = extra === null || extra === void 0 ? void 0 : extra.onContextMenuCapture) === null || _a === void 0 ? void 0 : _a.call(extra, e);
+            // 检查事件目标是否在 Modal 或其他浮层组件内
+            var target = e.target;
+            var isInModal = target.closest('.ant-modal-wrap, .ant-modal-root');
+            if (isInModal) {
+                return; // 如果在 Modal 内,不显示右键菜单
+            }
             menuShow === null || menuShow === void 0 ? void 0 : menuShow({
                 event: e,
             });

package/package.json

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