zmdms-webui 1.9.8 → 2.0.0

package/dist/es/table/useDynamicListByColumns.js

@@ -1,7 +1,8 @@
-import { useRef, useMemo, useState, useEffect, useCallback } from 'react';
+import { useRef, useMemo, useState, useEffect } from 'react';
 import { getCurrentDynamicItems, getDynamicVersionByKey, setDynamicVersionByKey } from '../dynamicsetting/useDynamic.js';
 import { TABLE_DYNAMIC_KEY } from './constant.js';
 import isEqual from 'lodash/isEqual';
+import { useMemoizedFn } from 'ahooks';
 
 // 处理列信息
 function parseColumn(column, index, indexs) {
@@ -66,7 +67,7 @@ function getDynamicList(dynamicKey, columns) {
     return result;
 }
 function useDynamicListByColumns(columns, options) {
-    var dynamicKey = options.dynamicKey, dynamicVersion = options.dynamicVersion;
+    var dynamicKey = options.dynamicKey, dynamicVersion = options.dynamicVersion, customDynamicListHandle = options.customDynamicListHandle;
     // 动态列配置手动刷新基础配置
     var dynamicSettingRef = useRef(null);
     // 初始化list
@@ -116,10 +117,11 @@ function useDynamicListByColumns(columns, options) {
             setDynamicVersionByKey(TABLE_DYNAMIC_KEY, dynamicKey, dynamicVersion);
         }
     }, [dynamicKey, dynamicVersion]);
-    var onCurrentListChange = useCallback(function (newDynamicList) {
+    var onCurrentListChange = useMemoizedFn(function (newDynamicList) {
         // console.log(newDynamicList);
         setCurrentDynamicList(newDynamicList);
-    }, []);
+        customDynamicListHandle === null || customDynamicListHandle === void 0 ? void 0 : customDynamicListHandle(newDynamicList);
+    });
     return {
         defaultDynamicList: defaultDynamicList,
         currentDynamicList: currentDynamicList,

package/dist/es/table/utils.js

@@ -2,7 +2,7 @@ import { __spreadArray, __assign, __awaiter, __generator } from '../_virtual/_ts
 import { filterHandle } from './components/FilterDropdown.js';
 import { MERGE_ROW_SPANS, MERGE_KEY, MERGE_INDEX, IS_SUMMARY } from './constant.js';
 import { plus } from 'zmdms-utils';
-import { message } from 'antd';
+import myMessage from '../message/index.js';
 
 // 递归处理columns
 function recursionColumns(columns, currentDynamicList, newColumns, columnsIndexs) {
@@ -138,7 +138,7 @@ function copyColData(key, options) {
         try {
             if ((navigator === null || navigator === void 0 ? void 0 : navigator.clipboard) && window.isSecureContext) {
                 (_b = (_a = navigator.clipboard) === null || _a === void 0 ? void 0 : _a.writeText(str)) === null || _b === void 0 ? void 0 : _b.then(function () {
-                    message.success("复制成功！");
+                    myMessage.success("复制成功！");
                 });
             }
             else {
@@ -147,17 +147,17 @@ function copyColData(key, options) {
                 document.body.appendChild(textarea);
                 textarea.select();
                 if (document.execCommand) {
-                    message.success("复制成功！");
+                    myMessage.success("复制成功！");
                     document.execCommand("copy");
                 }
                 else {
-                    message.info("\u590D\u5236\u5931\u8D25\uFF01\u8BF7\u624B\u5DE5\u590D\u5236\n ".concat(str));
+                    myMessage.info("\u590D\u5236\u5931\u8D25\uFF01\u8BF7\u624B\u5DE5\u590D\u5236\n ".concat(str));
                 }
                 document.body.removeChild(textarea);
             }
         }
         catch (err) {
-            message.info("\u590D\u5236\u5931\u8D25\uFF01\u8BF7\u624B\u5DE5\u590D\u5236\n ".concat(str));
+            myMessage.info("\u590D\u5236\u5931\u8D25\uFF01\u8BF7\u624B\u5DE5\u590D\u5236\n ".concat(str));
         }
     }
 }
@@ -447,6 +447,7 @@ function startColumnInsertTableData(options) {
  * @param mergeKeys 合并字段
  * @param dimensionSummaryKeys 维度合计字段
  * @param summaryKeys 合计字段
+ * @param isDimensionDynamic 维度合并
  */
 function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic) {
     var _a;
@@ -460,7 +461,13 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
     var result = isDimensionDynamic
         ? sortByDimensions(__spreadArray([], records, true), mergeKeys)
         : __spreadArray([], records, true);
-    // 1. 首先插入维度合计行
+    // 1. 如果开启了维度合并，按 mergeKeys 的最后一位来计算合计值
+    if (isDimensionDynamic && mergeKeys.length > 0) {
+        var lastMergeKey = mergeKeys[mergeKeys.length - 1];
+        var groupedResult = groupByLastMergeKey(result, lastMergeKey, summaryKeys);
+        result = groupedResult;
+    }
+    // 2. 首先插入维度合计行
     if (dimensionSummaryKeys &&
         dimensionSummaryKeys.length > 0 &&
         summaryKeys &&
@@ -468,11 +475,11 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
         result = insertDimensionSummaryRows(result, mergeKeys, // 传入完整的维度字段列表
         dimensionSummaryKeys, summaryKeys);
     }
-    // 2. 为每行初始化合并信息
+    // 3. 为每行初始化合并信息
     for (var i = 0; i < result.length; i++) {
         result[i] = __assign(__assign({}, result[i]), (_a = {}, _a[MERGE_ROW_SPANS] = {}, _a[MERGE_KEY] = Date.now() + Math.floor(Math.random() * 100000), _a[MERGE_INDEX] = -1, _a));
     }
-    // 3. 按层级处理每个合并字段
+    // 4. 按层级处理每个合并字段
     for (var keyIndex = 0; keyIndex < mergeKeys.length; keyIndex++) {
         var currentKey = mergeKeys[keyIndex];
         // 找出所有需要处理的分组起始点
@@ -522,7 +529,7 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
             }
         }
     }
-    // 4. 最后统一计算MERGE_INDEX（合并后的逻辑行号）
+    // 5. 最后统一计算MERGE_INDEX（合并后的逻辑行号）
     var logicalRowIndex = 0;
     var _loop_2 = function (i) {
         // 检查当前行是否是被合并的行（不是第一行）
@@ -702,6 +709,49 @@ function hasParentGroupChanged(records, currentIndex, mergeKeys, currentKeyIndex
         }
     }
     return false;
+}
+/**
+ * 按最后一个合并键进行分组并计算合计值
+ */
+function groupByLastMergeKey(records, lastMergeKey, summaryKeys) {
+    var groups = new Map();
+    // 按最后一个合并键分组
+    for (var _i = 0, records_2 = records; _i < records_2.length; _i++) {
+        var record = records_2[_i];
+        var key = record[lastMergeKey];
+        var keyStr = String(key);
+        if (!groups.has(keyStr)) {
+            groups.set(keyStr, []);
+        }
+        groups.get(keyStr).push(record);
+    }
+    // 为每个分组创建合计行
+    var result = [];
+    for (var _a = 0, _b = Array.from(groups.entries()); _a < _b.length; _a++) {
+        var _c = _b[_a], keyStr = _c[0], items = _c[1];
+        var summaryRow = {};
+        // 复制第一条记录的所有字段作为基础
+        if (items.length > 0) {
+            Object.assign(summaryRow, items[0]);
+        }
+        // 设置最后一个合并键的值
+        summaryRow[lastMergeKey] = keyStr;
+        var _loop_6 = function (summaryKey) {
+            summaryRow[summaryKey] = items
+                .filter(function (item) { return !isSummaryRow(item); }) // 排除已有的合计行
+                .reduce(function (sum, item) {
+                var value = parseFloat(item[summaryKey]) || 0;
+                return plus(sum, value);
+            }, 0);
+        };
+        // 计算合计值
+        for (var _d = 0, summaryKeys_2 = summaryKeys; _d < summaryKeys_2.length; _d++) {
+            var summaryKey = summaryKeys_2[_d];
+            _loop_6(summaryKey);
+        }
+        result.push(summaryRow);
+    }
+    return result;
 }
 
 export { copyColData, flattenRecordsOptimized, getFilterRecords, getNextColumn, getTableColumns, parsePasteData, startColumnInsertTableData };

package/dist/es/uploadlist/hooks.js

@@ -4,7 +4,7 @@ import { flushSync } from 'react-dom';
 import { getFileExtension, isImageExtension, createDownloadLink, createUploadFileLink, TOKEN_KEY, getToken, exactRound, times, divide } from 'zmdms-utils';
 import MemoUploadList from './uploadList.js';
 import { useLatest } from 'ahooks';
-import { message } from 'antd';
+import myMessage from '../message/index.js';
 
 // 默认限制的文件类型
 var NO_ACCEPT = ["exe"];
@@ -27,16 +27,16 @@ function useBeforeUpload(props) {
         }
         if (disAllowDuplicateFile &&
             ((_b = (_a = fileListRef.current) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, function (item) { return item.name === fileName || item.attachName === fileName; }))) {
-            message.warning("不能上传同名附件!");
+            myMessage.warning("不能上传同名附件!");
             return MemoUploadList.LIST_IGNORE;
         }
         // 文件大小
         if (fileSize === 0) {
-            message.warning("不能上传空文件!");
+            myMessage.warning("不能上传空文件!");
             return MemoUploadList.LIST_IGNORE;
         }
         if (isImage && !isImageExtension(fileExtension)) {
-            message.warning("不能上传非图片格式的文件!");
+            myMessage.warning("不能上传非图片格式的文件!");
             return MemoUploadList.LIST_IGNORE;
         }
         // 获取支持的附件类型
@@ -44,16 +44,16 @@ function useBeforeUpload(props) {
         ACCEPT = ACCEPT.map(function (a) { return a.toLowerCase(); });
         // 默认支持任何格式的文件，但是不支持exe
         if (ACCEPT.length > 0 && !ACCEPT.includes(fileExtension)) {
-            message.warning("\u4E0D\u652F\u6301 ".concat(fileExtension, " \u6587\u4EF6\u683C\u5F0F"));
+            myMessage.warning("\u4E0D\u652F\u6301 ".concat(fileExtension, " \u6587\u4EF6\u683C\u5F0F"));
             return MemoUploadList.LIST_IGNORE;
         }
         if (ACCEPT.length === 0 && NO_ACCEPT.includes(fileExtension)) {
-            message.warning("\u4E0D\u652F\u6301 ".concat(fileExtension, " \u6587\u4EF6\u683C\u5F0F"));
+            myMessage.warning("\u4E0D\u652F\u6301 ".concat(fileExtension, " \u6587\u4EF6\u683C\u5F0F"));
             return MemoUploadList.LIST_IGNORE;
         }
         // 文件大小限制
         if (maxSize && fileSize > maxSize) {
-            message.warning("\u6587\u4EF6\u8D85\u51FA ".concat(maxSizeStr, "\uFF01"));
+            myMessage.warning("\u6587\u4EF6\u8D85\u51FA ".concat(maxSizeStr, "\uFF01"));
             return MemoUploadList.LIST_IGNORE;
         }
         return Promise.resolve(file);
@@ -343,7 +343,7 @@ function uploadFile(props) {
                                         if (xhr.status === 200) {
                                             var response = JSON.parse(xhr.responseText);
                                             if (!response) {
-                                                message.warning("文件上传失败!");
+                                                myMessage.warning("文件上传失败!");
                                             }
                                             var code = response.code, data_1 = response.data, msg = response.msg;
                                             if (code === 200) {
@@ -351,7 +351,7 @@ function uploadFile(props) {
                                             }
                                             else {
                                                 reject();
-                                                message.warning(msg || "文件上传失败!");
+                                                myMessage.warning(msg || "文件上传失败!");
                                             }
                                         }
                                         else {
@@ -360,7 +360,7 @@ function uploadFile(props) {
                                                     ? JSON.parse(xhr.response)
                                                     : { msg: "文件上传失败,请检查网络!" };
                                                 reject();
-                                                message.warning(result.msg || "文件上传失败!");
+                                                myMessage.warning(result.msg || "文件上传失败!");
                                             }
                                             catch (err) {
                                                 reject();

package/dist/es/uploadlist/uploadList.js

@@ -1,7 +1,7 @@
 import { __rest, __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { memo, forwardRef, useRef, useState, useEffect, useMemo, useImperativeHandle } from 'react';
-import { Upload, Popconfirm, Dropdown, message } from 'antd';
+import { Upload, Popconfirm, Dropdown } from 'antd';
 import UploadTable from './uploadTable.js';
 import UploadListDetail from './uploadListDetail.js';
 import { ETABLE_COLUMN_TYPE } from './interface.js';
@@ -17,6 +17,7 @@ import LoadingOutlined from '../node_modules/@ant-design/icons/es/icons/LoadingO
 import ButtonCom from '../button/button.js';
 import UploadOutlined from '../node_modules/@ant-design/icons/es/icons/UploadOutlined.js';
 import ModalComponent from '../modal/modal.js';
+import myMessage from '../message/index.js';
 import DownloadOutlined from '../node_modules/@ant-design/icons/es/icons/DownloadOutlined.js';
 
 // 最大字节
@@ -107,7 +108,7 @@ var UploadList = function (props, ref) {
                 case 0:
                     checked = (_b = (_a = tableRef.current) === null || _a === void 0 ? void 0 : _a.getChecked) === null || _b === void 0 ? void 0 : _b.call(_a);
                     if (!checked || checked.length === 0) {
-                        message.info("请选择需要操作的数据!");
+                        myMessage.info("请选择需要操作的数据!");
                         return [2 /*return*/];
                     }
                     if (!onBeforeDeleteValidate) return [3 /*break*/, 4];
@@ -147,7 +148,7 @@ var UploadList = function (props, ref) {
                 case 0:
                     checked = (_b = (_a = tableRef.current) === null || _a === void 0 ? void 0 : _a.getChecked) === null || _b === void 0 ? void 0 : _b.call(_a);
                     if (!checked || checked.length === 0) {
-                        message.info("请选择需要操作的数据!");
+                        myMessage.info("请选择需要操作的数据!");
                         return [2 /*return*/];
                     }
                     (_c = tableRef.current) === null || _c === void 0 ? void 0 : _c.setLoading(true);

package/dist/es/uploadlist/uploadListDetail.js

@@ -4,9 +4,10 @@ import { forwardRef, useState, useImperativeHandle } from 'react';
 import { downloadFile } from 'zmdms-utils';
 import { toPreviewFile } from './utils.js';
 import ButtonCom from '../button/button.js';
+import myMessage from '../message/index.js';
 import LinkOutlined from '../node_modules/@ant-design/icons/es/icons/LinkOutlined.js';
 import DownloadOutlined from '../node_modules/@ant-design/icons/es/icons/DownloadOutlined.js';
-import { Spin, message } from 'antd';
+import { Spin } from 'antd';
 
 var UploadTable = function (_a, ref) {
     var _b;
@@ -203,7 +204,7 @@ var UploadTable = function (_a, ref) {
                                     if (isPreviewAuth) {
                                         return operationCallback("preview", record, index);
                                     }
-                                    message.info("暂无预览权限!");
+                                    myMessage.info("暂无预览权限!");
                                     return Promise.resolve();
                                 }, style: { textAlign: "left" }, title: record.attachName }, { children: [jsx(LinkOutlined, {}), record.attachName] })) })), jsx("div", __assign({ className: "preview-list__item--right" }, { children: isDownloadAuth ? (jsx(ButtonCom, __assign({ type: "link", onClick: function () { return operationCallback("download", record, index); }, style: { textAlign: "left" }, title: "\u4E0B\u8F7D" }, { children: jsx(DownloadOutlined, {}) }))) : null }))] }), record.attachId || record.fileId || index));
             }) })) })));

package/dist/es/uploadlist/uploadTable.js

@@ -9,7 +9,8 @@ import dayjs from 'dayjs';
 import { toPreviewFile } from './utils.js';
 import ButtonCom from '../button/button.js';
 import OperationBtn from '../operationbtn/operationBtn.js';
-import { Progress, message } from 'antd';
+import myMessage from '../message/index.js';
+import { Progress } from 'antd';
 
 var UploadTable = function (_a, ref) {
     var dataSource = _a.dataSource, action = _a.action, headers = _a.headers, data = _a.data, method = _a.method, setInnerFileList = _a.setInnerFileList, isPublic = _a.isPublic, _b = _a.API_BASEURL, API_BASEURL = _b === void 0 ? "" : _b, _c = _a.FILE_API_BASEURL, FILE_API_BASEURL = _c === void 0 ? "" : _c, maxPreviewSize = _a.maxPreviewSize, isPreview = _a.isPreview, isDelete = _a.isDelete, isDownload = _a.isDownload; _a.listType; var tableColumns = _a.tableColumns, onBeforeDownloadValidate = _a.onBeforeDownloadValidate, onBeforePreviewValidate = _a.onBeforePreviewValidate, onBeforeDeleteValidate = _a.onBeforeDeleteValidate;
@@ -329,7 +330,7 @@ var UploadTable = function (_a, ref) {
     // 重新上传
     var onReloadUploadHandle = function (record, index) {
         if (!record.originFileObj) {
-            message.error("当前失败项，没有找到附件原件信息，无法重新上传!");
+            myMessage.error("当前失败项，没有找到附件原件信息，无法重新上传!");
             return;
         }
         setLoading(true);

package/dist/es/uploadlist/utils.js

@@ -1,5 +1,5 @@
 import { formatUnit, previewFile } from 'zmdms-utils';
-import { message } from 'antd';
+import myMessage from '../message/index.js';
 
 /**
  * 附件预览方法
@@ -9,7 +9,7 @@ import { message } from 'antd';
 function toPreviewFile(fileInfo, info) {
     var maxPreviewSize = info.maxPreviewSize, FILE_API_BASEURL = info.FILE_API_BASEURL, uploadTableData = info.uploadTableData;
     if (fileInfo.attachSize > maxPreviewSize) {
-        message.info("\u6587\u4EF6\u5927\u4E8E".concat(formatUnit(maxPreviewSize), ",\u6682\u4E0D\u652F\u6301\u5728\u7EBF\u9884\u89C8\uFF0C\u8BF7\u5148\u4E0B\u8F7D\u540E\u67E5\u770B"));
+        myMessage.info("\u6587\u4EF6\u5927\u4E8E".concat(formatUnit(maxPreviewSize), ",\u6682\u4E0D\u652F\u6301\u5728\u7EBF\u9884\u89C8\uFF0C\u8BF7\u5148\u4E0B\u8F7D\u540E\u67E5\u770B"));
     }
     else {
         previewFile(fileInfo.attachId, fileInfo.attachName, {

package/dist/index.build.d.ts

@@ -47,7 +47,8 @@ export { default as ZtTransfer } from './es/zttransfer/zt-transfer.js';
 export { default as Watermark } from './es/watermark/watermark.js';
 export { default as Sortable } from './es/sortable/sortable.js';
 export { default as ElectronSignatures } from './es/electronsignatures/index.js';
-export { Affix, Anchor, AutoComplete, Avatar, BackTop, Badge, Breadcrumb, Card, Carousel, Cascader, Checkbox, Col, Comment, ConfigProvider, Divider, Drawer, Dropdown, Empty, Grid, Image, Layout, List, Mentions, Menu, PageHeader, Popconfirm, Popover, Progress, Radio, Rate, Result, Row, Segmented, Skeleton, Slider, Space, Spin, Statistic, Steps, Switch, Timeline, Tooltip, Transfer, Typography, Upload, message, notification } from 'antd';
+export { default as message } from './es/message/index.js';
+export { Affix, Anchor, AutoComplete, Avatar, BackTop, Badge, Breadcrumb, Card, Carousel, Cascader, Checkbox, Col, Comment, ConfigProvider, Divider, Drawer, Dropdown, Empty, Grid, Image, Layout, List, Mentions, Menu, PageHeader, Popconfirm, Popover, Progress, Radio, Rate, Result, Row, Segmented, Skeleton, Slider, Space, Spin, Statistic, Steps, Switch, Timeline, Tooltip, Transfer, Typography, Upload, notification } from 'antd';
 export { IButtonProps } from './es/button/interface.js';
 export { IButtonDownloadProps } from './es/button/buttonDownload.js';
 export { IButtonExportProps } from './es/button/buttonExport.js';