zmdms-webui 2.5.6 → 2.5.7

package/dist/es/canvastable/canvasTable.js

@@ -39,7 +39,7 @@ import { getTableColumns } from '../table/utils.js';
 import DynamicSetting from '../dynamicsetting/dynamicSetting.js';
 
 function CanvasTable(props) {
-    var _a = props.dataSource, dataSource = _a === void 0 ? [] : _a, _b = props.columns, columns = _b === void 0 ? [] : _b, _c = props.rowKey, rowKey = _c === void 0 ? "id" : _c, _d = props.height, height = _d === void 0 ? 600 : _d, width = props.width, _e = props.rowHeight, rowHeight = _e === void 0 ? 36 : _e, _f = props.headerHeight, headerHeight = _f === void 0 ? 36 : _f, rowSelection = props.rowSelection, onSortChange = props.onSortChange, onFilterChange = props.onFilterChange, onScroll = props.onScroll, onRowClick = props.onRowClick, onColumnResize = props.onColumnResize, _g = props.bordered, bordered = _g === void 0 ? true : _g, _h = props.striped, striped = _h === void 0 ? false : _h, _j = props.emptyText, emptyText = _j === void 0 ? "暂无数据" : _j, style = props.style, className = props.className, _k = props.loading, loading = _k === void 0 ? false : _k, _l = props.isContextMenu, isContextMenu = _l === void 0 ? true : _l, isFullscreenHandle = props.isFullscreenHandle, mode = props.mode, dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isDimensionDynamic = props.isDimensionDynamic, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, _m = props.isIndexMerge, isIndexMerge = _m === void 0 ? true : _m, _o = props.isSelectionMerge, isSelectionMerge = _o === void 0 ? false : _o, _p = props.renderMode, renderMode = _p === void 0 ? "object" : _p, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, _q = props.summaryFixed, summaryFixed = _q === void 0 ? false : _q, _r = props.isAutoScrollY, isAutoScrollY = _r === void 0 ? false : _r, _s = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _s === void 0 ? 65 : _s, canvasTableId = props.canvasTableId, headerWrap = props.headerWrap, _t = props.headerAlign, headerAlign = _t === void 0 ? "center" : _t, tableRefHandle = props.tableRefHandle, exportExcelConfig = props.exportExcelConfig;
+    var _a = props.dataSource, dataSource = _a === void 0 ? [] : _a, _b = props.columns, columns = _b === void 0 ? [] : _b, _c = props.rowKey, rowKey = _c === void 0 ? "id" : _c, _d = props.height, height = _d === void 0 ? 600 : _d, width = props.width, _e = props.rowHeight, rowHeight = _e === void 0 ? 36 : _e, _f = props.headerHeight, headerHeight = _f === void 0 ? 36 : _f, rowSelection = props.rowSelection, onSortChange = props.onSortChange, onFilterChange = props.onFilterChange, onScroll = props.onScroll, onRowClick = props.onRowClick, onColumnResize = props.onColumnResize, _g = props.bordered, bordered = _g === void 0 ? true : _g, _h = props.striped, striped = _h === void 0 ? false : _h, _j = props.emptyText, emptyText = _j === void 0 ? "暂无数据" : _j, style = props.style, className = props.className, _k = props.loading, loading = _k === void 0 ? false : _k, _l = props.isContextMenu, isContextMenu = _l === void 0 ? true : _l, isFullscreenHandle = props.isFullscreenHandle, mode = props.mode, dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isDimensionDynamic = props.isDimensionDynamic, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, _m = props.isIndexMerge, isIndexMerge = _m === void 0 ? true : _m, _o = props.isSelectionMerge, isSelectionMerge = _o === void 0 ? false : _o, _p = props.renderMode, renderMode = _p === void 0 ? "object" : _p, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, _q = props.summaryFixed, summaryFixed = _q === void 0 ? false : _q, _r = props.isAutoScrollY, isAutoScrollY = _r === void 0 ? false : _r, _s = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _s === void 0 ? 65 : _s, canvasTableId = props.canvasTableId, headerWrap = props.headerWrap, _t = props.headerAlign, headerAlign = _t === void 0 ? "center" : _t, tableRefHandle = props.tableRefHandle, exportExcelConfig = props.exportExcelConfig, _u = props.maxHeight, maxHeight = _u === void 0 ? 3000 : _u;
     var actualMode = "mode" in props ? mode : "index";
     var canvasRef = useRef(null);
     var containerRef = useRef(null);
@@ -62,17 +62,17 @@ function CanvasTable(props) {
         return String((_a = record[rowKey]) !== null && _a !== void 0 ? _a : index);
     }, [rowKey]);
     // 动态列配置
-    var _u = useDynamicListByColumns(columns, {
+    var _v = useDynamicListByColumns(columns, {
         dynamicKey: dynamicKey,
         dynamicVersion: dynamicVersion,
         customDynamicListHandle: customDynamicListHandle,
-    }), defaultDynamicList = _u.defaultDynamicList, currentDynamicList = _u.currentDynamicList, onCurrentListChange = _u.onCurrentListChange, dynamicSettingRef = _u.dynamicSettingRef;
+    }), defaultDynamicList = _v.defaultDynamicList, currentDynamicList = _v.currentDynamicList, onCurrentListChange = _v.onCurrentListChange, dynamicSettingRef = _v.dynamicSettingRef;
     // 根据动态列配置处理columns
     var dynamicColumns = useMemo(function () { return getTableColumns(columns, currentDynamicList); }, [columns, currentDynamicList]).columns;
     // 内部列宽状态（未开启动态配置时使用）
-    var _v = useState({}), internalColumnWidths = _v[0], setInternalColumnWidths = _v[1];
+    var _w = useState({}), internalColumnWidths = _w[0], setInternalColumnWidths = _w[1];
     // 跟踪用户手动调整过宽度的列（用于排除自动宽度分配）
-    var _w = useState(new Set()), manuallyResizedColumnKeys = _w[0], setManuallyResizedColumnKeys = _w[1];
+    var _x = useState(new Set()), manuallyResizedColumnKeys = _x[0], setManuallyResizedColumnKeys = _x[1];
     // 处理选中框列、序号列等
     var processedColumnsOld = useProcessedColumns({
         columns: columns,
@@ -87,47 +87,46 @@ function CanvasTable(props) {
         headerAlign: headerAlign,
     });
     // 表格状态管理
-    var _x = useTableState({
+    var _y = useTableState({
         dataSource: dataSource,
         columns: processedColumnsOld,
         rowSelection: rowSelection,
         onFilterChange: onFilterChange,
         isAutoMerge: isAutoMerge,
-    }), state = _x.state, setState = _x.setState, processedDataSource = _x.processedDataSource, handleFilterChange = _x.handleFilterChange, closeFilterPopover = _x.closeFilterPopover, autoGeneratedFilters = _x.autoGeneratedFilters;
+    }), state = _y.state, setState = _y.setState, processedDataSource = _y.processedDataSource, handleFilterChange = _y.handleFilterChange, closeFilterPopover = _y.closeFilterPopover, autoGeneratedFilters = _y.autoGeneratedFilters;
     var order = useMemo(function () {
         return state.sortOrder && state.sortField
             ? { field: state.sortField, order: state.sortOrder }
             : undefined;
     }, [state.sortOrder, state.sortField]);
-    var _y = useAutoMerge(processedDataSource, processedColumnsOld, {
+    var _z = useAutoMerge(processedDataSource, processedColumnsOld, {
         isAutoMerge: isAutoMerge,
         isDimensionDynamic: isDimensionDynamic,
         order: order,
         dimensionCustomSumKeys: dimensionCustomSumKeys,
-    }), newDataSource = _y[0], processedColumns = _y[1];
+    }), newDataSource = _z[0], processedColumns = _z[1];
     // 生成合计行和最终数据源
-    var _z = useSummaryRow({
+    var _0 = useSummaryRow({
         columns: processedColumns,
         dataSource: newDataSource,
-    }), finalDataSource = _z.finalDataSource, hasSummaryRow = _z.hasSummaryRow;
+    }), finalDataSource = _0.finalDataSource, hasSummaryRow = _0.hasSummaryRow;
     // 用于存储计算后的表头高度（用于自动高度的精确计算）
-    var _0 = useState(undefined), preciseHeaderHeight = _0[0], setPreciseHeaderHeight = _0[1];
+    var _1 = useState(undefined), preciseHeaderHeight = _1[0], setPreciseHeaderHeight = _1[1];
     // 用于存储是否需要横向滚动条（用于自动高度的精确计算）
-    var _1 = useState(false), needHorizontalScrollbar = _1[0], setNeedHorizontalScrollbar = _1[1];
+    var _2 = useState(false), needHorizontalScrollbar = _2[0], setNeedHorizontalScrollbar = _2[1];
     // 自动高度计算（需要在容器尺寸计算之前）
     var autoHeight = useCanvasTableAutoHeight(isAutoScrollY, autoScrollYMarginBottom, canvasTableId, finalDataSource.length, // 数据行数（用于 content 模式）
     headerHeight, // 表头基础高度（用于 content 模式的初始计算）
     rowHeight, // 行高（用于 content 模式）
     preciseHeaderHeight, // 计算后的表头高度（用于 content 模式的精确计算）
-    needHorizontalScrollbar // 是否需要横向滚动条（用于计算额外高度）
-    );
+    needHorizontalScrollbar, // 是否需要横向滚动条（用于计算额外高度）
+    maxHeight);
     // 监听容器尺寸变化（提前计算，用于列宽自适应）
     var containerSize = useContainerSize({
         containerRef: containerRef,
         width: width,
         height: isAutoScrollY ? autoHeight || height : height,
     });
-    console.log("containerSize", containerSize);
     var containerWidth = containerSize.width;
     var containerHeight = containerSize.height;
     // 计算列的渲染信息（使用容器宽度进行自适应填充）
@@ -181,7 +180,7 @@ function CanvasTable(props) {
         return calculateTotalHeight(calculatedHeaderHeight, finalDataSource.length, rowHeight);
     }, [calculatedHeaderHeight, finalDataSource.length, rowHeight]);
     // 计算滚动条指标
-    var _2 = useScrollbarMetrics({
+    var _3 = useScrollbarMetrics({
         containerWidth: containerWidth,
         containerHeight: containerHeight,
         totalWidth: totalWidth,
@@ -189,14 +188,14 @@ function CanvasTable(props) {
         headerHeight: calculatedHeaderHeight,
         scrollTop: 0,
         scrollLeft: 0,
-    }), maxScrollTop = _2.maxScrollTop, maxScrollLeft = _2.maxScrollLeft;
+    }), maxScrollTop = _3.maxScrollTop, maxScrollLeft = _3.maxScrollLeft;
     // 滚动管理（使用预先计算的maxScrollTop和maxScrollLeft）
-    var _3 = useTableScroll({
+    var _4 = useTableScroll({
         containerRef: containerRef,
         maxScrollTop: maxScrollTop,
         maxScrollLeft: maxScrollLeft,
         onScroll: onScroll,
-    }), scrollState = _3.scrollState, setScrollState = _3.setScrollState;
+    }), scrollState = _4.scrollState, setScrollState = _4.setScrollState;
     // 使用 ref 保存最新的滚动位置，确保在组件卸载过程中仍能访问
     var scrollPositionRef = useRef({ x: 0, y: 0 });
     useEffect(function () {
@@ -236,12 +235,12 @@ function CanvasTable(props) {
         needHorizontalScrollbar,
     ]);
     // 单元格框选
-    var _4 = useTableSelection({
+    var _5 = useTableSelection({
         state: state,
         setState: setState,
     }), 
     // selectionStartRef,
-    startSelection = _4.startSelection, updateSelection = _4.updateSelection, extendSelection = _4.extendSelection;
+    startSelection = _5.startSelection, updateSelection = _5.updateSelection, extendSelection = _5.extendSelection;
     // 处理列宽调整
     var handleColumnResize = useCallback(function (columnKey, newWidth) {
         var _a;
@@ -296,20 +295,20 @@ function CanvasTable(props) {
         onCurrentListChange,
     ]);
     // 列宽调整
-    var _5 = useColumnResize({
+    var _6 = useColumnResize({
         columnRenderInfos: columnRenderInfos,
         containerWidth: containerWidth,
         headerHeight: calculatedHeaderHeight,
         scrollLeft: scrollState.scrollLeft,
         onColumnResize: handleColumnResize,
-    }), resizeState = _5.resizeState, checkResizeHandle = _5.checkResizeHandle, startResize = _5.startResize, updateResize = _5.updateResize, endResize = _5.endResize, setHoverResizeColumn = _5.setHoverResizeColumn, getColumnWidth = _5.getColumnWidth, RESIZE_HANDLE_WIDTH = _5.RESIZE_HANDLE_WIDTH;
+    }), resizeState = _6.resizeState, checkResizeHandle = _6.checkResizeHandle, startResize = _6.startResize, updateResize = _6.updateResize, endResize = _6.endResize, setHoverResizeColumn = _6.setHoverResizeColumn, getColumnWidth = _6.getColumnWidth, RESIZE_HANDLE_WIDTH = _6.RESIZE_HANDLE_WIDTH;
     // 复制到剪贴板
-    var _6 = useCopyToClipboard({
+    var _7 = useCopyToClipboard({
         cellSelection: state.cellSelection,
         processedDataSource: finalDataSource,
         columns: processedColumns,
         containerRef: containerRef,
-    }), getSelectedCellsText = _6.getSelectedCellsText, copyToClipboard = _6.copyToClipboard;
+    }), getSelectedCellsText = _7.getSelectedCellsText, copyToClipboard = _7.copyToClipboard;
     // 处理右键菜单的复制操作
     var handleCopy = useCallback(function () {
         var text = getSelectedCellsText();
@@ -328,7 +327,7 @@ function CanvasTable(props) {
         summaryConfig: (exportExcelConfig === null || exportExcelConfig === void 0 ? void 0 : exportExcelConfig.isExportNoSummary) ? undefined : [],
     });
     // 交互事件处理（使用baseScrollbarMetrics的maxScrollTop/maxScrollLeft以保持稳定）
-    var _7 = useTableInteraction({
+    var _8 = useTableInteraction({
         state: state,
         setState: setState,
         scrollState: scrollState,
@@ -375,7 +374,7 @@ function CanvasTable(props) {
         fixedRowsCount: fixedRowsCount,
         fixedRowsConfig: fixedRowsConfig,
         summaryFixed: summaryFixed,
-    }), handleCanvasMouseDown = _7.handleCanvasMouseDown, handleCanvasMouseMove = _7.handleCanvasMouseMove, handleCanvasMouseUp = _7.handleCanvasMouseUp, handleCanvasMouseLeave = _7.handleCanvasMouseLeave, handleCanvasContextMenu = _7.handleCanvasContextMenu;
+    }), handleCanvasMouseDown = _8.handleCanvasMouseDown, handleCanvasMouseMove = _8.handleCanvasMouseMove, handleCanvasMouseUp = _8.handleCanvasMouseUp, handleCanvasMouseLeave = _8.handleCanvasMouseLeave, handleCanvasContextMenu = _8.handleCanvasContextMenu;
     // 渲染表格
     useTableRender(__assign(__assign({ canvasRef: canvasRef, processedDataSource: finalDataSource, columnRenderInfos: columnRenderInfos, columns: processedColumns, // 传递原始columns用于渲染多级表头
         state: state, scrollState: scrollState, rowSelection: rowSelection, containerWidth: containerWidth, containerHeight: containerHeight, headerHeight: calculatedHeaderHeight, baseHeaderHeight: headerHeight, // 传入原始基础高度用于计算每层高度

package/dist/es/canvastable/hooks/useAutoHeight.js

@@ -17,9 +17,10 @@ var SCROLLBAR_SIZE = 12;
  * @param needHorizontalScrollbar 是否需要横向滚动条（用于计算额外高度）
  * @returns 计算出的表格高度
  */
-function useCanvasTableAutoHeight(isAutoScrollY, marginBottom, canvasTableId, dataLength, headerHeight, rowHeight, calculatedHeaderHeight, needHorizontalScrollbar) {
+function useCanvasTableAutoHeight(isAutoScrollY, marginBottom, canvasTableId, dataLength, headerHeight, rowHeight, calculatedHeaderHeight, needHorizontalScrollbar, maxHeight) {
     if (marginBottom === void 0) { marginBottom = 65; }
     if (needHorizontalScrollbar === void 0) { needHorizontalScrollbar = false; }
+    if (maxHeight === void 0) { maxHeight = 3000; }
     var _a = useState(undefined), tableHeight = _a[0], setTableHeight = _a[1];
     useEffect(function () {
         // 归一化模式：true 转换为 'viewport'
@@ -41,7 +42,7 @@ function useCanvasTableAutoHeight(isAutoScrollY, marginBottom, canvasTableId, da
                 // 设置最小高度和最大高度
                 var minHeight = 200;
                 // 如果没有数据，使用最小高度（包含表头和空状态提示）
-                var finalHeight = dataLength === 0 ? minHeight : Math.max(calculatedHeight, minHeight);
+                var finalHeight = dataLength === 0 ? minHeight : Math.min(calculatedHeight, maxHeight);
                 setTableHeight(finalHeight);
             }
             return;

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

@@ -245,6 +245,10 @@ interface ICanvasTableProps<RecordType = any> {
      * 表格高度
      */
     height?: number;
+    /**
+     * 表格最大高度
+     */
+    maxHeight?: number;
     /**
      * 表格宽度
      */

package/dist/es/dynamicsetting/dynamicDrawer.js

@@ -124,7 +124,34 @@ var DynamicDrawer = function (props, ref) {
         onSure && onSure(tempDynamicList);
     };
     var onCheckboxChange = function (checkedValues) {
-        // 1. 构建互斥关系映射
+        // 1. 找出本次变化的项（新增或移除的）
+        var prevCheckedKeys = new Set(checkedValues.filter(function (key) {
+            var item = tempDynamicList.find(function (d) { return d.key === key; });
+            return item && item.checked;
+        }));
+        var currentCheckedKeys = new Set(checkedValues);
+        // 找出新增的和移除的 key
+        var changedKey = null;
+        var isChecked = false;
+        for (var _i = 0, checkedValues_1 = checkedValues; _i < checkedValues_1.length; _i++) {
+            var key = checkedValues_1[_i];
+            if (!prevCheckedKeys.has(key)) {
+                changedKey = key;
+                isChecked = true;
+                break;
+            }
+        }
+        if (!changedKey) {
+            for (var _a = 0, tempDynamicList_1 = tempDynamicList; _a < tempDynamicList_1.length; _a++) {
+                var item = tempDynamicList_1[_a];
+                if (item.checked && !currentCheckedKeys.has(item.key)) {
+                    changedKey = item.key;
+                    isChecked = false;
+                    break;
+                }
+            }
+        }
+        // 2. 构建互斥关系映射
         var exclusiveMap = {};
         tempDynamicList.forEach(function (item) {
             var key = item.key;
@@ -134,7 +161,7 @@ var DynamicDrawer = function (props, ref) {
                 .filter(Boolean);
             exclusiveMap[key] = new Set(__spreadArray([key], exclusiveKeys, true));
         });
-        // 2. 检查本次勾选是否有互斥
+        // 3. 检查本次勾选是否有互斥
         var hasConflict = false;
         for (var i = 0; i < checkedValues.length; i++) {
             for (var j = i + 1; j < checkedValues.length; j++) {
@@ -152,8 +179,22 @@ var DynamicDrawer = function (props, ref) {
             myMessage.warning("所选项存在互斥关系，不能同时勾选！");
             return; // 拦截本次勾选
         }
-        // 3. 正常更新
-        var newDynamicList = tempDynamicList.map(function (item) { return (__assign(__assign({}, item), { checked: checkedValues.includes(item.key) })); });
+        // 3. 正常更新，包括联动子元素
+        var newDynamicList = tempDynamicList.map(function (item) {
+            var isItemChecked = checkedValues.includes(item.key);
+            var newItem = __assign(__assign({}, item), { checked: isItemChecked });
+            // 如果当前变化的是这个主元素，并且它有子元素，联动子元素
+            if (item.key === changedKey &&
+                item.children &&
+                item.children.length > 0) {
+                newItem.children = item.children.map(function (child) { return (__assign(__assign({}, child), { checked: isChecked })); });
+            }
+            else if (item.children && item.children.length > 0) {
+                // 保持原有的子元素状态
+                newItem.children = item.children.map(function (child) { return (__assign({}, child)); });
+            }
+            return newItem;
+        });
         setTempDynamicList(newDynamicList);
     };
     var onChildCheckboxChange = function (checkedValues, pIndex) {
@@ -163,6 +204,7 @@ var DynamicDrawer = function (props, ref) {
         var changeCList = ((_b = (_a = newDynamicList[pIndex].children) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, function (item) { return (__assign({}, item)); })) ||
             [] ||
             [];
+        // 更新子元素的选中状态
         changeCList.forEach(function (item) {
             if (!checkedValues.find(function (value) { return value === item.key; })) {
                 item.checked = false;
@@ -172,6 +214,17 @@ var DynamicDrawer = function (props, ref) {
             }
         });
         newDynamicList[pIndex].children = changeCList;
+        // 联动父元素
+        var allChildrenChecked = changeCList.length > 0 && changeCList.every(function (child) { return child.checked; });
+        changeCList.some(function (child) { return child.checked; });
+        if (allChildrenChecked) {
+            // 所有子元素都选中，父元素也选中
+            newDynamicList[pIndex].checked = true;
+        }
+        else {
+            // 部分选中或全不选中，父元素取消选中（配合 indeterminate 显示半选状态）
+            newDynamicList[pIndex].checked = false;
+        }
         setTempDynamicList(sortDynamicListByType(newDynamicList));
     };
     // 后期可能需要拓展功能
@@ -197,14 +250,19 @@ var DynamicDrawer = function (props, ref) {
         return (jsxs("div", { children: [title && jsx("div", __assign({ className: "dynamic-drawer-section-title" }, { children: title })), list.map(function (item, index) {
                     var key = item.key, disabled = item.disabled, label = item.label, fixed = item.fixed, children = item.children, isDimensionSum = item.isDimensionSum, isDimension = item.isDimension;
                     var childrenCheckedValues = [];
-                    if (Array.isArray(children)) {
+                    var isIndeterminate = false; // 半选状态
+                    if (Array.isArray(children) && children.length > 0) {
                         children.forEach(function (item) {
                             if (item.checked) {
                                 childrenCheckedValues.push(item.key);
                             }
                         });
+                        // 计算半选状态：有子元素选中，但不是全部选中
+                        var hasChecked = childrenCheckedValues.length > 0;
+                        var allChecked = childrenCheckedValues.length === children.length;
+                        isIndeterminate = hasChecked && !allChecked;
                     }
-                    return (jsxs(Sortable, __assign({ type: "search-drawer", index: indexOffset + index, onMoveItem: onMoveItem }, { children: [jsxs("div", __assign({ className: "zt-sortable--item dynamic-drawer-card" }, { children: [jsx(Checkbox, __assign({ value: key, disabled: disabled }, { children: label || key })), isMore && (!children || children.length === 0) && (jsx(MoreConfig, { fixed: fixed || "", isDimensionSum: isDimensionSum, onChange: function (result) {
+                    return (jsxs(Sortable, __assign({ type: "search-drawer", index: indexOffset + index, onMoveItem: onMoveItem }, { children: [jsxs("div", __assign({ className: "zt-sortable--item dynamic-drawer-card" }, { children: [jsx(Checkbox, __assign({ value: key, disabled: disabled, indeterminate: isIndeterminate }, { children: label || key })), isMore && (!children || children.length === 0) && (jsx(MoreConfig, { fixed: fixed || "", isDimensionSum: isDimensionSum, onChange: function (result) {
                                             onMoreChange(key, result);
                                         }, isSum: isDimension, isFixed: isFixed }))] })), Array.isArray(children) && children.length > 0 ? (jsx("div", __assign({ className: "zt-sortable--children dynamic-drawer-children", style: { marginLeft: 32, marginBottom: 8 } }, { children: jsx(Checkbox.Group, __assign({ value: childrenCheckedValues, onChange: function (checkedValues) {
                                         onChildCheckboxChange(checkedValues, tempDynamicList.indexOf(item));

package/dist/es/table/excel.js

@@ -1,6 +1,6 @@
 import { __spreadArray, __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
 import ExcelJS from '../node_modules/exceljs/dist/exceljs.min.js';
-import { useMergeKeys, useNumKeys } from './hooks.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';
@@ -10,7 +10,7 @@ import dayjs from 'dayjs';
  * 使用 ExcelJS + 后处理添加批注
  * 导出Excel，支持维度合并和小计，以及批注功能
  */
-function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight) {
+function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight) {
     var _a;
     var _this = this;
     if (fileName === void 0) { fileName = "export.xlsx"; }
@@ -62,8 +62,8 @@ function exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys,
     var worksheet = createWorksheetWithMerge(workbook, __assign(__assign({}, excelData), { summaryRow: summaryRow }), mergeKeys, sheetName);
     // 设置冻结窗格
     setWorksheetFreeze(worksheet, excelData.leafColumns, excelData.headerRowCount);
-    // 添加样式
-    applyExcelStyles(worksheet, dataForStyles, numKeys, excelData.leafColumns, excelData.headerRowCount, !!excelData.topDescription, topDescriptionRowHeight);
+    // 添加样式和格式
+    applyExcelStyles(worksheet, dataForStyles, numKeys, dateKeys, excelData.leafColumns, excelData.headerRowCount, !!excelData.topDescription, topDescriptionRowHeight);
     // 添加批注 - 使用改进的方法
     addCommentsToWorksheet(worksheet, dataForStyles, excelData.leafColumns, excelData.headerRowCount);
     // 导出文件
@@ -376,7 +376,7 @@ function createWorksheetWithMerge(workbook, excelData, mergeKeys, sheetName) {
     }
     return worksheet;
 }
-function applyExcelStyles(worksheet, data, numKeys, columns, headerRowCount, hasTopDescription, topDescriptionRowHeight) {
+function applyExcelStyles(worksheet, data, numKeys, dateKeys, columns, headerRowCount, hasTopDescription, topDescriptionRowHeight) {
     var _a, _b, _c;
     if (headerRowCount === void 0) { headerRowCount = 1; }
     if (hasTopDescription === void 0) { hasTopDescription = false; }
@@ -539,20 +539,47 @@ function applyExcelStyles(worksheet, data, numKeys, columns, headerRowCount, has
             }
         }
     }
+    // 日期列格式
+    if (dateKeys && dateKeys.length > 0 && columns) {
+        for (var rowIndex = 0; rowIndex < data.length; rowIndex++) {
+            var rowData = data[rowIndex];
+            var _loop_3 = function (dateKey) {
+                var colIndex = columns.findIndex(function (col) { return col.dataIndex === dateKey.dataIndex; });
+                if (colIndex === -1)
+                    return "continue";
+                var cell = worksheet.getCell(headerRowCount + rowIndex + 1, colIndex + 1);
+                var cellValue = rowData[dateKey.dataIndex];
+                if (cellValue) {
+                    try {
+                        var date = dayjs(cellValue).toDate();
+                        cell.value = date;
+                        cell.numFmt = columns[colIndex].dateFormat;
+                    }
+                    catch (e) {
+                        console.warn("日期格式转换失败:", e);
+                    }
+                }
+            };
+            for (var _e = 0, dateKeys_1 = dateKeys; _e < dateKeys_1.length; _e++) {
+                var dateKey = dateKeys_1[_e];
+                _loop_3(dateKey);
+            }
+        }
+    }
 }
 /**
  * 主要的导出函数，使用改进的批注功能
  */
-function exportToExcelWithMerge(records, columns, mergeKeys, numKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight) {
+function exportToExcelWithMerge(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight) {
     if (fileName === void 0) { fileName = "export.xlsx"; }
     if (sheetName === void 0) { sheetName = "Sheet1"; }
-    return exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight);
+    return exportToExcelWithMergeAndComments(records, columns, mergeKeys, numKeys, dateKeys, fileName, sheetName, columnHeaders, summaryConfig, topDescription, topDescriptionRowHeight);
 }
 /**
  * 简化版本的导出函数
  */
 function exportToExcelSimple(records, config) {
-    return exportToExcelWithMerge(records, config.columns || [], config.mergeKeys, config.numKeys || [], config.fileName || "export.xlsx", config.sheetName || "Sheet1", config.columnHeaders, config.summaryConfig, config.topDescription, config.topDescriptionRowHeight);
+    return exportToExcelWithMerge(records, config.columns || [], config.mergeKeys, config.numKeys || [], config.dateKeys, config.fileName || "export.xlsx", config.sheetName || "Sheet1", config.columnHeaders, config.summaryConfig, config.topDescription, config.topDescriptionRowHeight);
 }
 /**
  * Hook 版本，支持选择导出方式
@@ -561,6 +588,7 @@ function useExcelExport(records, config) {
     var columns = config.columns, isAutoMerge = config.isAutoMerge, columnHeaders = config.columnHeaders, summaryConfig = config.summaryConfig;
     var mergeKeys = useMergeKeys(columns, isAutoMerge);
     var numKeys = useNumKeys(columns);
+    var dateKeys = useDateKeys(columns);
     var exportFunction = useMemoizedFn(function (fileName, options) {
         var _a = options || {}, topDescription = _a.topDescription, topDescriptionRowHeight = _a.topDescriptionRowHeight, time = _a.time;
         if (!fileName.includes(".xlsx")) {
@@ -573,6 +601,7 @@ function useExcelExport(records, config) {
             columns: columns,
             mergeKeys: mergeKeys,
             numKeys: numKeys,
+            dateKeys: dateKeys,
             fileName: fileName,
             columnHeaders: columnHeaders,
             summaryConfig: summaryConfig,

package/dist/es/table/hooks.js

@@ -400,6 +400,22 @@ var useNumKeys = function (columns) {
     }, [columns]);
     return numKeys;
 };
+/**
+ * 获取带有 dateFormat 的列的 keys
+ */
+var useDateKeys = function (columns) {
+    var dateKeys = useMemo(function () {
+        var leafColumns = getLeafColumns(columns);
+        return leafColumns
+            .filter(function (item) { return item.dateFormat !== undefined; })
+            .map(function (item) { return ({
+            key: item.key,
+            dataIndex: item.dataIndex,
+            dateFormat: item.dateFormat,
+        }); });
+    }, [columns]);
+    return dateKeys;
+};
 /**
  * 自动合并的一些处理
  */
@@ -608,4 +624,4 @@ function useCustomFilter(dataSource) {
     return [newDataSource, handleFilterConfigChange];
 }
 
-export { useAddAndDelChange, useAutoMerge, useCalcScrollY, useCustomFilter, useCustomSort, useEditChange, useMergeAddAndDel, useMergeKeys, useMoveRowChange, useNumKeys, useScuRfresh };
+export { useAddAndDelChange, useAutoMerge, useCalcScrollY, useCustomFilter, useCustomSort, useDateKeys, useEditChange, useMergeAddAndDel, useMergeKeys, useMoveRowChange, useNumKeys, useScuRfresh };

package/package.json

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