zmdms-webui 2.3.6 → 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,15 +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;
     // 内部列宽状态（未开启动态配置时使用）
-    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,
@@ -81,30 +83,31 @@ 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;
+    }), finalDataSource = _0.finalDataSource, hasSummaryRow = _0.hasSummaryRow;
     // 自动高度计算（需要在容器尺寸计算之前）
     var autoHeight = useCanvasTableAutoHeight(isAutoScrollY, autoScrollYMarginBottom, canvasTableId);
     // 监听容器尺寸变化（提前计算，用于列宽自适应）
@@ -116,7 +119,10 @@ function CanvasTable(props) {
     var containerWidth = containerSize.width;
     var containerHeight = containerSize.height;
     // 计算列的渲染信息（使用容器宽度进行自适应填充）
-    var columnRenderInfos = useMemo(function () { return calculateColumnRenderInfos(processedColumns, containerWidth); }, [processedColumns, containerWidth]);
+    // 手动调整过宽度的列不参与自动宽度分配
+    var columnRenderInfos = useMemo(function () {
+        return calculateColumnRenderInfos(processedColumns, containerWidth, manuallyResizedColumnKeys);
+    }, [processedColumns, containerWidth, manuallyResizedColumnKeys]);
     // 计算表头动态高度（支持wrap换行）
     // 注意：必须在 columnRenderInfos 计算之后，以便使用实际的列宽
     var calculatedHeaderHeight = useHeaderHeight({
@@ -137,7 +143,7 @@ function CanvasTable(props) {
         return calculateTotalHeight(calculatedHeaderHeight, finalDataSource.length, rowHeight);
     }, [calculatedHeaderHeight, finalDataSource.length, rowHeight]);
     // 计算滚动条指标
-    var _z = useScrollbarMetrics({
+    var _1 = useScrollbarMetrics({
         containerWidth: containerWidth,
         containerHeight: containerHeight,
         totalWidth: totalWidth,
@@ -145,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,
@@ -174,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)); });
@@ -228,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,
@@ -251,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,
@@ -303,7 +319,7 @@ 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, baseHeaderHeight: headerHeight, // 传入原始基础高度用于计算每层高度
@@ -365,6 +381,73 @@ 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 动态管理
@@ -374,7 +457,9 @@ function CanvasTable(props) {
                         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: dynamicKey ? exportExcel : undefined })) : null] })) })));
+                    } }), 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, 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 = 5;
 /**
  * 计算文本在给定宽度下需要的行数
  */
@@ -94,9 +88,10 @@ var useHeaderHeight = function (params) {
                 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());

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/useTableRender.js

@@ -129,7 +129,6 @@ var useTableRender = function (params) {
         ctx.fillStyle = COLORS.text;
         ctx.font = "".concat(FONT_WEIGHT, " ").concat(FONT_SIZE, "px ").concat(FONT_FAMILY);
         ctx.textBaseline = "middle";
-        var textX = drawX + 5;
         var textY = headerHeight / 2;
         // 绘制选择框
         if (column.key === "__selection__") {
@@ -142,26 +141,65 @@ var useTableRender = function (params) {
         else {
             // 计算图标占用的宽度
             var iconArea = calculateIconArea(column, width);
-            // 计算文本可用宽度（左边距5px + 图标宽度 ）
-            var textMaxWidth = width - 5 - iconArea.iconsWidth;
+            // 确定表头对齐方式，优先使用列的 headerAlign，其次是 align，最后是默认值
+            var headerAlign = column.headerAlign || column.align || "center";
             // 绘制文本（如果 title 是 React 元素，跳过Canvas渲染，在覆盖层中渲染）
             if (!isValidElement(column.title)) {
                 var titleText = String(column.title || "");
+                // 根据对齐方式和图标情况设置文本位置
+                var textX_1;
+                var textMaxWidth = void 0;
+                if (iconArea.iconsWidth > 0) {
+                    // 有图标时，根据headerAlign调整文本位置和最大宽度
+                    if (headerAlign === "right") {
+                        ctx.textAlign = "right";
+                        textX_1 = drawX + width - 5 - iconArea.iconsWidth;
+                        textMaxWidth = width - 10 - iconArea.iconsWidth;
+                    }
+                    else if (headerAlign === "center") {
+                        ctx.textAlign = "center";
+                        textX_1 = drawX + (width - iconArea.iconsWidth) / 2;
+                        textMaxWidth = width - 10 - iconArea.iconsWidth;
+                    }
+                    else {
+                        ctx.textAlign = "left";
+                        textX_1 = drawX + 5;
+                        textMaxWidth = width - 5 - iconArea.iconsWidth;
+                    }
+                }
+                else {
+                    // 没有图标时，根据headerAlign设置对齐方式
+                    if (headerAlign === "left") {
+                        ctx.textAlign = "left";
+                        textX_1 = drawX + 5;
+                        textMaxWidth = width - 10;
+                    }
+                    else if (headerAlign === "right") {
+                        ctx.textAlign = "right";
+                        textX_1 = drawX + width - 5;
+                        textMaxWidth = width - 10;
+                    }
+                    else {
+                        ctx.textAlign = "center";
+                        textX_1 = drawX + width / 2;
+                        textMaxWidth = width - 10;
+                    }
+                }
                 // 根据 ellipsis 和 wrap 属性处理文本
                 if (column.wrap) {
                     // 换行显示（支持\n和自动换行）
                     var lines = wrapText(ctx, titleText, textMaxWidth);
-                    var lineHeight_1 = 20;
+                    var lineHeight_1 = FONT_SIZE + 5; // 字体大小 + 行间距5px
                     var startY_1 = textY - ((lines.length - 1) * lineHeight_1) / 2;
                     lines.forEach(function (line, index) {
                         var lineY = startY_1 + index * lineHeight_1;
-                        ctx.fillText(line, textX, lineY);
+                        ctx.fillText(line, textX_1, lineY);
                     });
                 }
                 else {
                     // 默认截断显示
                     var truncatedText = truncateText(ctx, titleText, textMaxWidth);
-                    ctx.fillText(truncatedText, textX, textY);
+                    ctx.fillText(truncatedText, textX_1, textY);
                 }
             }
             // 绘制筛选图标（最右侧，距离右边5px）
@@ -178,6 +216,7 @@ var useTableRender = function (params) {
                 drawSortIcon(ctx, iconX, textY, column.key === state.sortField ? state.sortOrder : null);
             }
         }
+        ctx.textAlign = "left"; // 重置对齐方式
         ctx.restore();
         // 绘制表头列之间的边框
         if (bordered) {
@@ -286,44 +325,73 @@ var useTableRender = function (params) {
                 var iconArea = shouldShowIcons
                     ? calculateIconArea(column, width)
                     : { hasOrder: false, hasFilter: false, iconsWidth: 0 };
-                // 如果是最末级且有图标，文本左对齐；否则居中
+                // 确定表头对齐方式，优先使用列的 headerAlign，其次是 align，最后是默认值
+                var headerAlign = column.headerAlign || column.align || "center";
+                // 如果是最末级且有图标，需要调整对齐方式
                 if (isLastLevel && iconArea.iconsWidth > 0) {
-                    ctx.textAlign = "left";
-                    var textX_1 = drawX + 5;
-                    var textMaxWidth = width - 5 - iconArea.iconsWidth;
+                    // 有图标时，根据headerAlign调整文本位置和最大宽度
+                    var textX_2;
+                    var textMaxWidth = void 0;
+                    if (headerAlign === "right") {
+                        ctx.textAlign = "right";
+                        textX_2 = drawX + width - 5 - iconArea.iconsWidth;
+                        textMaxWidth = width - 10 - iconArea.iconsWidth;
+                    }
+                    else if (headerAlign === "center") {
+                        ctx.textAlign = "center";
+                        textX_2 = drawX + (width - iconArea.iconsWidth) / 2;
+                        textMaxWidth = width - 10 - iconArea.iconsWidth;
+                    }
+                    else {
+                        ctx.textAlign = "left";
+                        textX_2 = drawX + 5;
+                        textMaxWidth = width - 5 - iconArea.iconsWidth;
+                    }
                     // 根据 wrap 属性处理文本
                     if (column.wrap) {
                         // 换行显示（支持\n和自动换行）
                         var lines = wrapText(ctx, titleText, textMaxWidth);
-                        var lineHeight_2 = 20;
+                        var lineHeight_2 = FONT_SIZE + 5; // 字体大小 + 行间距5px
                         var startY_2 = textY - ((lines.length - 1) * lineHeight_2) / 2;
                         lines.forEach(function (line, index) {
                             var lineY = startY_2 + index * lineHeight_2;
-                            ctx.fillText(line, textX_1, lineY);
+                            ctx.fillText(line, textX_2, lineY);
                         });
                     }
                     else {
                         var truncated = truncateText(ctx, titleText, textMaxWidth);
-                        ctx.fillText(truncated, textX_1, textY);
+                        ctx.fillText(truncated, textX_2, textY);
                     }
                 }
                 else {
-                    ctx.textAlign = "center";
-                    var textX_2 = drawX + width / 2;
+                    // 没有图标时，根据headerAlign设置对齐方式
+                    var textX_3;
+                    if (headerAlign === "left") {
+                        ctx.textAlign = "left";
+                        textX_3 = drawX + 5;
+                    }
+                    else if (headerAlign === "right") {
+                        ctx.textAlign = "right";
+                        textX_3 = drawX + width - 5;
+                    }
+                    else {
+                        ctx.textAlign = "center";
+                        textX_3 = drawX + width / 2;
+                    }
                     // 根据 wrap 属性处理文本
                     if (column.wrap) {
                         // 换行显示（支持\n和自动换行）
                         var lines = wrapText(ctx, titleText, width - 10); // 左右各5px
-                        var lineHeight_3 = 20;
+                        var lineHeight_3 = FONT_SIZE + 5; // 字体大小 + 行间距5px
                         var startY_3 = textY - ((lines.length - 1) * lineHeight_3) / 2;
                         lines.forEach(function (line, index) {
                             var lineY = startY_3 + index * lineHeight_3;
-                            ctx.fillText(line, textX_2, lineY);
+                            ctx.fillText(line, textX_3, lineY);
                         });
                     }
                     else {
                         var truncated = truncateText(ctx, titleText, width - 10); // 左右各5px
-                        ctx.fillText(truncated, textX_2, textY);
+                        ctx.fillText(truncated, textX_3, textY);
                     }
                 }
                 // 绘制筛选图标（仅在最末级表头显示）
@@ -533,10 +601,30 @@ var useTableRender = function (params) {
             }
             // 单元格内容
             if (column.key === "__selection__") {
-                var checkboxProps = ((_a = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.getCheckboxProps) === null || _a === void 0 ? void 0 : _a.call(rowSelection, record)) || {};
-                var disabled = checkboxProps.disabled || false;
-                // 对于合并单元格，使用合并后的单元格高度进行垂直居中
-                drawCheckbox(ctx, drawX + width / 2, y + cellHeight / 2, isSelected, disabled, false);
+                // 检查是否是合计行
+                var isSummaryRow = record[IS_SUMMARY];
+                if (!isSummaryRow) {
+                    // 非合计行显示选择框
+                    var checkboxProps = ((_a = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.getCheckboxProps) === null || _a === void 0 ? void 0 : _a.call(rowSelection, record)) || {};
+                    var disabled = checkboxProps.disabled || false;
+                    // 对于合并单元格，使用合并后的单元格高度进行垂直居中
+                    drawCheckbox(ctx, drawX + width / 2, y + cellHeight / 2, isSelected, disabled, false);
+                }
+                else {
+                    // 合计行选择框列显示文本（比如"合计"）
+                    var dataIndex = column.dataIndex || column.key;
+                    var cellValue = record[dataIndex];
+                    var cellText = formatCellValue(cellValue, column);
+                    if (cellText) {
+                        ctx.fillStyle = COLORS.text;
+                        ctx.font = "bold ".concat(FONT_SIZE, "px ").concat(FONT_FAMILY);
+                        ctx.textBaseline = "middle";
+                        ctx.textAlign = "center";
+                        var textX = drawX + width / 2;
+                        var textY = y + cellHeight / 2;
+                        ctx.fillText(cellText, textX, textY);
+                    }
+                }
             }
             else {
                 var dataIndex = column.dataIndex || column.key;
@@ -584,14 +672,14 @@ var useTableRender = function (params) {
                         : "".concat(FONT_WEIGHT, " ").concat(FONT_SIZE, "px ").concat(FONT_FAMILY);
                     ctx.textBaseline = "middle";
                     var align = column.align || "left";
-                    var textX_3 = drawX + 5;
+                    var textX_4 = drawX + 5;
                     if (align === "center") {
                         ctx.textAlign = "center";
-                        textX_3 = drawX + width / 2;
+                        textX_4 = drawX + width / 2;
                     }
                     else if (align === "right") {
                         ctx.textAlign = "right";
-                        textX_3 = drawX + width - 5;
+                        textX_4 = drawX + width - 5;
                     }
                     else {
                         ctx.textAlign = "left";
@@ -601,9 +689,23 @@ var useTableRender = function (params) {
                     var ellipsis = column.ellipsis !== false; // 默认为true
                     var wrap = column.wrap === true; // 默认为false
                     if (wrap) {
-                        // 换行显示
-                        var lines = wrapText(ctx, cellText, maxWidth);
-                        var lineHeight_4 = FONT_SIZE + 4; // 行高
+                        // 换行显示，最多显示2行
+                        var allLines = wrapText(ctx, cellText, maxWidth);
+                        var maxLines = 2; // 限制最多显示2行
+                        var lines = allLines.slice(0, maxLines);
+                        // 如果超过2行，在第2行末尾强制添加省略号
+                        if (allLines.length > maxLines && lines.length === maxLines) {
+                            // 确保第2行有足够空间显示省略号
+                            var lastLine = lines[maxLines - 1];
+                            var ellipsisText = "...";
+                            // 如果最后一行加上省略号会超出宽度，需要截断
+                            while (lastLine.length > 0 &&
+                                ctx.measureText(lastLine + ellipsisText).width > maxWidth) {
+                                lastLine = lastLine.slice(0, -1);
+                            }
+                            lines[maxLines - 1] = lastLine + ellipsisText;
+                        }
+                        var lineHeight_4 = FONT_SIZE + 5; // 字体大小 + 行间距5px
                         var totalHeight = lines.length * lineHeight_4;
                         // 使用合并后的单元格高度计算垂直居中位置
                         var startY_4 = y + (cellHeight - totalHeight) / 2 + lineHeight_4 / 2;
@@ -611,7 +713,7 @@ var useTableRender = function (params) {
                             var lineY = startY_4 + lineIndex * lineHeight_4;
                             // 只绘制在单元格可见区域内的文本
                             if (lineY >= y && lineY <= y + cellHeight) {
-                                ctx.fillText(line, textX_3, lineY);
+                                ctx.fillText(line, textX_4, lineY);
                             }
                         });
                     }
@@ -619,12 +721,12 @@ var useTableRender = function (params) {
                         // 省略显示 - 使用合并后的单元格高度
                         var textY = y + cellHeight / 2;
                         var truncatedText = truncateText(ctx, cellText, maxWidth);
-                        ctx.fillText(truncatedText, textX_3, textY);
+                        ctx.fillText(truncatedText, textX_4, textY);
                     }
                     else {
                         // 不处理，直接显示 - 使用合并后的单元格高度
                         var textY = y + cellHeight / 2;
-                        ctx.fillText(cellText, textX_3, textY);
+                        ctx.fillText(cellText, textX_4, textY);
                     }
                     if (column.badge && !isSummaryRow) {
                         var badgeProps = typeof column.badge === "function"
@@ -833,28 +935,30 @@ var useTableRender = function (params) {
             ctx.fillRect(drawX, fixedY, actualWidth, rowHeight);
             // 处理序号列
             if (column.key === "__index__") {
-                // 合计行序号列显示空
-                if (rowType === "summary")
+                // 非合计行显示序号
+                if (rowType !== "summary") {
+                    var indexText = String(rowIndex + 1);
+                    ctx.fillStyle = COLORS.text;
+                    ctx.font = "".concat(FONT_WEIGHT, " ").concat(FONT_SIZE, "px ").concat(FONT_FAMILY);
+                    ctx.textBaseline = "middle";
+                    setTextAlign(ctx, "center");
+                    var textX = drawX + actualWidth / 2;
+                    var textY = fixedY + rowHeight / 2;
+                    ctx.fillText(indexText, textX, textY);
                     return;
-                var indexText = String(rowIndex + 1);
-                ctx.fillStyle = COLORS.text;
-                ctx.font = "".concat(FONT_WEIGHT, " ").concat(FONT_SIZE, "px ").concat(FONT_FAMILY);
-                ctx.textBaseline = "middle";
-                setTextAlign(ctx, "center");
-                var textX = drawX + actualWidth / 2;
-                var textY = fixedY + rowHeight / 2;
-                ctx.fillText(indexText, textX, textY);
-                return;
+                }
+                // 合计行序号列继续执行后面的逻辑，可能显示"合计"文字
             }
             // 处理选择框列
             if (column.key === "__selection__") {
-                // 合计行选择框列显示空
-                if (rowType === "summary")
+                // 非合计行显示选择框
+                if (rowType !== "summary") {
+                    var checkboxX = drawX + actualWidth / 2;
+                    var textY = fixedY + rowHeight / 2;
+                    drawCheckbox(ctx, checkboxX, textY, isSelected, false, false);
                     return;
-                var checkboxX = drawX + actualWidth / 2;
-                var textY = fixedY + rowHeight / 2;
-                drawCheckbox(ctx, checkboxX, textY, isSelected, false, false);
-                return;
+                }
+                // 合计行选择框列继续执行后面的逻辑，可能显示"合计"文字
             }
             // 获取单元格值
             var dataIndex = column.dataIndex || column.key;

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

@@ -36,6 +36,10 @@ interface ICanvasColumnType<RecordType = any> {
      * 对齐方式
      */
     align?: "left" | "center" | "right";
+    /**
+     * 表头对齐方式（如果不设置，使用全局 headerAlign 或 align）
+     */
+    headerAlign?: "left" | "center" | "right";
     /**
      * 是否固定列
      */
@@ -249,6 +253,10 @@ interface ICanvasTableProps<RecordType = any> {
      * 表头换行
      */
     headerWrap?: boolean;
+    /**
+     * 表头对齐方式（默认居中）
+     */
+    headerAlign?: "left" | "center" | "right";
     /**
      * 勾选配置
      */
@@ -394,6 +402,86 @@ interface ICanvasTableProps<RecordType = any> {
      * 表格id（用于自动高度计算时定位元素）
      */
     canvasTableId?: string;
+    /**
+     * 表格ref句柄，用于暴露表格的一些方法
+     */
+    tableRefHandle?: React__default.Ref<ICanvasTableRefHandle>;
+    /**
+     * 导出excel的一些配置
+     */
+    exportExcelConfig?: {
+        topDescription?: string;
+        time?: string;
+        topDescriptionRowHeight?: number;
+        fileName: string;
+    };
+}
+/**
+ * CanvasTable 暴露的方法
+ */
+interface ICanvasTableRefHandle {
+    /**
+     * 获取当前表格的配置信息（动态列配置）
+     */
+    getDynamicList: () => any[];
+    /**
+     * 动态列配置重置
+     */
+    onResetDynamicList: () => void;
+    /**
+     * 动态列配置设置
+     */
+    onSetDynamicList: (list: any[]) => void;
+    /**
+     * 导出Excel
+     */
+    exportExcel?: (fileName: string, config?: {
+        topDescription?: string;
+        time?: string;
+        topDescriptionRowHeight?: number;
+    }) => void;
+    /**
+     * 获取表格容器
+     */
+    getContainer: () => HTMLDivElement | null;
+    /**
+     * 全屏展示表格
+     */
+    toggleFullScreen: () => void;
+    /**
+     * 获取选中的行keys
+     */
+    getSelectedRowKeys: () => React__default.Key[];
+    /**
+     * 设置选中的行keys
+     */
+    setSelectedRowKeys: (keys: React__default.Key[]) => void;
+    /**
+     * 滚动到指定位置
+     */
+    scrollTo: (params: {
+        x?: number;
+        y?: number;
+    }) => void;
+    /**
+     * 获取当前排序状态
+     */
+    getSortState: () => {
+        field: string | null;
+        order: SortOrder;
+    };
+    /**
+     * 获取当前过滤状态
+     */
+    getFilterState: () => Record<string, any[]>;
+    /**
+     * 清除排序
+     */
+    clearSort: () => void;
+    /**
+     * 清除过滤
+     */
+    clearFilter: () => void;
 }
 
-export { ColumnDataType, FilterConfig, IBadgeProps, ICanvasColumnType, ICanvasColumnsType, ICanvasRowSelection, ICanvasTableProps, SortOrder };
+export { ColumnDataType, FilterConfig, IBadgeProps, ICanvasColumnType, ICanvasColumnsType, ICanvasRowSelection, ICanvasTableProps, ICanvasTableRefHandle, SortOrder };

package/dist/es/canvastable/utils/columnHelpers.js

@@ -24,13 +24,17 @@ var findColumnByKey = function (columns, key) {
 /**
  * 递归处理列的render函数（转换为统一的调用格式）
  */
-var processColumnRender = function (column, renderMode, headerWrap) {
+var processColumnRender = function (column, renderMode, headerWrap, headerAlign) {
     if (renderMode === void 0) { renderMode = "object"; }
     var processedColumn = __assign({}, column);
     if (headerWrap) {
         processedColumn.wrap =
             processedColumn.wrap === undefined ? headerWrap : processedColumn.wrap;
     }
+    // 应用表头对齐方式（仅当列没有设置 headerAlign 或 align 时）
+    if (headerAlign && !processedColumn.headerAlign && !processedColumn.align) {
+        processedColumn.headerAlign = headerAlign;
+    }
     // 处理当前列的render函数
     if (column.render) {
         var render_1 = column.render;
@@ -44,7 +48,7 @@ var processColumnRender = function (column, renderMode, headerWrap) {
     // 递归处理children
     if (column.children && Array.isArray(column.children)) {
         processedColumn.children = column.children.map(function (child) {
-            return processColumnRender(child, renderMode, headerWrap);
+            return processColumnRender(child, renderMode, headerWrap, headerAlign);
         });
     }
     return processedColumn;

package/dist/es/canvastable/utils/constants.js

@@ -38,6 +38,13 @@ var FONT_SIZE = 13;
 var FONT_WEIGHT = "400"; // 正常字重，避免过细导致不清晰
 // 图标尺寸
 var CHECKBOX_SIZE = 16;
-var SORT_ICON_SIZE = 6;
+var SORT_ICON_SIZE = 6;
+var SORT_ICON_WIDTH = 15; // 排序图标宽度（用于表头宽度计算）
+var FILTER_ICON_WIDTH = 15; // 筛选图标宽度（用于表头宽度计算）
+// 间距和内边距
+var ICON_SPACING = 4; // 图标之间的间距
+var TEXT_PADDING = 5; // 文本内边距
+// 行高计算
+var LINE_HEIGHT = FONT_SIZE + 5; // 字体大小 + 行间距5px
 
-export { CHECKBOX_SIZE, COLORS, DEFAULT_COLUMN_WIDTH, DEFAULT_SELECTION_COLUMN_WIDTH, FONT_FAMILY, FONT_SIZE, FONT_WEIGHT, MIN_SCROLLBAR_SIZE, SCROLLBAR_PADDING, SCROLLBAR_SIZE, SORT_ICON_SIZE };
+export { CHECKBOX_SIZE, COLORS, DEFAULT_COLUMN_WIDTH, DEFAULT_SELECTION_COLUMN_WIDTH, FILTER_ICON_WIDTH, FONT_FAMILY, FONT_SIZE, FONT_WEIGHT, ICON_SPACING, LINE_HEIGHT, MIN_SCROLLBAR_SIZE, SCROLLBAR_PADDING, SCROLLBAR_SIZE, SORT_ICON_SIZE, SORT_ICON_WIDTH, TEXT_PADDING };

package/dist/es/canvastable/utils/multiHeaderHelpers.js

@@ -1,3 +1,5 @@
+import { FONT_SIZE, FONT_FAMILY, TEXT_PADDING, LINE_HEIGHT, FILTER_ICON_WIDTH, SORT_ICON_WIDTH, ICON_SPACING } from './constants.js';
+
 /**
  * 多级表头工具函数
  */
@@ -96,13 +98,6 @@ function calculateLayerHeights(columns, baseHeaderHeight, columnRenderInfos) {
     }
     var flattenedHeaderRows = flattenHeaders(columns);
     var leafColumns = getLeafColumns(columns);
-    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 = 5;
     // 创建临时canvas用于测量文本
     var tempCanvas = document.createElement("canvas");
     var ctx = tempCanvas.getContext("2d");
@@ -187,9 +182,10 @@ function calculateLayerHeights(columns, baseHeaderHeight, columnRenderInfos) {
             }
             maxLines = Math.max(maxLines, totalLines);
         });
-        // 这一层的高度 = 基础高度 + (额外行数 * 行高)
+        // 当有换行时：上边距(5px) + 行数 * 行高 + 下边距(5px)
+        // 当没有换行时：使用原始的 baseHeaderHeight
         var layerHeight = maxLines > 1
-            ? baseHeaderHeight + (maxLines - 1) * LINE_HEIGHT
+            ? 10 + maxLines * LINE_HEIGHT // 上下边距各5px，共10px
             : baseHeaderHeight;
         layerHeights.push(layerHeight);
     });

package/dist/es/canvastable/utils/tableCalculations.js

@@ -9,8 +9,9 @@ import { getLeafColumns } from './multiHeaderHelpers.js';
  * 注意：多级表头时，只处理叶子列（用于渲染数据）
  * @param columns 列配置
  * @param containerWidth 容器宽度（可选），如果提供且总宽度小于容器宽度，会自动填充
+ * @param manuallyResizedColumns 用户手动调整过宽度的列的key集合（可选），这些列不参与自动宽度分配
  */
-var calculateColumnRenderInfos = function (columns, containerWidth) {
+var calculateColumnRenderInfos = function (columns, containerWidth, manuallyResizedColumns) {
     // 获取叶子列（多级表头时只有叶子列才渲染数据）
     var leafColumns = getLeafColumns(columns);
     // 第一次计算：使用原始宽度
@@ -27,13 +28,21 @@ var calculateColumnRenderInfos = function (columns, containerWidth) {
         totalWidth += columnWidth;
     });
     // 如果提供了容器宽度且总宽度小于容器宽度，将剩余宽度平分到各列
-    // 注意：序号列和勾选框列除外，保持原宽度
+    // 注意：序号列、勾选框列、手动调整过的列除外，保持原宽度
     if (containerWidth && totalWidth < containerWidth) {
         var remainingWidth = containerWidth - totalWidth;
-        // 统计需要平分宽度的列（排除序号列和勾选框列）
+        // 统计需要平分宽度的列（排除序号列、勾选框列和手动调整过的列）
         var columnsToExpand = tempInfos.filter(function (info) {
             var key = info.column.key;
-            return key !== "__index__" && key !== "__selection__";
+            // 排除序号列和勾选框列
+            if (key === "__index__" || key === "__selection__") {
+                return false;
+            }
+            // 排除用户手动调整过宽度的列
+            if (manuallyResizedColumns && manuallyResizedColumns.has(key)) {
+                return false;
+            }
+            return true;
         });
         if (columnsToExpand.length > 0) {
             var additionalWidthPerColumn_1 = remainingWidth / columnsToExpand.length;

package/dist/index.build.d.ts

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

package/package.json

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