zmdms-webui 1.9.7 → 1.9.9

package/dist/es/table/excel.js

@@ -1,15 +1,16 @@
 import { __spreadArray, __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
 import ExcelJS from '../node_modules/exceljs/dist/exceljs.min.js';
-import { useMergeKeys } from './hooks.js';
-import { useMemo } from 'react';
+import { useMergeKeys, useNumKeys } from './hooks.js';
 import { useMemoizedFn } from 'ahooks';
 import { IS_SUMMARY, MERGE_ROW_SPANS } from './constant.js';
+import { exactRound } from 'zmdms-utils';
+import dayjs from 'dayjs';
 
 /**
  * 使用 ExcelJS + 后处理添加批注
  * 导出Excel，支持维度合并和小计，以及批注功能
  */
-function exportToExcelWithMergeAndComments(records, columns, mergeKeys, summaryKeys, fileName, sheetName, columnHeaders, summaryConfig) {
+function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight) {
     var _a;
     var _this = this;
     if (fileName === void 0) { fileName = "export.xlsx"; }
@@ -17,9 +18,9 @@ function exportToExcelWithMergeAndComments(records, columns, mergeKeys, summaryK
     if (!records || records.length === 0) {
         throw new Error("没有数据可导出");
     }
-    var processedData = records;
+    var processedData = applyPrecisionToRecords(records, columns);
     // 准备Excel数据
-    var excelData = prepareExcelData(processedData, columns, columnHeaders);
+    var excelData = prepareExcelData(processedData, columns, columnHeaders, topDescription);
     // 创建工作簿
     var workbook = new ExcelJS.Workbook();
     // 计算末尾合计行
@@ -62,7 +63,7 @@ function exportToExcelWithMergeAndComments(records, columns, mergeKeys, summaryK
     // 设置冻结窗格
     setWorksheetFreeze(worksheet, excelData.leafColumns, excelData.headerRowCount);
     // 添加样式
-    applyExcelStyles(worksheet, dataForStyles, mergeKeys, summaryKeys, excelData.leafColumns, excelData.headerRowCount);
+    applyExcelStyles(worksheet, dataForStyles, numKeys, excelData.leafColumns, excelData.headerRowCount, !!excelData.topDescription, topDescriptionRowHeight);
     // 添加批注 - 使用改进的方法
     addCommentsToWorksheet(worksheet, dataForStyles, excelData.leafColumns, excelData.headerRowCount);
     // 导出文件
@@ -101,6 +102,36 @@ function exportToExcelWithMergeAndComments(records, columns, mergeKeys, summaryK
         fileName: fileName,
     };
 }
+/**
+ * 根据列上的 precision 配置，格式化记录中的数值字段
+ */
+function applyPrecisionToRecords(records, columns) {
+    if (!Array.isArray(records) || !Array.isArray(columns))
+        return records || [];
+    var precisionMap = {};
+    columns.forEach(function (col) {
+        if (col && typeof col.dataIndex === "string") {
+            var precision = col.precision;
+            if (typeof precision === "number") {
+                precisionMap[col.dataIndex] = { precision: precision };
+            }
+        }
+    });
+    if (Object.keys(precisionMap).length === 0)
+        return records;
+    return records.map(function (record) {
+        if (record == null || typeof record !== "object")
+            return record;
+        var next = __assign({}, record);
+        for (var key in precisionMap) {
+            if (!Object.prototype.hasOwnProperty.call(next, key))
+                continue;
+            var precision = precisionMap[key].precision;
+            next[key] = exactRound(next[key], precision);
+        }
+        return next;
+    });
+}
 /**
  * 改进的批注添加函数 - 使用 ExcelJS 的正确方法
  */
@@ -196,7 +227,7 @@ function setWorksheetFreeze(worksheet, leafColumns, headerRowCount) {
         console.error("设置冻结窗格失败:", e);
     }
 }
-function prepareExcelData(processedData, columns, columnHeaders) {
+function prepareExcelData(processedData, columns, columnHeaders, topDescription) {
     var getMaxDepth = function (cols) {
         var max = 0;
         var dfs = function (nodes, depth) {
@@ -220,10 +251,6 @@ function prepareExcelData(processedData, columns, columnHeaders) {
         }
         return 1;
     };
-    var maxDepth = getMaxDepth(columns);
-    var headerRows = Array.from({ length: maxDepth }, function () { return []; });
-    var headerMerges = [];
-    var leafColumns = [];
     var walkHeader = function (nodes, depth, startColIndexRef) {
         nodes.forEach(function (node) {
             var text = node.dynamicTitle || node.title;
@@ -265,13 +292,38 @@ function prepareExcelData(processedData, columns, columnHeaders) {
             }
         });
     };
+    var maxDepth = getMaxDepth(columns);
+    var headerRows = Array.from({ length: maxDepth }, function () { return []; });
+    var headerMerges = [];
+    var leafColumns = [];
     walkHeader(columns, 1, { value: 0 });
+    // 顶部说明行：插入到表头之前，并横向合并至所有叶子列
+    if (topDescription) {
+        var totalLeafCols = Math.max(1, leafColumns.length);
+        var topRow = Array.from({ length: totalLeafCols }, function () { return ""; });
+        topRow[0] = topDescription;
+        // 现有表头合并坐标整体下移一行
+        headerMerges.forEach(function (m) {
+            m.s.r += 1;
+            m.e.r += 1;
+        });
+        // 插入到最前面
+        headerRows.unshift(topRow);
+        // 新增顶行的横向合并（从第1列到最后一列）
+        if (totalLeafCols > 1) {
+            headerMerges.push({
+                s: { r: 0, c: 0 },
+                e: { r: 0, c: totalLeafCols - 1 },
+            });
+        }
+    }
     return {
         headerRows: headerRows,
         headerMerges: headerMerges,
         headerRowCount: headerRows.length,
         data: processedData,
         leafColumns: leafColumns,
+        topDescription: topDescription,
     };
 }
 function createWorksheetWithMerge(workbook, excelData, mergeKeys, sheetName) {
@@ -324,66 +376,126 @@ function createWorksheetWithMerge(workbook, excelData, mergeKeys, sheetName) {
     }
     return worksheet;
 }
-function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns, headerRowCount) {
-    var _a, _b;
+function applyExcelStyles(worksheet, data, numKeys, columns, headerRowCount, hasTopDescription, topDescriptionRowHeight) {
+    var _a, _b, _c;
     if (headerRowCount === void 0) { headerRowCount = 1; }
+    if (hasTopDescription === void 0) { hasTopDescription = false; }
     var headerStyle = {
-        font: { bold: true, color: { argb: "FFFFFFFF" } },
+        font: {
+            bold: true,
+            color: { argb: "FFFFFFFF" },
+            size: 11,
+            name: "微软雅黑",
+        },
         fill: {
             type: "pattern",
             pattern: "solid",
-            fgColor: { argb: "FF4F81BD" },
+            fgColor: { argb: "FF2E5BBA" },
         },
         alignment: { horizontal: "center", vertical: "middle" },
         border: {
-            top: { style: "thin", color: { argb: "FF000000" } },
-            bottom: { style: "thin", color: { argb: "FF000000" } },
-            left: { style: "thin", color: { argb: "FF000000" } },
-            right: { style: "thin", color: { argb: "FF000000" } },
+            top: { style: "thin", color: { argb: "FF1E3A8A" } },
+            bottom: { style: "thin", color: { argb: "FF1E3A8A" } },
+            left: { style: "thin", color: { argb: "FF1E3A8A" } },
+            right: { style: "thin", color: { argb: "FF1E3A8A" } },
         },
     };
     var summaryStyle = {
-        font: { bold: true, color: { argb: "FF000000" } },
+        font: {
+            bold: true,
+            color: { argb: "FF1E3A8A" },
+            size: 11,
+            name: "微软雅黑",
+        },
         fill: {
             type: "pattern",
             pattern: "solid",
-            fgColor: { argb: "FFE6F3FF" },
+            fgColor: { argb: "FFE8F2FF" },
         },
-        alignment: { horizontal: "center", vertical: "middle" },
+        alignment: { horizontal: "left", vertical: "middle" },
         border: {
-            top: { style: "thin", color: { argb: "FF000000" } },
-            bottom: { style: "thin", color: { argb: "FF000000" } },
-            left: { style: "thin", color: { argb: "FF000000" } },
-            right: { style: "thin", color: { argb: "FF000000" } },
+            top: { style: "thin", color: { argb: "FFD1D5DB" } },
+            bottom: { style: "thin", color: { argb: "FFD1D5DB" } },
+            left: { style: "thin", color: { argb: "FFD1D5DB" } },
+            right: { style: "thin", color: { argb: "FFD1D5DB" } },
         },
     };
     var normalStyle = {
-        font: { color: { argb: "FF000000" } },
+        font: {
+            color: { argb: "FF374151" },
+            size: 10,
+            name: "微软雅黑",
+        },
         fill: {
             type: "pattern",
             pattern: "solid",
             fgColor: { argb: "FFFFFFFF" },
         },
-        alignment: { horizontal: "center", vertical: "middle" },
+        alignment: { horizontal: "left", vertical: "middle" },
+        border: {
+            top: { style: "thin", color: { argb: "FFE5E7EB" } },
+            bottom: { style: "thin", color: { argb: "FFE5E7EB" } },
+            left: { style: "thin", color: { argb: "FFE5E7EB" } },
+            right: { style: "thin", color: { argb: "FFE5E7EB" } },
+        },
+    };
+    var descriptionStyle = {
+        font: {
+            bold: true,
+            size: 11,
+            color: { argb: "FF2E5BBA" },
+            name: "微软雅黑",
+        },
+        alignment: {
+            horizontal: "left",
+            vertical: "middle",
+            wrapText: true,
+            indent: 1,
+        },
         border: {
-            top: { style: "thin", color: { argb: "FF000000" } },
-            bottom: { style: "thin", color: { argb: "FF000000" } },
-            left: { style: "thin", color: { argb: "FF000000" } },
-            right: { style: "thin", color: { argb: "FF000000" } },
+            top: { style: "thin", color: { argb: "FFE6E6E6" } },
+            bottom: { style: "thin", color: { argb: "FFE6E6E6" } },
+            left: { style: "thin", color: { argb: "FFE6E6E6" } },
+            right: { style: "thin", color: { argb: "FFE6E6E6" } },
+        },
+        fill: {
+            type: "pattern",
+            pattern: "solid",
+            fgColor: { argb: "FFF8F9FA" },
         },
     };
     var totalCols = Math.max(1, (columns === null || columns === void 0 ? void 0 : columns.length) || 1);
-    // 表头样式
     for (var r = 1; r <= headerRowCount; r++) {
         for (var c = 1; c <= totalCols; c++) {
             var cell = worksheet.getCell(r, c);
             var currentColumn = columns && Array.isArray(columns) ? columns[c - 1] : undefined;
-            var customHeaderBgColor = (_a = currentColumn === null || currentColumn === void 0 ? void 0 : currentColumn.excelConfig) === null || _a === void 0 ? void 0 : _a.headerBgColor;
-            cell.font = headerStyle.font;
-            cell.alignment = headerStyle.alignment;
-            cell.fill = __assign(__assign({}, headerStyle.fill), { fgColor: { argb: customHeaderBgColor || "FF4F81BD" } });
-            cell.border = headerStyle.border;
+            var isDescriptionRow = hasTopDescription && r === 1;
+            if (isDescriptionRow) {
+                cell.font = descriptionStyle.font;
+                cell.alignment = descriptionStyle.alignment;
+                cell.fill = descriptionStyle.fill;
+                cell.border = descriptionStyle.border;
+            }
+            else {
+                var customHeaderBgColor = (_a = currentColumn === null || currentColumn === void 0 ? void 0 : currentColumn.excelConfig) === null || _a === void 0 ? void 0 : _a.headerBgColor;
+                var customHeaderFontColor = (_b = currentColumn === null || currentColumn === void 0 ? void 0 : currentColumn.excelConfig) === null || _b === void 0 ? void 0 : _b.headerFontColor;
+                cell.font = __assign(__assign({}, headerStyle.font), { color: { argb: customHeaderFontColor || headerStyle.font.color.argb } });
+                cell.alignment = headerStyle.alignment;
+                cell.fill = __assign(__assign({}, headerStyle.fill), { fgColor: {
+                        argb: customHeaderBgColor || headerStyle.fill.fgColor.argb,
+                    } });
+                cell.border = headerStyle.border;
+            }
+        }
+    }
+    // 如果外部传入了顶端描述行高度，则强制设置第1行高度
+    if (hasTopDescription &&
+        typeof topDescriptionRowHeight === "number" &&
+        topDescriptionRowHeight > 0) {
+        try {
+            worksheet.getRow(1).height = topDescriptionRowHeight;
         }
+        catch (_d) { }
     }
     // 数据行样式
     for (var rowIndex = 0; rowIndex < data.length; rowIndex++) {
@@ -394,7 +506,7 @@ function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns, head
             var currentColumn = columns && Array.isArray(columns) ? columns[c - 1] : undefined;
             var base = isSubtotal ? summaryStyle : normalStyle;
             var columnAlign = columns && Array.isArray(columns)
-                ? (_b = columns[c - 1]) === null || _b === void 0 ? void 0 : _b.align
+                ? (_c = columns[c - 1]) === null || _c === void 0 ? void 0 : _c.align
                 : undefined;
             var alignment = __assign({}, base.alignment);
             if (columnAlign === "left" ||
@@ -409,23 +521,23 @@ function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns, head
         }
     }
     // 数值列格式
-    if (summaryKeys && summaryKeys.length > 0 && columns) {
+    if (numKeys && numKeys.length > 0 && columns) {
         for (var rowIndex = 0; rowIndex < data.length; rowIndex++) {
             var rowData = data[rowIndex];
-            var _loop_2 = function (summaryKey) {
-                var colIndex = columns.findIndex(function (col) { return col.dataIndex === summaryKey; });
+            var _loop_2 = function (numKey) {
+                var colIndex = columns.findIndex(function (col) { return col.dataIndex === numKey; });
                 if (colIndex === -1)
                     return "continue";
                 var cell = worksheet.getCell(headerRowCount + rowIndex + 1, colIndex + 1);
-                var cellValue = rowData[summaryKey];
+                var cellValue = rowData[numKey];
                 if (typeof cellValue === "number" || !isNaN(Number(cellValue))) {
                     cell.value = Number(cellValue);
                     cell.numFmt = "#,##0.00";
                 }
             };
-            for (var _i = 0, summaryKeys_1 = summaryKeys; _i < summaryKeys_1.length; _i++) {
-                var summaryKey = summaryKeys_1[_i];
-                _loop_2(summaryKey);
+            for (var _i = 0, numKeys_1 = numKeys; _i < numKeys_1.length; _i++) {
+                var numKey = numKeys_1[_i];
+                _loop_2(numKey);
             }
         }
     }
@@ -433,16 +545,16 @@ function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns, head
 /**
  * 主要的导出函数，使用改进的批注功能
  */
-function exportToExcelWithMerge(records, columns, mergeKeys, summaryKeys, fileName, sheetName, columnHeaders, summaryConfig) {
+function exportToExcelWithMerge(records, columns, mergeKeys, numKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight) {
     if (fileName === void 0) { fileName = "export.xlsx"; }
     if (sheetName === void 0) { sheetName = "Sheet1"; }
-    return exportToExcelWithMergeAndComments(records, columns, mergeKeys, summaryKeys, fileName, sheetName, columnHeaders, summaryConfig);
+    return exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight);
 }
 /**
  * 简化版本的导出函数
  */
 function exportToExcelSimple(records, config) {
-    return exportToExcelWithMerge(records, config.columns || [], config.mergeKeys, config.summaryKeys || [], config.fileName || "export.xlsx", config.sheetName || "Sheet1", config.columnHeaders, config.summaryConfig);
+    return exportToExcelWithMerge(records, config.columns || [], config.mergeKeys, config.numKeys || [], config.fileName || "export.xlsx", config.sheetName || "Sheet1", config.columnHeaders, config.summaryConfig, config.topDescription, config.topDescriptionRowHeight);
 }
 /**
  * Hook 版本，支持选择导出方式
@@ -450,19 +562,24 @@ function exportToExcelSimple(records, config) {
 function useExcelExport(records, config) {
     var columns = config.columns, isAutoMerge = config.isAutoMerge, columnHeaders = config.columnHeaders, summaryConfig = config.summaryConfig;
     var mergeKeys = useMergeKeys(columns, isAutoMerge);
-    var summaryKeys = useMemo(function () {
-        return columns
-            .filter(function (item) { return item.isSummary; })
-            .map(function (item) { return item.dataIndex; });
-    }, [columns]);
-    var exportFunction = useMemoizedFn(function (fileName) {
+    var numKeys = useNumKeys(columns);
+    var exportFunction = useMemoizedFn(function (fileName, _a) {
+        var topDescription = _a.topDescription, topDescriptionRowHeight = _a.topDescriptionRowHeight, time = _a.time;
+        if (!fileName.includes(".xlsx")) {
+            fileName = fileName + ".xlsx";
+        }
+        if (time) {
+            fileName = dayjs(time).format("YYYYMMDD") + "-" + fileName;
+        }
         exportToExcelSimple(records, {
             columns: columns,
             mergeKeys: mergeKeys,
-            summaryKeys: summaryKeys,
+            numKeys: numKeys,
             fileName: fileName,
             columnHeaders: columnHeaders,
             summaryConfig: summaryConfig,
+            topDescription: topDescription,
+            topDescriptionRowHeight: topDescriptionRowHeight,
         });
     });
     return exportFunction;

package/dist/es/table/hooks.js

@@ -385,6 +385,15 @@ var useMergeKeys = function (columns, isAutoMerge) {
     }, [isAutoMerge, columns]);
     return mergeKeys;
 };
+var useNumKeys = function (columns) {
+    var numKeys = useMemo(function () {
+        var leafColumns = getLeafColumns(columns);
+        return Array.from(new Set(leafColumns
+            .filter(function (item) { return item.precision !== undefined; })
+            .map(function (item) { return item.key; })));
+    }, [columns]);
+    return numKeys;
+};
 /**
  * 自动合并的一些处理
  */
@@ -510,4 +519,4 @@ function useMergeAddAndDel(_a) {
     return [newRowSelection, newAddAndDelProps];
 }
 
-export { useAddAndDelChange, useAutoMerge, useCalcScrollY, useCustomSort, useEditChange, useMergeAddAndDel, useMergeKeys, useMoveRowChange, useScuRfresh };
+export { useAddAndDelChange, useAutoMerge, useCalcScrollY, useCustomSort, useEditChange, useMergeAddAndDel, useMergeKeys, useMoveRowChange, useNumKeys, useScuRfresh };

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

@@ -237,7 +237,14 @@ interface IColumnType<RecordType> extends Omit<ColumnType<RecordType>, "render">
          * 表头背景色
          */
         headerBgColor?: string;
+        /**
+         * 表头字体颜色
+         */
+        headerFontColor?: string;
     };
+    dateFormat?: string;
+    precision?: number;
+    thousand?: boolean;
 }
 interface IRenderOptions {
     insertTableFromClipboard: IFuncInsertTableFromClipboard;
@@ -296,7 +303,11 @@ interface ITableRefHandel {
     /**
      * 导出excel
      */
-    exportExcel?: (fileName: string) => void;
+    exportExcel?: (fileName: string, config?: {
+        topDescription?: string;
+        time?: string;
+        topDescriptionRowHeight?: number;
+    }) => void;
 }
 interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"> {
     /**
@@ -317,6 +328,10 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
      * 就按数字往上递增的规则就行 1 2 3 4 5这种
      */
     dynamicVersion?: number;
+    /**
+     * 自定义动态列配置后的回调
+     */
+    customDynamicListHandle?: (dynamicList: any) => void;
     /**
      * 增加了column的表头过滤功能；如果想要过滤功能持久化，可以配置这个属性
      * 同时也需要配置dynamicKey配置。

package/dist/es/table/table.js

@@ -41,7 +41,7 @@ import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js'
 // completed: 实现从execl复制到表格中的功能
 var Table = function (props) {
     // console.log("表格渲染");
-    var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, isRemeberFilter = props.isRemeberFilter, _c = props.isOrderUpdateData, isOrderUpdateData = _c === void 0 ? true : _c, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _d = props.isTheadTitleAdd, isTheadTitleAdd = _d === void 0 ? true : _d, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _e = props.isDelAll, isDelAll = _e === void 0 ? true : _e, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _f = props.summaryFixed, summaryFixed = _f === void 0 ? true : _f, isInnerPagination = props.isInnerPagination, _g = props.innerPaginationPageSize, innerPaginationPageSize = _g === void 0 ? 30 : _g, _h = props.innerPaginationPosition, innerPaginationPosition = _h === void 0 ? INNER_TABLE_PAGINATION_POSITION : _h, _j = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _j === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _j, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _k = props.isResizableColumn, isResizableColumn = _k === void 0 ? true : _k, _l = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _l === void 0 ? true : _l, _m = props.isRealTimeValidate, isRealTimeValidate = _m === void 0 ? true : _m, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _o = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _o === void 0 ? 65 : _o, _p = props.isAutoScrollY, isAutoScrollY = _p === void 0 ? false : _p, tableId = props.tableId, extraOnRow = props.onRow, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, headerAlign = props.headerAlign, isDimensionDynamic = props.isDimensionDynamic, isAutoMerge = props.isAutoMerge, mode = props.mode, rowSelection = props.rowSelection, isContextMenu = props.isContextMenu, isFullscreenHandle = props.isFullscreenHandle, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom", "scroll", "addAndDelProps", "autoScrollYMarginBottom", "isAutoScrollY", "tableId", "onRow", "fixedRowsCount", "fixedRowsConfig", "headerAlign", "isDimensionDynamic", "isAutoMerge", "mode", "rowSelection", "isContextMenu", "isFullscreenHandle"]);
+    var className = props.className, _a = props.bordered, bordered = _a === void 0 ? true : _a, _b = props.pagination, pagination = _b === void 0 ? false : _b, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isRemeberFilter = props.isRemeberFilter, _c = props.isOrderUpdateData, isOrderUpdateData = _c === void 0 ? true : _c, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _d = props.isTheadTitleAdd, isTheadTitleAdd = _d === void 0 ? true : _d, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _e = props.isDelAll, isDelAll = _e === void 0 ? true : _e, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _f = props.summaryFixed, summaryFixed = _f === void 0 ? true : _f, isInnerPagination = props.isInnerPagination, _g = props.innerPaginationPageSize, innerPaginationPageSize = _g === void 0 ? 30 : _g, _h = props.innerPaginationPosition, innerPaginationPosition = _h === void 0 ? INNER_TABLE_PAGINATION_POSITION : _h, _j = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _j === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _j, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _k = props.isResizableColumn, isResizableColumn = _k === void 0 ? true : _k, _l = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _l === void 0 ? true : _l, _m = props.isRealTimeValidate, isRealTimeValidate = _m === void 0 ? true : _m, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _o = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _o === void 0 ? 65 : _o, _p = props.isAutoScrollY, isAutoScrollY = _p === void 0 ? false : _p, tableId = props.tableId, extraOnRow = props.onRow, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, headerAlign = props.headerAlign, isDimensionDynamic = props.isDimensionDynamic, isAutoMerge = props.isAutoMerge, mode = props.mode, rowSelection = props.rowSelection, isContextMenu = props.isContextMenu, isFullscreenHandle = props.isFullscreenHandle, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "customDynamicListHandle", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom", "scroll", "addAndDelProps", "autoScrollYMarginBottom", "isAutoScrollY", "tableId", "onRow", "fixedRowsCount", "fixedRowsConfig", "headerAlign", "isDimensionDynamic", "isAutoMerge", "mode", "rowSelection", "isContextMenu", "isFullscreenHandle"]);
     var classes = classNames("ztxk-table", className, {
         "ztxk-table--flex": isFlex,
     });
@@ -58,7 +58,11 @@ var Table = function (props) {
     // 比如过滤某些列 不做展示
     var columns = useParseColumns(_columns);
     // 得到动态列配置信息
-    var _r = useDynamicListByColumns(columns, { dynamicKey: dynamicKey, dynamicVersion: dynamicVersion }), defaultDynamicList = _r.defaultDynamicList, onCurrentListChange = _r.onCurrentListChange, currentDynamicList = _r.currentDynamicList, dynamicSettingRef = _r.dynamicSettingRef;
+    var _r = useDynamicListByColumns(columns, {
+        dynamicKey: dynamicKey,
+        dynamicVersion: dynamicVersion,
+        customDynamicListHandle: customDynamicListHandle,
+    }), defaultDynamicList = _r.defaultDynamicList, onCurrentListChange = _r.onCurrentListChange, currentDynamicList = _r.currentDynamicList, dynamicSettingRef = _r.dynamicSettingRef;
     // 因为内部分页需要知晓当前页面的数据展示，要不然数据排序就跟内部分页没关系了
     // 自定义排序方法
     var _s = useCustomSort(dataSource, onTableChange, {

package/dist/es/table/useColumns.js

@@ -15,6 +15,8 @@ import FilterDropdown, { createFilterValue, filterHandle } from './components/Fi
 import Badge from './components/Badge.js';
 import { PLACEHOLDER_NULL } from '../config/constant.js';
 import { useMergeAddAndDel } from './hooks.js';
+import dayjs from 'dayjs';
+import { exactRound, addThousedSeparator } from 'zmdms-utils';
 import SearchOutlined from '../node_modules/@ant-design/icons/es/icons/SearchOutlined.js';
 import ModalComponent from '../modal/modal.js';
 
@@ -317,7 +319,15 @@ function useColumns(columns, options) {
                 if (typeof text === "object") {
                     return PLACEHOLDER_NULL;
                 }
-                return text == null || text === "" ? PLACEHOLDER_NULL : text;
+                if (text == null || text === "")
+                    return PLACEHOLDER_NULL;
+                if (_column.dateFormat)
+                    return dayjs(text).format(_column.dateFormat);
+                if (_column.precision)
+                    text = exactRound(text, _column.precision);
+                if (_column.thousand)
+                    text = addThousedSeparator(text);
+                return text;
             };
         }
         if (_column.render) {

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));
         }
     }
 }

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();