zmdms-webui 2.3.5 → 2.3.7

package/dist/es/canvastable/canvasTable.js

@@ -1,6 +1,6 @@
 import { __assign } from '../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useRef, useState, useCallback, useMemo } from 'react';
+import { useRef, useState, useCallback, useMemo, useImperativeHandle } from 'react';
 import { Spin } from 'antd';
 import './components/FilterPopover.js';
 import CellOverlay from './components/CellOverlay.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, _m = props.mode, mode = _m === void 0 ? "index" : _m, dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isDimensionDynamic = props.isDimensionDynamic, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, _o = props.isIndexMerge, isIndexMerge = _o === void 0 ? true : _o, _p = props.isSelectionMerge, isSelectionMerge = _p === void 0 ? false : _p, _q = props.renderMode, renderMode = _q === void 0 ? "object" : _q, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, _r = props.summaryFixed, summaryFixed = _r === void 0 ? false : _r, _s = props.isAutoScrollY, isAutoScrollY = _s === void 0 ? false : _s, _t = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _t === void 0 ? 65 : _t, canvasTableId = props.canvasTableId, headerWrap = props.headerWrap;
+    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, _m = props.mode, mode = _m === void 0 ? "index" : _m, dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isDimensionDynamic = props.isDimensionDynamic, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, _o = props.isIndexMerge, isIndexMerge = _o === void 0 ? true : _o, _p = props.isSelectionMerge, isSelectionMerge = _p === void 0 ? false : _p, _q = props.renderMode, renderMode = _q === void 0 ? "object" : _q, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, _r = props.summaryFixed, summaryFixed = _r === void 0 ? false : _r, _s = props.isAutoScrollY, isAutoScrollY = _s === void 0 ? false : _s, _t = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _t === void 0 ? 65 : _t, canvasTableId = props.canvasTableId, headerWrap = props.headerWrap, _u = props.headerAlign, headerAlign = _u === void 0 ? "center" : _u, tableRefHandle = props.tableRefHandle, exportExcelConfig = props.exportExcelConfig;
     var canvasRef = useRef(null);
     var containerRef = useRef(null);
     var filterPopoverRef = useRef(null);
@@ -61,20 +61,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;
-    // 计算表头动态高度（支持wrap换行）
-    var calculatedHeaderHeight = useHeaderHeight({
-        columns: (dynamicColumns || columns),
-        headerHeight: headerHeight,
-    });
     // 内部列宽状态（未开启动态配置时使用）
-    var _v = useState({}), internalColumnWidths = _v[0], setInternalColumnWidths = _v[1];
+    var _w = useState({}), internalColumnWidths = _w[0], setInternalColumnWidths = _w[1];
+    // 跟踪用户手动调整过宽度的列（用于排除自动宽度分配）
+    var _x = useState(new Set()), manuallyResizedColumnKeys = _x[0], setManuallyResizedColumnKeys = _x[1];
     // 处理选中框列、序号列等
     var processedColumnsOld = useProcessedColumns({
         columns: columns,
@@ -86,32 +83,53 @@ function CanvasTable(props) {
         renderMode: renderMode,
         dynamicSettingRef: dynamicSettingRef,
         headerWrap: headerWrap,
+        headerAlign: headerAlign,
     });
     // 表格状态管理
-    var _w = useTableState({
+    var _y = useTableState({
         dataSource: dataSource,
         columns: processedColumnsOld,
         rowSelection: rowSelection,
         onFilterChange: onFilterChange,
-    }), state = _w.state, setState = _w.setState, processedDataSource = _w.processedDataSource, handleFilterChange = _w.handleFilterChange, closeFilterPopover = _w.closeFilterPopover, autoGeneratedFilters = _w.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 _x = useAutoMerge(processedDataSource, processedColumnsOld, {
+    var _z = useAutoMerge(processedDataSource, processedColumnsOld, {
         isAutoMerge: isAutoMerge,
         isDimensionDynamic: isDimensionDynamic,
         order: order,
         dimensionCustomSumKeys: dimensionCustomSumKeys,
-    }), newDataSource = _x[0], processedColumns = _x[1];
+    }), newDataSource = _z[0], processedColumns = _z[1];
     // 生成合计行和最终数据源
-    var _y = useSummaryRow({
+    var _0 = useSummaryRow({
         columns: processedColumns,
         dataSource: newDataSource,
-    }), finalDataSource = _y.finalDataSource, hasSummaryRow = _y.hasSummaryRow;
-    // 计算列的渲染信息
-    var columnRenderInfos = useMemo(function () { return calculateColumnRenderInfos(processedColumns); }, [processedColumns]);
+    }), finalDataSource = _0.finalDataSource, hasSummaryRow = _0.hasSummaryRow;
+    // 自动高度计算（需要在容器尺寸计算之前）
+    var autoHeight = useCanvasTableAutoHeight(isAutoScrollY, autoScrollYMarginBottom, canvasTableId);
+    // 监听容器尺寸变化（提前计算，用于列宽自适应）
+    var containerSize = useContainerSize({
+        containerRef: containerRef,
+        width: width,
+        height: isAutoScrollY ? autoHeight || height : height,
+    });
+    var containerWidth = containerSize.width;
+    var containerHeight = containerSize.height;
+    // 计算列的渲染信息（使用容器宽度进行自适应填充）
+    // 手动调整过宽度的列不参与自动宽度分配
+    var columnRenderInfos = useMemo(function () {
+        return calculateColumnRenderInfos(processedColumns, containerWidth, manuallyResizedColumnKeys);
+    }, [processedColumns, containerWidth, manuallyResizedColumnKeys]);
+    // 计算表头动态高度（支持wrap换行）
+    // 注意：必须在 columnRenderInfos 计算之后，以便使用实际的列宽
+    var calculatedHeaderHeight = useHeaderHeight({
+        columns: processedColumns,
+        headerHeight: headerHeight,
+        columnRenderInfos: columnRenderInfos,
+    });
     // 计算合并单元格信息
     var mergeCellMap = useMergeCells({
         dataSource: finalDataSource,
@@ -124,18 +142,8 @@ function CanvasTable(props) {
     var totalHeight = useMemo(function () {
         return calculateTotalHeight(calculatedHeaderHeight, finalDataSource.length, rowHeight);
     }, [calculatedHeaderHeight, finalDataSource.length, rowHeight]);
-    // 自动高度计算
-    var autoHeight = useCanvasTableAutoHeight(isAutoScrollY, autoScrollYMarginBottom, canvasTableId);
-    // 监听容器尺寸变化
-    var containerSize = useContainerSize({
-        containerRef: containerRef,
-        width: width,
-        height: isAutoScrollY ? autoHeight || height : height,
-    });
-    var containerWidth = containerSize.width;
-    var containerHeight = containerSize.height;
     // 计算滚动条指标
-    var _z = useScrollbarMetrics({
+    var _1 = useScrollbarMetrics({
         containerWidth: containerWidth,
         containerHeight: containerHeight,
         totalWidth: totalWidth,
@@ -143,15 +151,15 @@ function CanvasTable(props) {
         headerHeight: calculatedHeaderHeight,
         scrollTop: 0,
         scrollLeft: 0,
-    }), maxScrollTop = _z.maxScrollTop, maxScrollLeft = _z.maxScrollLeft;
+    }), maxScrollTop = _1.maxScrollTop, maxScrollLeft = _1.maxScrollLeft;
     // 滚动管理（使用预先计算的maxScrollTop和maxScrollLeft）
-    var _0 = useTableScroll({
+    var _2 = useTableScroll({
         canvasRef: canvasRef,
         containerRef: containerRef,
         maxScrollTop: maxScrollTop,
         maxScrollLeft: maxScrollLeft,
         onScroll: onScroll,
-    }), scrollState = _0.scrollState, setScrollState = _0.setScrollState;
+    }), scrollState = _2.scrollState, setScrollState = _2.setScrollState;
     // 数据变化时重置滚动位置（筛选、排序、数据源更新等操作后）
     useScrollReset({
         dataSourceLength: dataSource.length,
@@ -172,17 +180,23 @@ function CanvasTable(props) {
         scrollLeft: scrollState.scrollLeft,
     }).actualMetrics;
     // 单元格框选
-    var _1 = useTableSelection({
+    var _3 = useTableSelection({
         state: state,
         setState: setState,
     }), 
     // selectionStartRef,
-    startSelection = _1.startSelection, updateSelection = _1.updateSelection, extendSelection = _1.extendSelection;
+    startSelection = _3.startSelection, updateSelection = _3.updateSelection, extendSelection = _3.extendSelection;
     // 处理列宽调整
     var handleColumnResize = useCallback(function (columnKey, newWidth) {
         var _a;
         // 先调用外部回调（用户可以监听列宽变化）
         onColumnResize === null || onColumnResize === void 0 ? void 0 : onColumnResize(columnKey, newWidth);
+        // 记录用户手动调整过的列
+        setManuallyResizedColumnKeys(function (prev) {
+            var newSet = new Set(prev);
+            newSet.add(columnKey);
+            return newSet;
+        });
         if (dynamicKey && currentDynamicList) {
             // 开启了动态配置：更新到动态配置中
             var newList = currentDynamicList.map(function (item) { return (__assign({}, item)); });
@@ -226,13 +240,13 @@ function CanvasTable(props) {
         onCurrentListChange,
     ]);
     // 列宽调整
-    var _2 = useColumnResize({
+    var _4 = useColumnResize({
         columnRenderInfos: columnRenderInfos,
         containerWidth: containerWidth,
         headerHeight: calculatedHeaderHeight,
         scrollLeft: scrollState.scrollLeft,
         onColumnResize: handleColumnResize,
-    }), resizeState = _2.resizeState, checkResizeHandle = _2.checkResizeHandle, startResize = _2.startResize, updateResize = _2.updateResize, endResize = _2.endResize, setHoverResizeColumn = _2.setHoverResizeColumn, getColumnWidth = _2.getColumnWidth, RESIZE_HANDLE_WIDTH = _2.RESIZE_HANDLE_WIDTH;
+    }), resizeState = _4.resizeState, checkResizeHandle = _4.checkResizeHandle, startResize = _4.startResize, updateResize = _4.updateResize, endResize = _4.endResize, setHoverResizeColumn = _4.setHoverResizeColumn, getColumnWidth = _4.getColumnWidth, RESIZE_HANDLE_WIDTH = _4.RESIZE_HANDLE_WIDTH;
     // 复制到剪贴板
     var getSelectedCellsText = useCopyToClipboard({
         cellSelection: state.cellSelection,
@@ -249,13 +263,17 @@ function CanvasTable(props) {
             });
         }
     }, [getSelectedCellsText]);
+    // 过滤勾选框和index行给导出用
+    var exportColumns = useMemo(function () {
+        return processedColumns.filter(function (item) { return !item.key.includes("__"); });
+    }, [processedColumns]);
     // Excel导出功能
     var exportExcel = useExcelExport(processedDataSource, {
-        columns: processedColumns,
+        columns: exportColumns,
         isAutoMerge: isAutoMerge,
     });
     // 交互事件处理（使用baseScrollbarMetrics的maxScrollTop/maxScrollLeft以保持稳定）
-    var _3 = useTableInteraction({
+    var _5 = useTableInteraction({
         state: state,
         setState: setState,
         scrollState: scrollState,
@@ -301,10 +319,11 @@ function CanvasTable(props) {
         fixedRowsCount: fixedRowsCount,
         fixedRowsConfig: fixedRowsConfig,
         summaryFixed: summaryFixed,
-    }), handleCanvasMouseDown = _3.handleCanvasMouseDown, handleCanvasMouseMove = _3.handleCanvasMouseMove, handleCanvasMouseUp = _3.handleCanvasMouseUp, handleCanvasMouseLeave = _3.handleCanvasMouseLeave, handleCanvasContextMenu = _3.handleCanvasContextMenu;
+    }), handleCanvasMouseDown = _5.handleCanvasMouseDown, handleCanvasMouseMove = _5.handleCanvasMouseMove, handleCanvasMouseUp = _5.handleCanvasMouseUp, handleCanvasMouseLeave = _5.handleCanvasMouseLeave, handleCanvasContextMenu = _5.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, rowHeight: rowHeight, bordered: bordered, striped: striped }, scrollbarMetrics), { getRowKey: getRowKey, resizeState: resizeState, getColumnWidth: getColumnWidth, RESIZE_HANDLE_WIDTH: RESIZE_HANDLE_WIDTH, mergeCellMap: mergeCellMap, hasSummaryRow: hasSummaryRow, fixedRowsCount: fixedRowsCount, fixedRowsConfig: fixedRowsConfig, summaryFixed: summaryFixed }));
+        state: state, scrollState: scrollState, rowSelection: rowSelection, containerWidth: containerWidth, containerHeight: containerHeight, headerHeight: calculatedHeaderHeight, baseHeaderHeight: headerHeight, // 传入原始基础高度用于计算每层高度
+        rowHeight: rowHeight, bordered: bordered, striped: striped }, scrollbarMetrics), { getRowKey: getRowKey, resizeState: resizeState, getColumnWidth: getColumnWidth, RESIZE_HANDLE_WIDTH: RESIZE_HANDLE_WIDTH, mergeCellMap: mergeCellMap, hasSummaryRow: hasSummaryRow, fixedRowsCount: fixedRowsCount, fixedRowsConfig: fixedRowsConfig, summaryFixed: summaryFixed }));
     // 单元格覆盖层
     var cellOverlays = useTableCellOverlay({
         canvasRef: canvasRef,
@@ -362,11 +381,85 @@ function CanvasTable(props) {
         isVisible: state.badgePopover.visible,
         onClose: handleCloseBadgePopover,
     });
+    // 暴露给外部的方法
+    useImperativeHandle(tableRefHandle, function () { return ({
+        /** 获取当前表格的配置信息（动态列配置） */
+        getDynamicList: function () {
+            return currentDynamicList || [];
+        },
+        /** 动态列配置重置 */
+        onResetDynamicList: function () {
+            var _a, _b;
+            (_b = (_a = dynamicSettingRef.current) === null || _a === void 0 ? void 0 : _a.resetList) === null || _b === void 0 ? void 0 : _b.call(_a);
+        },
+        /** 动态列配置设置 */
+        onSetDynamicList: function (list) {
+            var _a, _b;
+            (_b = (_a = dynamicSettingRef.current) === null || _a === void 0 ? void 0 : _a.updateList) === null || _b === void 0 ? void 0 : _b.call(_a, list);
+        },
+        /** 导出Excel */
+        exportExcel: exportExcel,
+        /** 获取表格容器 */
+        getContainer: function () { return containerRef.current; },
+        /** 全屏展示表格 */
+        toggleFullScreen: function () {
+            var _a;
+            (_a = tableMenuRef.current) === null || _a === void 0 ? void 0 : _a.toggleFullscreen();
+        },
+        /** 获取选中的行keys */
+        getSelectedRowKeys: function () {
+            return state.selectedRowKeys;
+        },
+        /** 设置选中的行keys */
+        setSelectedRowKeys: function (keys) {
+            setState(function (prev) { return (__assign(__assign({}, prev), { selectedRowKeys: keys })); });
+        },
+        /** 滚动到指定位置 */
+        scrollTo: function (params) {
+            setScrollState(function (prev) { return (__assign(__assign({}, prev), { scrollLeft: params.x !== undefined ? params.x : prev.scrollLeft, scrollTop: params.y !== undefined ? params.y : prev.scrollTop })); });
+        },
+        /** 获取当前排序状态 */
+        getSortState: function () {
+            return {
+                field: state.sortField,
+                order: state.sortOrder,
+            };
+        },
+        /** 获取当前过滤状态 */
+        getFilterState: function () {
+            return state.filters;
+        },
+        /** 清除排序 */
+        clearSort: function () {
+            setState(function (prev) { return (__assign(__assign({}, prev), { sortField: null, sortOrder: null })); });
+        },
+        /** 清除过滤 */
+        clearFilter: function () {
+            setState(function (prev) { return (__assign(__assign({}, prev), { filters: {} })); });
+        },
+    }); }, [
+        currentDynamicList,
+        dynamicSettingRef,
+        exportExcel,
+        state.selectedRowKeys,
+        state.sortField,
+        state.sortOrder,
+        state.filters,
+        setState,
+        setScrollState,
+    ]);
     return (jsx(Spin, __assign({ spinning: loading }, { children: jsxs("div", __assign({ ref: containerRef, id: canvasTableId, className: "canvas-table-container ".concat(className || ""), tabIndex: 0, style: __assign(__assign({}, style), { position: "relative", width: width || "100%", height: containerHeight, overflow: "hidden", touchAction: "none", outline: "none" }) }, { children: [jsx("canvas", { ref: canvasRef, onMouseDown: handleCanvasMouseDown, onMouseMove: handleCanvasMouseMove, onMouseUp: handleCanvasMouseUp, onMouseLeave: handleCanvasMouseLeave, onContextMenu: handleCanvasContextMenu, style: {
                         display: "block",
                         // cursor 由 useTableInteraction 动态管理
                         touchAction: "none",
-                    } }), dynamicKey ? (jsx(DynamicSetting, { parentDynamicKey: TABLE_DYNAMIC_KEY, dynamicKey: dynamicKey, defaultList: defaultDynamicList, onCurrentListChange: onCurrentListChange, ref: dynamicSettingRef, hiddenOperationIcon: true, isMore: true, isFixed: true, isDimensionDynamic: isDimensionDynamic })) : null, jsx(EmptyPlaceholder, { visible: finalDataSource.length === 0, text: emptyText, headerHeight: calculatedHeaderHeight }), jsx(HeaderOverlay, { overlays: headerOverlays }), jsx(CellOverlay, { overlays: cellOverlays }), filterPopoverElement, jsx(Tooltip, { visible: state.tooltip.visible, content: state.tooltip.content, position: state.tooltip.position }), jsx(BadgePopover, { visible: state.badgePopover.visible, content: state.badgePopover.content, position: state.badgePopover.position, popoverRef: badgePopoverRef }), menuId ? (jsx(CanvasTableMenu, { menuId: menuId, containerRef: containerRef, isFullscreenHandle: isFullscreenHandle, tableMenuRef: tableMenuRef, onCopy: handleCopy, onExport: dynamicKey ? exportExcel : undefined })) : null] })) })));
+                        // 优化文本渲染 - 使用系统级文本渲染优化
+                        fontSmooth: "always",
+                        WebkitFontSmoothing: "antialiased",
+                        MozOsxFontSmoothing: "grayscale",
+                        textRendering: "optimizeLegibility",
+                    } }), dynamicKey ? (jsx(DynamicSetting, { parentDynamicKey: TABLE_DYNAMIC_KEY, dynamicKey: dynamicKey, defaultList: defaultDynamicList, onCurrentListChange: onCurrentListChange, ref: dynamicSettingRef, hiddenOperationIcon: true, isMore: true, isFixed: true, isDimensionDynamic: isDimensionDynamic })) : null, jsx(EmptyPlaceholder, { visible: finalDataSource.length === 0, text: emptyText, headerHeight: calculatedHeaderHeight }), jsx(HeaderOverlay, { overlays: headerOverlays }), jsx(CellOverlay, { overlays: cellOverlays }), filterPopoverElement, jsx(Tooltip, { visible: state.tooltip.visible, content: state.tooltip.content, position: state.tooltip.position }), jsx(BadgePopover, { visible: state.badgePopover.visible, content: state.badgePopover.content, position: state.badgePopover.position, popoverRef: badgePopoverRef }), menuId ? (jsx(CanvasTableMenu, { menuId: menuId, containerRef: containerRef, isFullscreenHandle: isFullscreenHandle, tableMenuRef: tableMenuRef, onCopy: handleCopy, onExport: function () {
+                        return exportExcel((exportExcelConfig === null || exportExcelConfig === void 0 ? void 0 : exportExcelConfig.fileName) || "表格数据.xlsx", __assign({}, exportExcelConfig));
+                    } })) : null] })) })));
 }
 
 export { CanvasTable as default };

package/dist/es/canvastable/components/CanvasTableMenu.js

@@ -32,8 +32,7 @@ var CanvasTableMenu = function (_a) {
                 break;
             }
             case "export": {
-                var fileName = "\u8868\u683C\u6570\u636E_".concat(new Date().toLocaleDateString());
-                onExport === null || onExport === void 0 ? void 0 : onExport(fileName);
+                onExport === null || onExport === void 0 ? void 0 : onExport();
                 break;
             }
         }

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

@@ -1,14 +1,8 @@
 import { __spreadArray } from '../../_virtual/_tslib.js';
 import { useState, useEffect } from 'react';
-import { getMaxDepth } from '../utils/multiHeaderHelpers.js';
+import { getMaxDepth, calculateLayerHeights } from '../utils/multiHeaderHelpers.js';
+import { FONT_SIZE, FONT_FAMILY, LINE_HEIGHT, TEXT_PADDING, FILTER_ICON_WIDTH, SORT_ICON_WIDTH, ICON_SPACING } from '../utils/constants.js';
 
-var FONT_SIZE = 13;
-var FONT_FAMILY = '"Microsoft YaHei", 微软雅黑, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif';
-var LINE_HEIGHT = 20;
-var FILTER_ICON_WIDTH = 15;
-var SORT_ICON_WIDTH = 15;
-var ICON_SPACING = 4;
-var TEXT_PADDING = 16;
 /**
  * 计算文本在给定宽度下需要的行数
  */
@@ -46,12 +40,11 @@ var calculateTextLines = function (ctx, text, maxWidth) {
 /**
  * 计算单个列标题需要的行数
  */
-var calculateColumnLines = function (ctx, column) {
+var calculateColumnLines = function (ctx, column, columnWidth) {
     if (!column.wrap || !column.title) {
         return 1;
     }
     var titleText = String(column.title);
-    var columnWidth = column.width || 100;
     // 计算图标占用的宽度
     var hasOrder = column.isOrder !== false;
     var hasFilter = column.isFilter !== false;
@@ -69,18 +62,19 @@ var calculateColumnLines = function (ctx, column) {
 };
 /**
  * Hook: 计算表头动态高度
- * 支持多级表头
+ * 支持多级表头和文本换行
  */
 var useHeaderHeight = function (params) {
-    var columns = params.columns, headerHeight = params.headerHeight;
+    var columns = params.columns, headerHeight = params.headerHeight, columnRenderInfos = params.columnRenderInfos;
     var _a = useState(headerHeight), calculatedHeight = _a[0], setCalculatedHeight = _a[1];
     useEffect(function () {
         var calculateHeight = function () {
             // 获取多级表头的最大深度
             var maxDepth = getMaxDepth(columns);
-            // 如果是多级表头，每层使用基础表头高度
+            // 如果是多级表头，使用 calculateLayerHeights 计算总高度
             if (maxDepth > 1) {
-                return headerHeight * maxDepth;
+                var layerHeights = calculateLayerHeights(columns, headerHeight, columnRenderInfos).layerHeights;
+                return layerHeights.reduce(function (sum, h) { return sum + h; }, 0);
             }
             // 单层表头，考虑文本换行
             var tempCanvas = document.createElement("canvas");
@@ -88,15 +82,20 @@ var useHeaderHeight = function (params) {
             if (!ctx)
                 return headerHeight;
             ctx.font = "".concat(FONT_SIZE, "px ").concat(FONT_FAMILY);
-            // 计算所有列需要的最大行数
-            var maxLines = Math.max.apply(Math, __spreadArray([1], columns.map(function (column) { return calculateColumnLines(ctx, column); }), false));
-            // 基础高度 + (额外行数 * 行高)
+            var maxLines = Math.max.apply(Math, __spreadArray([1], columns.map(function (column, index) {
+                var _a;
+                // 使用实际的列宽（如果有的话）
+                var columnWidth = ((_a = columnRenderInfos === null || columnRenderInfos === void 0 ? void 0 : columnRenderInfos[index]) === null || _a === void 0 ? void 0 : _a.width) || column.width || 100;
+                return calculateColumnLines(ctx, column, columnWidth);
+            }), false));
+            // 当有换行时：上边距(5px) + 行数 * 行高 + 下边距(5px)
+            // 当没有换行时：使用原始的 headerHeight
             return maxLines > 1
-                ? headerHeight + (maxLines - 1) * LINE_HEIGHT
+                ? 10 + maxLines * LINE_HEIGHT // 上下边距各5px，共10px
                 : headerHeight;
         };
         setCalculatedHeight(calculateHeight());
-    }, [columns, headerHeight]);
+    }, [columns, headerHeight, columnRenderInfos]);
     return calculatedHeight;
 };
 

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

@@ -16,7 +16,7 @@ import '../../node_modules/screenfull/index.js';
 import ColumnDynamic from '../components/ColumnDynamic.js';
 
 var useProcessedColumns = function (params) {
-    var columns = params.columns, dynamicColumns = params.dynamicColumns, mode = params.mode, rowSelection = params.rowSelection, internalColumnWidths = params.internalColumnWidths, dynamicKey = params.dynamicKey, _a = params.renderMode, renderMode = _a === void 0 ? "object" : _a, dynamicSettingRef = params.dynamicSettingRef, headerWrap = params.headerWrap;
+    var columns = params.columns, dynamicColumns = params.dynamicColumns, mode = params.mode, rowSelection = params.rowSelection, internalColumnWidths = params.internalColumnWidths, dynamicKey = params.dynamicKey, _a = params.renderMode, renderMode = _a === void 0 ? "object" : _a, dynamicSettingRef = params.dynamicSettingRef, headerWrap = params.headerWrap, _b = params.headerAlign, headerAlign = _b === void 0 ? "center" : _b;
     return useMemo(function () {
         var cols = __spreadArray([], (dynamicColumns || columns), true);
         // 添加序号列
@@ -62,11 +62,19 @@ var useProcessedColumns = function (params) {
         }
         // 应用内部列宽状态（未开启动态配置时）
         if (!dynamicKey && Object.keys(internalColumnWidths).length > 0) {
-            cols.forEach(function (col) {
-                if (col.key && internalColumnWidths[col.key]) {
-                    col.width = internalColumnWidths[col.key];
-                }
-            });
+            // 递归应用列宽
+            var applyColumnWidths_1 = function (columns) {
+                columns.forEach(function (col) {
+                    if (col.key && internalColumnWidths[col.key]) {
+                        col.width = internalColumnWidths[col.key];
+                    }
+                    // 递归处理子列（多级表头）
+                    if (col.children && col.children.length > 0) {
+                        applyColumnWidths_1(col.children);
+                    }
+                });
+            };
+            applyColumnWidths_1(cols);
         }
         // 验证动态列配置
         if (dynamicKey) {
@@ -79,7 +87,7 @@ var useProcessedColumns = function (params) {
         }
         // 处理render函数
         return cols.map(function (col) {
-            return processColumnRender(col, renderMode, headerWrap);
+            return processColumnRender(col, renderMode, headerWrap, headerAlign);
         });
     }, [
         dynamicColumns,
@@ -90,6 +98,8 @@ var useProcessedColumns = function (params) {
         internalColumnWidths,
         renderMode,
         dynamicSettingRef,
+        headerWrap,
+        headerAlign,
     ]);
 };
 

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

@@ -22,15 +22,8 @@ var useSummaryRow = function (params) {
         if (!hasSummary)
             return null;
         var summaryRecord = {};
-        // 找到第一个数据列（非序号列、非选择框列）
-        var firstDataColIndex = -1;
-        for (var i = 0; i < leafColumns.length; i++) {
-            var col = leafColumns[i];
-            if (col.key !== "__index__" && col.key !== "__selection__") {
-                firstDataColIndex = i;
-                break;
-            }
-        }
+        // 找到第一个列（包括序号列、选择框列）
+        var firstColIndex = leafColumns.length > 0 ? 0 : -1;
         leafColumns.forEach(function (column, colIndex) {
             var dataIndex = column.dataIndex || column.key;
             if (column.isSummary) {
@@ -60,8 +53,8 @@ var useSummaryRow = function (params) {
                 }
                 summaryRecord[dataIndex] = formattedSum;
             }
-            else if (colIndex === firstDataColIndex) {
-                // 第一个数据列显示"合计"
+            else if (colIndex === firstColIndex) {
+                // 第一列显示"合计"（可以是序号列、选择框列或数据列）
                 summaryRecord[dataIndex] = "合计";
             }
             else {

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

@@ -187,7 +187,7 @@ var useTableInteraction = function (params) {
         var badgeProps = typeof column.badge === "function"
             ? column.badge(record)
             : column.badge;
-        if (!badgeProps || !badgeProps.text)
+        if (!badgeProps)
             return false;
         // 计算单元格的位置和大小
         var cellX = fixed ? fixedLeft : colX - scrollState.scrollLeft;
@@ -198,10 +198,12 @@ var useTableInteraction = function (params) {
         // 使用工具函数判断点击位置是否在三角形区域内
         var isInTriangle = isPointInTriangle(x, y, cellX, cellY, cellWidth, cellHeight, position);
         if (isInTriangle) {
+            // 获取要显示的内容
+            var popoverContent_1 = badgeProps.title || "";
             // 如果已经显示相同内容的弹框，则关闭；否则显示新弹框
             setState(function (prev) {
                 if (prev.badgePopover.visible &&
-                    prev.badgePopover.content === badgeProps.text) {
+                    prev.badgePopover.content === popoverContent_1) {
                     return __assign(__assign({}, prev), { badgePopover: {
                             visible: false,
                             content: "",
@@ -211,7 +213,7 @@ var useTableInteraction = function (params) {
                 else {
                     return __assign(__assign({}, prev), { badgePopover: {
                             visible: true,
-                            content: badgeProps.text,
+                            content: popoverContent_1,
                             position: { x: clientX + 10, y: clientY + 10 },
                         } });
                 }