zmdms-webui 1.9.7 → 1.9.8

package/dist/es/dynamicsetting/index.css

@@ -1 +1 @@
-.zt-sortable-new{cursor:move;font-size:13px;line-height:1.5;overflow:hidden;padding:8px 0;text-align:left}.zt-sortable-new .zt-sortable--item{align-items:center;display:flex;justify-content:space-between;padding:0 16px}.zt-sortable-new .zt-sortable--children{display:flex}.zt-sortable-new .zt-sortable--children .zt-sortable-new{border-bottom:none;padding:8px 26px}.zt-sortable-new.no-move{cursor:no-drop}.zt-sortable-new .zt-checkbox{font-size:13px}.zt-sortable-new:hover{background-color:#ebf3fe}.ztxk-dynamic--more{cursor:pointer;height:20px}.ant-dropdown-show-arrow.ztxk-dynamic--more--drop{padding-top:0}.ztxk-dynamic--more--drop.ant-dropdown-placement-bottomRight>.ant-dropdown-arrow{top:-5px}.dynamic-drawer .ant-drawer-header{padding:10px 12px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div{align-items:center;color:#768696;display:flex;font-size:16px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div .search-drawer--title-text{font-size:14px;margin-left:10px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div .search-drawer--title-text>span{font-size:13px}.dynamic-drawer .ant-drawer-body{padding:0}.dynamic-drawer .ant-drawer-body .ant-checkbox-group{width:100%}.dynamic-drawer .ant-drawer-footer{border-top:none;display:flex;justify-content:space-between;padding:0}.dynamic-drawer .ant-drawer-footer>button{border:none;border-radius:0;height:40px;width:33%}.dynamic-drawer-section-title{background:#f5f5f5;border-radius:6px;font-size:14px;font-weight:700;padding:4px}
+.zt-sortable-new{cursor:move;font-size:13px;line-height:1.5;overflow:hidden;padding:8px 0;text-align:left}.zt-sortable-new .zt-sortable--item{align-items:center;display:flex;justify-content:space-between;padding:0 16px}.zt-sortable-new .zt-sortable--item span{white-space:break-spaces}.zt-sortable-new .zt-sortable--children{display:flex}.zt-sortable-new .zt-sortable--children .zt-sortable-new{border-bottom:none;padding:8px 26px}.zt-sortable-new .zt-sortable--children span{white-space:break-spaces}.zt-sortable-new.no-move{cursor:no-drop}.zt-sortable-new .zt-checkbox{font-size:13px}.zt-sortable-new:hover{background-color:#ebf3fe}.ztxk-dynamic--more{cursor:pointer;height:20px}.ant-dropdown-show-arrow.ztxk-dynamic--more--drop{padding-top:0}.ztxk-dynamic--more--drop.ant-dropdown-placement-bottomRight>.ant-dropdown-arrow{top:-5px}.dynamic-drawer .ant-drawer-header{padding:10px 12px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div{align-items:center;color:#768696;display:flex;font-size:16px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div .search-drawer--title-text{font-size:14px;margin-left:10px}.dynamic-drawer .ant-drawer-header .ant-drawer-title>div .search-drawer--title-text>span{font-size:13px}.dynamic-drawer .ant-drawer-body{padding:0}.dynamic-drawer .ant-drawer-body .ant-checkbox-group{width:100%}.dynamic-drawer .ant-drawer-footer{border-top:none;display:flex;justify-content:space-between;padding:0}.dynamic-drawer .ant-drawer-footer>button{border:none;border-radius:0;height:40px;width:33%}.dynamic-drawer-section-title{background:#f5f5f5;border-radius:6px;font-size:14px;font-weight:700;padding:4px}

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,9 +376,10 @@ 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" } },
         fill: {
@@ -349,7 +402,7 @@ function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns, head
             pattern: "solid",
             fgColor: { argb: "FFE6F3FF" },
         },
-        alignment: { horizontal: "center", vertical: "middle" },
+        alignment: { horizontal: "left", vertical: "middle" },
         border: {
             top: { style: "thin", color: { argb: "FF000000" } },
             bottom: { style: "thin", color: { argb: "FF000000" } },
@@ -364,7 +417,7 @@ function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns, head
             pattern: "solid",
             fgColor: { argb: "FFFFFFFF" },
         },
-        alignment: { horizontal: "center", vertical: "middle" },
+        alignment: { horizontal: "left", vertical: "middle" },
         border: {
             top: { style: "thin", color: { argb: "FF000000" } },
             bottom: { style: "thin", color: { argb: "FF000000" } },
@@ -372,19 +425,50 @@ function applyExcelStyles(worksheet, data, mergeKeys, summaryKeys, columns, head
             right: { style: "thin", color: { argb: "FF000000" } },
         },
     };
+    var descriptionStyle = {
+        font: { bold: true, size: 12, color: { argb: "FF333333" } },
+        alignment: { horizontal: "center", vertical: "middle", wrapText: true },
+        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" } },
+        },
+        fill: undefined,
+    };
     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++) {
         var rowData = data[rowIndex];
@@ -394,7 +478,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 +493,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 +517,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 +534,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, time = _a.time, topDescriptionRowHeight = _a.topDescriptionRowHeight;
+        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"> {
     /**

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) {