zmdms-webui 2.3.3 → 2.3.5

package/dist/es/canvastable/canvasTable.js

@@ -26,8 +26,10 @@ import { useMergeCells } from './hooks/useMergeCells.js';
 import { useContainerSize } from './hooks/useContainerSize.js';
 import { useProcessedColumns } from './hooks/useProcessedColumns.js';
 import { useSummaryRow } from './hooks/useSummaryRow.js';
+import { useCanvasTableAutoHeight } from './hooks/useAutoHeight.js';
 import { SCROLLBAR_SIZE } from './utils/constants.js';
 import { calculateColumnRenderInfos, calculateTotalWidth, calculateTotalHeight } from './utils/tableCalculations.js';
+import 'zmdms-utils';
 import 'dayjs';
 import { TABLE_DYNAMIC_KEY } from '../table/constant.js';
 import { useDynamicListByColumns } from '../table/useDynamicListByColumns.js';
@@ -37,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.fixedSummaryRow, fixedSummaryRow = _q === void 0 ? false : _q;
+    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 canvasRef = useRef(null);
     var containerRef = useRef(null);
     var filterPopoverRef = useRef(null);
@@ -59,11 +61,11 @@ function CanvasTable(props) {
         return String((_a = record[rowKey]) !== null && _a !== void 0 ? _a : index);
     }, [rowKey]);
     // 动态列配置
-    var _r = useDynamicListByColumns(columns, {
+    var _u = useDynamicListByColumns(columns, {
         dynamicKey: dynamicKey,
         dynamicVersion: dynamicVersion,
         customDynamicListHandle: customDynamicListHandle,
-    }), defaultDynamicList = _r.defaultDynamicList, currentDynamicList = _r.currentDynamicList, onCurrentListChange = _r.onCurrentListChange, dynamicSettingRef = _r.dynamicSettingRef;
+    }), defaultDynamicList = _u.defaultDynamicList, currentDynamicList = _u.currentDynamicList, onCurrentListChange = _u.onCurrentListChange, dynamicSettingRef = _u.dynamicSettingRef;
     // 根据动态列配置处理columns
     var dynamicColumns = useMemo(function () { return getTableColumns(columns, currentDynamicList); }, [columns, currentDynamicList]).columns;
     // 计算表头动态高度（支持wrap换行）
@@ -72,7 +74,7 @@ function CanvasTable(props) {
         headerHeight: headerHeight,
     });
     // 内部列宽状态（未开启动态配置时使用）
-    var _s = useState({}), internalColumnWidths = _s[0], setInternalColumnWidths = _s[1];
+    var _v = useState({}), internalColumnWidths = _v[0], setInternalColumnWidths = _v[1];
     // 处理选中框列、序号列等
     var processedColumnsOld = useProcessedColumns({
         columns: columns,
@@ -83,30 +85,31 @@ function CanvasTable(props) {
         dynamicKey: dynamicKey,
         renderMode: renderMode,
         dynamicSettingRef: dynamicSettingRef,
+        headerWrap: headerWrap,
     });
     // 表格状态管理
-    var _t = useTableState({
+    var _w = useTableState({
         dataSource: dataSource,
         columns: processedColumnsOld,
         rowSelection: rowSelection,
         onFilterChange: onFilterChange,
-    }), state = _t.state, setState = _t.setState, processedDataSource = _t.processedDataSource, handleFilterChange = _t.handleFilterChange, closeFilterPopover = _t.closeFilterPopover, autoGeneratedFilters = _t.autoGeneratedFilters;
+    }), state = _w.state, setState = _w.setState, processedDataSource = _w.processedDataSource, handleFilterChange = _w.handleFilterChange, closeFilterPopover = _w.closeFilterPopover, autoGeneratedFilters = _w.autoGeneratedFilters;
     var order = useMemo(function () {
         return state.sortOrder && state.sortField
             ? { field: state.sortField, order: state.sortOrder }
             : undefined;
     }, [state.sortOrder, state.sortField]);
-    var _u = useAutoMerge(processedDataSource, processedColumnsOld, {
+    var _x = useAutoMerge(processedDataSource, processedColumnsOld, {
         isAutoMerge: isAutoMerge,
         isDimensionDynamic: isDimensionDynamic,
         order: order,
         dimensionCustomSumKeys: dimensionCustomSumKeys,
-    }), newDataSource = _u[0], processedColumns = _u[1];
+    }), newDataSource = _x[0], processedColumns = _x[1];
     // 生成合计行和最终数据源
-    var _v = useSummaryRow({
+    var _y = useSummaryRow({
         columns: processedColumns,
         dataSource: newDataSource,
-    }), finalDataSource = _v.finalDataSource, hasSummaryRow = _v.hasSummaryRow;
+    }), finalDataSource = _y.finalDataSource, hasSummaryRow = _y.hasSummaryRow;
     // 计算列的渲染信息
     var columnRenderInfos = useMemo(function () { return calculateColumnRenderInfos(processedColumns); }, [processedColumns]);
     // 计算合并单元格信息
@@ -121,16 +124,18 @@ 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: height,
+        height: isAutoScrollY ? autoHeight || height : height,
     });
     var containerWidth = containerSize.width;
     var containerHeight = containerSize.height;
     // 计算滚动条指标
-    var _w = useScrollbarMetrics({
+    var _z = useScrollbarMetrics({
         containerWidth: containerWidth,
         containerHeight: containerHeight,
         totalWidth: totalWidth,
@@ -138,15 +143,15 @@ function CanvasTable(props) {
         headerHeight: calculatedHeaderHeight,
         scrollTop: 0,
         scrollLeft: 0,
-    }), maxScrollTop = _w.maxScrollTop, maxScrollLeft = _w.maxScrollLeft;
+    }), maxScrollTop = _z.maxScrollTop, maxScrollLeft = _z.maxScrollLeft;
     // 滚动管理（使用预先计算的maxScrollTop和maxScrollLeft）
-    var _x = useTableScroll({
+    var _0 = useTableScroll({
         canvasRef: canvasRef,
         containerRef: containerRef,
         maxScrollTop: maxScrollTop,
         maxScrollLeft: maxScrollLeft,
         onScroll: onScroll,
-    }), scrollState = _x.scrollState, setScrollState = _x.setScrollState;
+    }), scrollState = _0.scrollState, setScrollState = _0.setScrollState;
     // 数据变化时重置滚动位置（筛选、排序、数据源更新等操作后）
     useScrollReset({
         dataSourceLength: dataSource.length,
@@ -167,12 +172,12 @@ function CanvasTable(props) {
         scrollLeft: scrollState.scrollLeft,
     }).actualMetrics;
     // 单元格框选
-    var _y = useTableSelection({
+    var _1 = useTableSelection({
         state: state,
         setState: setState,
     }), 
     // selectionStartRef,
-    startSelection = _y.startSelection, updateSelection = _y.updateSelection, extendSelection = _y.extendSelection;
+    startSelection = _1.startSelection, updateSelection = _1.updateSelection, extendSelection = _1.extendSelection;
     // 处理列宽调整
     var handleColumnResize = useCallback(function (columnKey, newWidth) {
         var _a;
@@ -221,13 +226,13 @@ function CanvasTable(props) {
         onCurrentListChange,
     ]);
     // 列宽调整
-    var _z = useColumnResize({
+    var _2 = useColumnResize({
         columnRenderInfos: columnRenderInfos,
         containerWidth: containerWidth,
         headerHeight: calculatedHeaderHeight,
         scrollLeft: scrollState.scrollLeft,
         onColumnResize: handleColumnResize,
-    }), resizeState = _z.resizeState, checkResizeHandle = _z.checkResizeHandle, startResize = _z.startResize, updateResize = _z.updateResize, endResize = _z.endResize, setHoverResizeColumn = _z.setHoverResizeColumn, getColumnWidth = _z.getColumnWidth, RESIZE_HANDLE_WIDTH = _z.RESIZE_HANDLE_WIDTH;
+    }), 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;
     // 复制到剪贴板
     var getSelectedCellsText = useCopyToClipboard({
         cellSelection: state.cellSelection,
@@ -250,7 +255,7 @@ function CanvasTable(props) {
         isAutoMerge: isAutoMerge,
     });
     // 交互事件处理（使用baseScrollbarMetrics的maxScrollTop/maxScrollLeft以保持稳定）
-    var _0 = useTableInteraction({
+    var _3 = useTableInteraction({
         state: state,
         setState: setState,
         scrollState: scrollState,
@@ -295,11 +300,11 @@ function CanvasTable(props) {
         menuShow: isContextMenu ? menuShow : undefined,
         fixedRowsCount: fixedRowsCount,
         fixedRowsConfig: fixedRowsConfig,
-        fixedSummaryRow: fixedSummaryRow,
-    }), handleCanvasMouseDown = _0.handleCanvasMouseDown, handleCanvasMouseMove = _0.handleCanvasMouseMove, handleCanvasMouseUp = _0.handleCanvasMouseUp, handleCanvasMouseLeave = _0.handleCanvasMouseLeave, handleCanvasContextMenu = _0.handleCanvasContextMenu;
+        summaryFixed: summaryFixed,
+    }), handleCanvasMouseDown = _3.handleCanvasMouseDown, handleCanvasMouseMove = _3.handleCanvasMouseMove, handleCanvasMouseUp = _3.handleCanvasMouseUp, handleCanvasMouseLeave = _3.handleCanvasMouseLeave, handleCanvasContextMenu = _3.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, fixedSummaryRow: fixedSummaryRow }));
+        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 }));
     // 单元格覆盖层
     var cellOverlays = useTableCellOverlay({
         canvasRef: canvasRef,
@@ -316,7 +321,7 @@ function CanvasTable(props) {
         fixedRowsCount: fixedRowsCount,
         fixedRowsConfig: fixedRowsConfig,
         hasSummaryRow: hasSummaryRow,
-        fixedSummaryRow: fixedSummaryRow,
+        summaryFixed: summaryFixed,
     }).cellOverlays;
     // 表头覆盖层
     var headerOverlays = useHeaderOverlay({
@@ -357,7 +362,7 @@ function CanvasTable(props) {
         isVisible: state.badgePopover.visible,
         onClose: handleCloseBadgePopover,
     });
-    return (jsx(Spin, __assign({ spinning: loading }, { children: jsxs("div", __assign({ ref: containerRef, 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: {
+    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",

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

@@ -9,4 +9,6 @@ var ColumnDynamic = function (_a) {
             (_a = dynamicSettingRef === null || dynamicSettingRef === void 0 ? void 0 : dynamicSettingRef.current) === null || _a === void 0 ? void 0 : _a.setVisible(true);
         } }));
 };
-memo(ColumnDynamic);
+var ColumnDynamic$1 = memo(ColumnDynamic);
+
+export { ColumnDynamic$1 as default };

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

@@ -0,0 +1,67 @@
+import { useState, useEffect } from 'react';
+
+/**
+ * CanvasTable 自动高度计算 Hook
+ */
+/**
+ * 计算CanvasTable高度
+ * @param isAutoScrollY 是否自动计算高度
+ * @param marginBottom canvas table下面留出的距离
+ * @param canvasTableId 表格id
+ * @returns 计算出的表格高度
+ */
+function useCanvasTableAutoHeight(isAutoScrollY, marginBottom, canvasTableId) {
+    if (marginBottom === void 0) { marginBottom = 65; }
+    var _a = useState(undefined), tableHeight = _a[0], setTableHeight = _a[1];
+    useEffect(function () {
+        if (!isAutoScrollY)
+            return;
+        var calculateHeight = function () {
+            var _a, _b;
+            // 查找容器元素
+            var containerRect = (_a = document
+                .querySelector(".ztxk-container")) === null || _a === void 0 ? void 0 : _a.getBoundingClientRect();
+            // 查找CanvasTable元素
+            var tableSelector = canvasTableId
+                ? "#".concat(CSS.escape(canvasTableId), " .canvas-table-container")
+                : ".canvas-table-container";
+            var tableRect = (_b = document
+                .querySelector(tableSelector)) === null || _b === void 0 ? void 0 : _b.getBoundingClientRect();
+            if (containerRect && tableRect) {
+                var calculatedHeight = containerRect.height +
+                    containerRect.top -
+                    tableRect.top -
+                    marginBottom;
+                // 确保高度不小于最小值
+                var minHeight = 200;
+                setTableHeight(Math.max(calculatedHeight, minHeight));
+            }
+        };
+        // 初始计算
+        calculateHeight();
+        // 监听窗口大小变化
+        var handleResize = function () {
+            calculateHeight();
+        };
+        window.addEventListener("resize", handleResize);
+        // 使用 MutationObserver 监听DOM变化
+        var observer = new MutationObserver(function () {
+            calculateHeight();
+        });
+        var container = document.querySelector(".ztxk-container");
+        if (container) {
+            observer.observe(container, {
+                childList: true,
+                subtree: true,
+                attributes: true,
+            });
+        }
+        return function () {
+            window.removeEventListener("resize", handleResize);
+            observer.disconnect();
+        };
+    }, [isAutoScrollY, marginBottom, canvasTableId]);
+    return tableHeight;
+}
+
+export { useCanvasTableAutoHeight };

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

@@ -2,8 +2,8 @@ import { __spreadArray } from '../../_virtual/_tslib.js';
 import { useState, useEffect } from 'react';
 import { getMaxDepth } from '../utils/multiHeaderHelpers.js';
 
-var FONT_SIZE = 14;
-var FONT_FAMILY = "Arial, sans-serif";
+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;

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

@@ -29,7 +29,7 @@ import 'dayjs';
  * - 只渲染React元素类型的内容（字符串和数字在Canvas中直接绘制）
  */
 var useTableCellOverlay = function (params) {
-    var processedDataSource = params.processedDataSource, columnRenderInfos = params.columnRenderInfos, scrollState = params.scrollState, containerWidth = params.containerWidth, containerHeight = params.containerHeight, headerHeight = params.headerHeight, rowHeight = params.rowHeight, needHorizontalScrollbar = params.needHorizontalScrollbar, needVerticalScrollbar = params.needVerticalScrollbar, scrollbarSize = params.scrollbarSize, fixedRowsCount = params.fixedRowsCount, fixedRowsConfig = params.fixedRowsConfig, _a = params.hasSummaryRow, hasSummaryRow = _a === void 0 ? false : _a, _b = params.fixedSummaryRow, fixedSummaryRow = _b === void 0 ? false : _b;
+    var processedDataSource = params.processedDataSource, columnRenderInfos = params.columnRenderInfos, scrollState = params.scrollState, containerWidth = params.containerWidth, containerHeight = params.containerHeight, headerHeight = params.headerHeight, rowHeight = params.rowHeight, needHorizontalScrollbar = params.needHorizontalScrollbar, needVerticalScrollbar = params.needVerticalScrollbar, scrollbarSize = params.scrollbarSize, fixedRowsCount = params.fixedRowsCount, fixedRowsConfig = params.fixedRowsConfig, _a = params.hasSummaryRow, hasSummaryRow = _a === void 0 ? false : _a, _b = params.summaryFixed, summaryFixed = _b === void 0 ? false : _b;
     // 计算可见的单元格覆盖层信息
     var cellOverlays = useMemo(function () {
         var overlays = [];
@@ -49,7 +49,7 @@ var useTableCellOverlay = function (params) {
             ? containerWidth - scrollbarSize
             : containerWidth;
         // 计算可用高度，需要为固定合计行预留空间
-        var fixedSummaryHeight = fixedSummaryRow && hasSummaryRow ? rowHeight : 0;
+        var fixedSummaryHeight = summaryFixed && hasSummaryRow ? rowHeight : 0;
         var effectiveHeight = (needHorizontalScrollbar
             ? containerHeight - scrollbarSize
             : containerHeight) - fixedSummaryHeight;
@@ -158,7 +158,7 @@ var useTableCellOverlay = function (params) {
                     else {
                         // 非固定行需要严格避开所有固定行区域
                         var currentFixedBottomHeight = fixedBottomRowsCount * rowHeight;
-                        var currentFixedSummaryHeight = fixedSummaryRow && hasSummaryRow ? rowHeight : 0;
+                        var currentFixedSummaryHeight = summaryFixed && hasSummaryRow ? rowHeight : 0;
                         // 计算可滚动区域的严格边界
                         var scrollableAreaBottom = containerHeight -
                             (needHorizontalScrollbar ? scrollbarSize : 0) -
@@ -248,7 +248,7 @@ var useTableCellOverlay = function (params) {
         if (fixedBottomRowsCount > 0) {
             var bottomRowsStartIndex = processedDataSource.length -
                 fixedBottomRowsCount -
-                (fixedSummaryRow && hasSummaryRow ? 1 : 0);
+                (summaryFixed && hasSummaryRow ? 1 : 0);
             for (var i = 0; i < fixedBottomRowsCount; i++) {
                 var rowIndex = bottomRowsStartIndex + i;
                 var y = containerHeight -
@@ -260,7 +260,7 @@ var useTableCellOverlay = function (params) {
             }
         }
         // 4. 处理固定合计行
-        if (fixedSummaryRow && hasSummaryRow) {
+        if (summaryFixed && hasSummaryRow) {
             var summaryRowIndex = processedDataSource.length - 1;
             var summaryY = containerHeight -
                 (needHorizontalScrollbar ? scrollbarSize : 0) -
@@ -272,7 +272,7 @@ var useTableCellOverlay = function (params) {
             // 计算优先级（数值越大优先级越高）
             var getPriority = function (overlay) {
                 // 检查是否是固定合计行（最后一行且固定合计行开启）
-                var isSummaryRow = fixedSummaryRow &&
+                var isSummaryRow = summaryFixed &&
                     hasSummaryRow &&
                     overlay.rowIndex === processedDataSource.length - 1;
                 if (isSummaryRow && overlay.isFixed)
@@ -304,7 +304,7 @@ var useTableCellOverlay = function (params) {
         fixedRowsCount,
         fixedRowsConfig,
         hasSummaryRow,
-        fixedSummaryRow,
+        summaryFixed,
     ]);
     return {
         cellOverlays: cellOverlays,

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

@@ -1,6 +1,7 @@
 import { __assign } from '../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
-import { useCallback, useEffect, useMemo } from 'react';
+import { useRef, useCallback, useEffect, useMemo } from 'react';
+import 'zmdms-utils';
 import 'dayjs';
 import { findColumnByKey } from '../utils/columnHelpers.js';
 import FilterPopover from '../components/FilterPopover.js';
@@ -19,6 +20,8 @@ import '../components/ColumnDynamic.js';
  */
 var useBadgePopover = function (params) {
     var badgePopover = params.badgePopover, tooltip = params.tooltip, scrollTop = params.scrollTop, scrollLeft = params.scrollLeft, setState = params.setState;
+    // 使用 ref 记录上一次的滚动位置
+    var prevScrollRef = useRef({ scrollTop: scrollTop, scrollLeft: scrollLeft });
     // 关闭badge弹窗
     var handleCloseBadgePopover = useCallback(function () {
         setState(function (prev) { return (__assign(__assign({}, prev), { badgePopover: {
@@ -29,7 +32,10 @@ var useBadgePopover = function (params) {
     }, [setState]);
     // 滚动时关闭badge弹窗和tooltip
     useEffect(function () {
-        if (badgePopover.visible || tooltip.visible) {
+        // 只有在滚动位置真正变化时才关闭弹窗
+        var scrollChanged = prevScrollRef.current.scrollTop !== scrollTop ||
+            prevScrollRef.current.scrollLeft !== scrollLeft;
+        if (scrollChanged && (badgePopover.visible || tooltip.visible)) {
             setState(function (prev) { return (__assign(__assign({}, prev), { badgePopover: {
                     visible: false,
                     content: "",
@@ -41,6 +47,8 @@ var useBadgePopover = function (params) {
                     cellInfo: null,
                 } })); });
         }
+        // 更新上一次的滚动位置
+        prevScrollRef.current = { scrollTop: scrollTop, scrollLeft: scrollLeft };
     }, [scrollTop, scrollLeft, setState, badgePopover.visible, tooltip.visible]);
     return {
         handleCloseBadgePopover: handleCloseBadgePopover,

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

@@ -2,25 +2,27 @@ import { __spreadArray } from '../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
 import { useMemo } from 'react';
 import { DEFAULT_SELECTION_COLUMN_WIDTH } from '../utils/constants.js';
+import 'zmdms-utils';
 import 'dayjs';
 import { processColumnRender } from '../utils/columnHelpers.js';
 import { MERGE_INDEX } from '../../table/constant.js';
 import 'lodash/isEqual';
 import 'ahooks';
 import '../../node_modules/immutability-helper/index.js';
-import 'zmdms-utils';
 import '../../node_modules/exceljs/dist/exceljs.min.js';
+import '../components/FilterPopover.js';
+import '../../node_modules/react-contexify/dist/index.js';
+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;
+    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;
     return useMemo(function () {
         var cols = __spreadArray([], (dynamicColumns || columns), true);
         // 添加序号列
         if (mode === "index") {
             var title = "序号";
             if (dynamicKey && dynamicSettingRef) {
-                // 动态引入ColumnDynamic组件，避免循环依赖
-                var ColumnDynamic = require("../components/ColumnDynamic").default;
                 title = jsx(ColumnDynamic, { dynamicSettingRef: dynamicSettingRef });
             }
             cols.unshift({
@@ -77,7 +79,7 @@ var useProcessedColumns = function (params) {
         }
         // 处理render函数
         return cols.map(function (col) {
-            return processColumnRender(col, renderMode);
+            return processColumnRender(col, renderMode, headerWrap);
         });
     }, [
         dynamicColumns,

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

@@ -2,6 +2,7 @@ import { __assign } from '../../_virtual/_tslib.js';
 import { useMemo, useState, useRef, useEffect } from 'react';
 import { SCROLLBAR_SIZE, MIN_SCROLLBAR_SIZE } from '../utils/constants.js';
 import { calculateScrollbarMetrics } from '../utils/tableCalculations.js';
+import 'zmdms-utils';
 import 'dayjs';
 
 /**

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

@@ -5,9 +5,10 @@ import 'lodash/isEqual';
 import 'ahooks';
 import '../../node_modules/immutability-helper/index.js';
 import 'react/jsx-runtime';
-import { plus } from 'zmdms-utils';
+import { plus, exactRound, addThousedSeparator } from 'zmdms-utils';
 import '../../node_modules/exceljs/dist/exceljs.min.js';
 import 'dayjs';
+import { getAllLeafColumns } from '../utils/columnHelpers.js';
 
 /**
  * 合计行计算 Hook
@@ -15,23 +16,26 @@ import 'dayjs';
 var useSummaryRow = function (params) {
     var columns = params.columns, dataSource = params.dataSource;
     var summaryRow = useMemo(function () {
-        var hasSummary = columns.some(function (col) { return col.isSummary; });
+        // 先扁平化多级表头，获取所有叶子列
+        var leafColumns = getAllLeafColumns(columns);
+        var hasSummary = leafColumns.some(function (col) { return col.isSummary; });
         if (!hasSummary)
             return null;
         var summaryRecord = {};
         // 找到第一个数据列（非序号列、非选择框列）
         var firstDataColIndex = -1;
-        for (var i = 0; i < columns.length; i++) {
-            var col = columns[i];
+        for (var i = 0; i < leafColumns.length; i++) {
+            var col = leafColumns[i];
             if (col.key !== "__index__" && col.key !== "__selection__") {
                 firstDataColIndex = i;
                 break;
             }
         }
-        columns.forEach(function (column, colIndex) {
+        leafColumns.forEach(function (column, colIndex) {
             var dataIndex = column.dataIndex || column.key;
             if (column.isSummary) {
-                // 计算合计值
+                var calculatedSum = void 0;
+                // 默认计算逻辑：数值求和
                 var sum_1 = 0;
                 dataSource.forEach(function (record) {
                     var value = record[dataIndex];
@@ -43,13 +47,16 @@ var useSummaryRow = function (params) {
                         sum_1 = plus(sum_1, num);
                     }
                 });
-                // 应用格式化
-                var formattedSum = sum_1;
-                if (column.precision !== undefined) {
-                    formattedSum = sum_1.toFixed(column.precision);
-                }
-                if (column.thousand) {
-                    formattedSum = Number(formattedSum).toLocaleString("en-US");
+                calculatedSum = sum_1;
+                // 应用格式化（仅在没有自定义回调或回调返回数值时）
+                var formattedSum = calculatedSum;
+                if (typeof calculatedSum === "number") {
+                    if (column.precision !== undefined) {
+                        formattedSum = exactRound(calculatedSum, column.precision);
+                    }
+                    if (column.thousand) {
+                        formattedSum = addThousedSeparator(formattedSum);
+                    }
                 }
                 summaryRecord[dataIndex] = formattedSum;
             }
@@ -61,6 +68,12 @@ var useSummaryRow = function (params) {
                 summaryRecord[dataIndex] = "";
             }
         });
+        leafColumns.forEach(function (column) {
+            if (column.totalCalcCallback) {
+                var dataIndex = column.dataIndex || column.key;
+                summaryRecord[dataIndex] = column.totalCalcCallback(summaryRecord[dataIndex], summaryRecord);
+            }
+        });
         summaryRecord[IS_SUMMARY] = true;
         return summaryRecord;
     }, [columns, dataSource]);

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

@@ -5,6 +5,7 @@ import { FONT_SIZE, FONT_FAMILY } from '../utils/constants.js';
 import { isTextTruncated } from '../utils/canvasDrawHelpers.js';
 import { getMaxDepth, flattenHeaders, getLeafColumns } from '../utils/multiHeaderHelpers.js';
 import { getCellFromMousePosition, extractCellText } from '../utils/cellHelpers.js';
+import 'zmdms-utils';
 import 'dayjs';
 import { calculateSelectionState, toggleSelectAll, handleSortClick, calculateIconArea, isClickInIconArea, calculateScrollPosition, calculatePopoverPosition, isPointInTriangle } from '../utils/interactionHelpers.js';
 
@@ -12,7 +13,7 @@ import { calculateSelectionState, toggleSelectAll, handleSortClick, calculateIco
  * 表格交互事件处理 Hook
  */
 var useTableInteraction = function (params) {
-    var state = params.state, setState = params.setState, scrollState = params.scrollState, setScrollState = params.setScrollState, processedDataSource = params.processedDataSource, columnRenderInfos = params.columnRenderInfos, _a = params.columns, columns = _a === void 0 ? [] : _a, rowSelection = params.rowSelection, rowHeight = params.rowHeight, headerHeight = params.headerHeight, containerWidth = params.containerWidth, containerHeight = params.containerHeight, scrollbarSize = params.scrollbarSize, canvasRef = params.canvasRef, needVerticalScrollbar = params.needVerticalScrollbar, needHorizontalScrollbar = params.needHorizontalScrollbar, verticalScrollbarTop = params.verticalScrollbarTop, verticalScrollbarHeight = params.verticalScrollbarHeight, horizontalScrollbarLeft = params.horizontalScrollbarLeft, horizontalScrollbarWidth = params.horizontalScrollbarWidth, maxScrollTop = params.maxScrollTop, maxScrollLeft = params.maxScrollLeft, totalHeight = params.totalHeight, totalWidth = params.totalWidth, dataAreaHeight = params.dataAreaHeight, onSortChange = params.onSortChange, onRowClick = params.onRowClick, getRowKey = params.getRowKey, startSelection = params.startSelection, updateSelection = params.updateSelection, extendSelection = params.extendSelection, checkResizeHandle = params.checkResizeHandle, startResize = params.startResize, updateResize = params.updateResize, endResize = params.endResize, setHoverResizeColumn = params.setHoverResizeColumn, resizeState = params.resizeState, _b = params.hasSummaryRow, hasSummaryRow = _b === void 0 ? false : _b, mergeCellMap = params.mergeCellMap, menuShow = params.menuShow, fixedRowsCount = params.fixedRowsCount, fixedRowsConfig = params.fixedRowsConfig, fixedSummaryRow = params.fixedSummaryRow;
+    var state = params.state, setState = params.setState, scrollState = params.scrollState, setScrollState = params.setScrollState, processedDataSource = params.processedDataSource, columnRenderInfos = params.columnRenderInfos, _a = params.columns, columns = _a === void 0 ? [] : _a, rowSelection = params.rowSelection, rowHeight = params.rowHeight, headerHeight = params.headerHeight, containerWidth = params.containerWidth, containerHeight = params.containerHeight, scrollbarSize = params.scrollbarSize, canvasRef = params.canvasRef, needVerticalScrollbar = params.needVerticalScrollbar, needHorizontalScrollbar = params.needHorizontalScrollbar, verticalScrollbarTop = params.verticalScrollbarTop, verticalScrollbarHeight = params.verticalScrollbarHeight, horizontalScrollbarLeft = params.horizontalScrollbarLeft, horizontalScrollbarWidth = params.horizontalScrollbarWidth, maxScrollTop = params.maxScrollTop, maxScrollLeft = params.maxScrollLeft, totalHeight = params.totalHeight, totalWidth = params.totalWidth, dataAreaHeight = params.dataAreaHeight, onSortChange = params.onSortChange, onRowClick = params.onRowClick, getRowKey = params.getRowKey, startSelection = params.startSelection, updateSelection = params.updateSelection, extendSelection = params.extendSelection, checkResizeHandle = params.checkResizeHandle, startResize = params.startResize, updateResize = params.updateResize, endResize = params.endResize, setHoverResizeColumn = params.setHoverResizeColumn, resizeState = params.resizeState, _b = params.hasSummaryRow, hasSummaryRow = _b === void 0 ? false : _b, mergeCellMap = params.mergeCellMap, menuShow = params.menuShow, fixedRowsCount = params.fixedRowsCount, fixedRowsConfig = params.fixedRowsConfig, summaryFixed = params.summaryFixed;
     // 获取鼠标位置对应的单元格
     var getCellFromPosition = useMemoizedFn(function (x, y) {
         var fixedTopRowsCount = (fixedRowsConfig === null || fixedRowsConfig === void 0 ? void 0 : fixedRowsConfig.topCount) || fixedRowsCount || 0;
@@ -29,7 +30,7 @@ var useTableInteraction = function (params) {
             fixedTopRowsCount: fixedTopRowsCount,
             fixedBottomRowsCount: fixedBottomRowsCount,
             hasSummaryRow: hasSummaryRow,
-            fixedSummaryRow: fixedSummaryRow,
+            summaryFixed: summaryFixed,
             displayHeight: containerHeight,
             needHorizontalScrollbar: needHorizontalScrollbar,
             scrollbarSize: scrollbarSize,

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

@@ -19,7 +19,7 @@ import { calculateSelectionState, calculateIconArea } from '../utils/interaction
  * 表格渲染 Hook
  */
 var useTableRender = function (params) {
-    var canvasRef = params.canvasRef, processedDataSource = params.processedDataSource, columnRenderInfos = params.columnRenderInfos, columns = params.columns, state = params.state, scrollState = params.scrollState, rowSelection = params.rowSelection, containerWidth = params.containerWidth, containerHeight = params.containerHeight, headerHeight = params.headerHeight, rowHeight = params.rowHeight, bordered = params.bordered, striped = params.striped, needVerticalScrollbar = params.needVerticalScrollbar, needHorizontalScrollbar = params.needHorizontalScrollbar, verticalScrollbarTop = params.verticalScrollbarTop, verticalScrollbarHeight = params.verticalScrollbarHeight, horizontalScrollbarLeft = params.horizontalScrollbarLeft, horizontalScrollbarWidth = params.horizontalScrollbarWidth, getRowKey = params.getRowKey, resizeState = params.resizeState, getColumnWidth = params.getColumnWidth, _a = params.RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_WIDTH = _a === void 0 ? 8 : _a, mergeCellMap = params.mergeCellMap, _b = params.hasSummaryRow, hasSummaryRow = _b === void 0 ? false : _b, fixedRowsCount = params.fixedRowsCount, fixedRowsConfig = params.fixedRowsConfig, _c = params.fixedSummaryRow, fixedSummaryRow = _c === void 0 ? false : _c;
+    var canvasRef = params.canvasRef, processedDataSource = params.processedDataSource, columnRenderInfos = params.columnRenderInfos, columns = params.columns, state = params.state, scrollState = params.scrollState, rowSelection = params.rowSelection, containerWidth = params.containerWidth, containerHeight = params.containerHeight, headerHeight = params.headerHeight, rowHeight = params.rowHeight, bordered = params.bordered, striped = params.striped, needVerticalScrollbar = params.needVerticalScrollbar, needHorizontalScrollbar = params.needHorizontalScrollbar, verticalScrollbarTop = params.verticalScrollbarTop, verticalScrollbarHeight = params.verticalScrollbarHeight, horizontalScrollbarLeft = params.horizontalScrollbarLeft, horizontalScrollbarWidth = params.horizontalScrollbarWidth, getRowKey = params.getRowKey, resizeState = params.resizeState, getColumnWidth = params.getColumnWidth, _a = params.RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_WIDTH = _a === void 0 ? 8 : _a, mergeCellMap = params.mergeCellMap, _b = params.hasSummaryRow, hasSummaryRow = _b === void 0 ? false : _b, fixedRowsCount = params.fixedRowsCount, fixedRowsConfig = params.fixedRowsConfig, _c = params.summaryFixed, summaryFixed = _c === void 0 ? false : _c;
     // 判断是否是多级表头
     var maxDepth = useMemo(function () { return getMaxDepth(columns); }, [columns]);
     var isMultiHeader = maxDepth > 1;
@@ -281,16 +281,42 @@ var useTableRender = function (params) {
                 // 如果是最末级且有图标，文本左对齐；否则居中
                 if (isLastLevel && iconArea.iconsWidth > 0) {
                     ctx.textAlign = "left";
-                    var textX = drawX + 16;
+                    var textX_1 = drawX + 16;
                     var textMaxWidth = width - 16 - iconArea.iconsWidth;
-                    var truncated = truncateText(ctx, titleText, textMaxWidth);
-                    ctx.fillText(truncated, textX, textY);
+                    // 根据 wrap 属性处理文本
+                    if (column.wrap) {
+                        // 换行显示（支持\n和自动换行）
+                        var lines = wrapText(ctx, titleText, textMaxWidth);
+                        var lineHeight_2 = 20;
+                        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);
+                        });
+                    }
+                    else {
+                        var truncated = truncateText(ctx, titleText, textMaxWidth);
+                        ctx.fillText(truncated, textX_1, textY);
+                    }
                 }
                 else {
                     ctx.textAlign = "center";
-                    var textX = drawX + width / 2;
-                    var truncated = truncateText(ctx, titleText, width - 16);
-                    ctx.fillText(truncated, textX, textY);
+                    var textX_2 = drawX + width / 2;
+                    // 根据 wrap 属性处理文本
+                    if (column.wrap) {
+                        // 换行显示（支持\n和自动换行）
+                        var lines = wrapText(ctx, titleText, width - 16);
+                        var lineHeight_3 = 20;
+                        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);
+                        });
+                    }
+                    else {
+                        var truncated = truncateText(ctx, titleText, width - 16);
+                        ctx.fillText(truncated, textX_2, textY);
+                    }
                 }
                 // 绘制筛选图标（仅在最末级表头显示）
                 if (iconArea.hasFilter) {
@@ -365,13 +391,30 @@ var useTableRender = function (params) {
         // 计算实际可用的渲染区域高度（考虑固定底部行和合计行）
         var fixedBottomRowsCount = (fixedRowsConfig === null || fixedRowsConfig === void 0 ? void 0 : fixedRowsConfig.bottomCount) || 0;
         var fixedBottomHeight = fixedBottomRowsCount * rowHeight;
-        var fixedSummaryHeight = fixedSummaryRow && hasSummaryRow ? rowHeight : 0;
+        var fixedSummaryHeight = summaryFixed && hasSummaryRow ? rowHeight : 0;
         var effectiveHeight = displayHeight -
             (needHorizontalScrollbar ? SCROLLBAR_SIZE : 0) -
             fixedBottomHeight -
             fixedSummaryHeight;
-        // 跳过不在可视区域的行，但允许部分可见的行
-        if (y + rowHeight < headerHeight || y >= effectiveHeight) {
+        // 提前检查这一行是否有合并单元格，找出最大的rowSpan
+        var maxRowSpanInRow = 1;
+        if (mergeCellMap) {
+            columnRenderInfos.forEach(function (_, colIndex) {
+                var mergeCellKey = "".concat(rowIndex, "-").concat(colIndex);
+                var mergeInfo = mergeCellMap.get(mergeCellKey);
+                // 只考虑主单元格（不是被合并的单元格）
+                if (mergeInfo &&
+                    !mergeInfo.skip &&
+                    mergeInfo.rowSpan > maxRowSpanInRow) {
+                    maxRowSpanInRow = mergeInfo.rowSpan;
+                }
+            });
+        }
+        // 计算这一行的实际高度（考虑合并单元格）
+        var actualRowHeight = rowHeight * maxRowSpanInRow;
+        // 跳过不在可视区域的行
+        // 关键：使用合并后的实际高度判断，确保合并单元格的最后一行还在可视区域内时继续渲染
+        if (y + actualRowHeight < headerHeight || y >= effectiveHeight) {
             return;
         }
         var recordKey = getRowKey(record, rowIndex);
@@ -430,7 +473,10 @@ var useTableRender = function (params) {
             ctx.beginPath();
             // 裁剪区域：确保不覆盖表头，从 headerHeight 开始
             var clipY = Math.max(y, headerHeight);
-            var clipHeight = Math.min(cellHeight, y + cellHeight - headerHeight);
+            // 计算单元格实际底部位置，并限制在可视区域内
+            var cellBottom = Math.min(y + cellHeight, effectiveHeight);
+            // 裁剪高度 = 单元格可见底部 - 裁剪起始位置
+            var clipHeight = Math.max(0, cellBottom - clipY);
             // 对于非fixed列，还需要裁剪掉被fixed列遮挡的部分
             var clipX = drawX;
             var clipWidth = width;
@@ -476,9 +522,12 @@ var useTableRender = function (params) {
             else {
                 var dataIndex = column.dataIndex || column.key;
                 var cellValue = record[dataIndex];
+                // 检查是否是合计行
+                var isSummaryRow = record[IS_SUMMARY];
                 // 检查是否有 render 函数且返回自定义 ReactNode
                 var shouldRenderInCanvas = true;
-                if (column.render) {
+                // 对于合计行，不应用render函数，直接显示原始数据
+                if (column.render && !isSummaryRow) {
                     var rendered = column.render(cellValue, record, rowIndex);
                     // 如果返回的不是字符串或数字，说明是自定义组件，应该在覆盖层渲染，不在 Canvas 渲染
                     if (typeof rendered !== "string" &&
@@ -491,29 +540,39 @@ var useTableRender = function (params) {
                 // 只有在需要在 Canvas 中渲染时才绘制文本
                 if (shouldRenderInCanvas) {
                     // 应用格式化（日期、精度、千分符）
-                    var cellText = extractCellText({
-                        cellValue: cellValue,
-                        record: record,
-                        rowIndex: rowIndex,
-                        renderFn: column.render,
-                    });
-                    // 如果没有自定义render，应用格式化
-                    if (!column.render) {
+                    var cellText = void 0;
+                    // 对于合计行，直接使用格式化函数，不应用render
+                    if (isSummaryRow) {
                         cellText = formatCellValue(cellValue, column);
                     }
+                    else {
+                        cellText = extractCellText({
+                            cellValue: cellValue,
+                            record: record,
+                            rowIndex: rowIndex,
+                            renderFn: column.render,
+                        });
+                        // 如果没有自定义render，应用格式化
+                        if (!column.render) {
+                            cellText = formatCellValue(cellValue, column);
+                        }
+                    }
                     // 绘制文本
                     ctx.fillStyle = COLORS.text;
-                    ctx.font = "".concat(FONT_SIZE, "px ").concat(FONT_FAMILY);
+                    // 合计行字体加粗
+                    ctx.font = record[IS_SUMMARY]
+                        ? "bold ".concat(FONT_SIZE, "px ").concat(FONT_FAMILY)
+                        : "".concat(FONT_SIZE, "px ").concat(FONT_FAMILY);
                     ctx.textBaseline = "middle";
                     var align = column.align || "left";
-                    var textX_1 = drawX + 16;
+                    var textX_3 = drawX + 16;
                     if (align === "center") {
                         ctx.textAlign = "center";
-                        textX_1 = drawX + width / 2;
+                        textX_3 = drawX + width / 2;
                     }
                     else if (align === "right") {
                         ctx.textAlign = "right";
-                        textX_1 = drawX + width - 16;
+                        textX_3 = drawX + width - 16;
                     }
                     else {
                         ctx.textAlign = "left";
@@ -525,15 +584,15 @@ var useTableRender = function (params) {
                     if (wrap) {
                         // 换行显示
                         var lines = wrapText(ctx, cellText, maxWidth);
-                        var lineHeight_2 = FONT_SIZE + 4; // 行高
-                        var totalHeight = lines.length * lineHeight_2;
+                        var lineHeight_4 = FONT_SIZE + 4; // 行高
+                        var totalHeight = lines.length * lineHeight_4;
                         // 使用合并后的单元格高度计算垂直居中位置
-                        var startY_2 = y + (cellHeight - totalHeight) / 2 + lineHeight_2 / 2;
+                        var startY_4 = y + (cellHeight - totalHeight) / 2 + lineHeight_4 / 2;
                         lines.forEach(function (line, lineIndex) {
-                            var lineY = startY_2 + lineIndex * lineHeight_2;
+                            var lineY = startY_4 + lineIndex * lineHeight_4;
                             // 只绘制在单元格可见区域内的文本
                             if (lineY >= y && lineY <= y + cellHeight) {
-                                ctx.fillText(line, textX_1, lineY);
+                                ctx.fillText(line, textX_3, lineY);
                             }
                         });
                     }
@@ -541,15 +600,13 @@ var useTableRender = function (params) {
                         // 省略显示 - 使用合并后的单元格高度
                         var textY = y + cellHeight / 2;
                         var truncatedText = truncateText(ctx, cellText, maxWidth);
-                        ctx.fillText(truncatedText, textX_1, textY);
+                        ctx.fillText(truncatedText, textX_3, textY);
                     }
                     else {
                         // 不处理，直接显示 - 使用合并后的单元格高度
                         var textY = y + cellHeight / 2;
-                        ctx.fillText(cellText, textX_1, textY);
+                        ctx.fillText(cellText, textX_3, textY);
                     }
-                    // 绘制角标（跳过合计行）
-                    var isSummaryRow = hasSummaryRow && rowIndex === processedDataSource.length - 1;
                     if (column.badge && !isSummaryRow) {
                         var badgeProps = typeof column.badge === "function"
                             ? column.badge(record)
@@ -787,7 +844,9 @@ var useTableRender = function (params) {
             var cellText = formatCellValue(cellValue, column);
             // 检查是否有render函数且返回自定义ReactNode
             var shouldRenderInCanvas = true;
-            if (column.render) {
+            // 对于合计行，不应用render函数，直接显示原始数据
+            var isSummaryRowFixed = rowType === "summary";
+            if (column.render && !isSummaryRowFixed) {
                 var rendered = column.render(cellValue, record, rowIndex);
                 // 如果返回的不是字符串或数字，说明是自定义组件，应该在覆盖层渲染，不在 Canvas 渲染
                 if (typeof rendered !== "string" &&
@@ -887,7 +946,7 @@ var useTableRender = function (params) {
     var drawFixedBottomRow = useMemoizedFn(function (ctx, rowIndex, relativeIndex, displayWidth, displayHeight, onlyFixed) {
         if (onlyFixed === void 0) { onlyFixed = false; }
         drawFixedRow(ctx, rowIndex, function () {
-            var fixedSummaryHeight = fixedSummaryRow && hasSummaryRow ? rowHeight : 0;
+            var fixedSummaryHeight = summaryFixed && hasSummaryRow ? rowHeight : 0;
             return (displayHeight -
                 (needHorizontalScrollbar ? SCROLLBAR_SIZE : 0) -
                 fixedSummaryHeight -
@@ -899,7 +958,7 @@ var useTableRender = function (params) {
     var drawFixedBottomRowsBorder = useMemoizedFn(function (ctx, rowCount, displayWidth, displayHeight, onlyFixed) {
         if (onlyFixed === void 0) { onlyFixed = false; }
         drawFixedRowsBorder(ctx, rowCount, function () {
-            var fixedSummaryHeight = fixedSummaryRow && hasSummaryRow ? rowHeight : 0;
+            var fixedSummaryHeight = summaryFixed && hasSummaryRow ? rowHeight : 0;
             return (displayHeight -
                 (needHorizontalScrollbar ? SCROLLBAR_SIZE : 0) -
                 fixedSummaryHeight -
@@ -948,7 +1007,7 @@ var useTableRender = function (params) {
         var fixedBottomRowsCount = (fixedRowsConfig === null || fixedRowsConfig === void 0 ? void 0 : fixedRowsConfig.bottomCount) || 0;
         var bottomRowsStartIndex = processedDataSource.length -
             fixedBottomRowsCount -
-            (fixedSummaryRow && hasSummaryRow ? 1 : 0);
+            (summaryFixed && hasSummaryRow ? 1 : 0);
         var summaryRowIndex = hasSummaryRow
             ? processedDataSource.length - 1
             : -1;
@@ -974,7 +1033,7 @@ var useTableRender = function (params) {
                 row < bottomRowsStartIndex + fixedBottomRowsCount) {
                 // 固定底部行
                 var relativeIndex = row - bottomRowsStartIndex;
-                var fixedSummaryHeight = fixedSummaryRow && hasSummaryRow ? rowHeight : 0;
+                var fixedSummaryHeight = summaryFixed && hasSummaryRow ? rowHeight : 0;
                 y =
                     displayHeight -
                         (needHorizontalScrollbar ? SCROLLBAR_SIZE : 0) -
@@ -984,7 +1043,7 @@ var useTableRender = function (params) {
                 cellHeight = rowHeight;
                 isFixedRow = true;
             }
-            else if (fixedSummaryRow && row === summaryRowIndex) {
+            else if (summaryFixed && row === summaryRowIndex) {
                 // 固定合计行
                 var summaryRowY = displayHeight -
                     (needHorizontalScrollbar ? SCROLLBAR_SIZE : 0) -
@@ -1157,6 +1216,9 @@ var useTableRender = function (params) {
         canvas.style.width = "".concat(displayWidth, "px");
         canvas.style.height = "".concat(displayHeight, "px");
         ctx.scale(dpr, dpr);
+        // 优化文字渲染质量，防止模糊
+        ctx.imageSmoothingEnabled = true;
+        ctx.imageSmoothingQuality = "high";
         // 清空画布
         ctx.clearRect(0, 0, displayWidth, displayHeight);
         // 绘制背景
@@ -1168,7 +1230,7 @@ var useTableRender = function (params) {
         // 计算固定行占用的高度
         var fixedTopRowsHeight = fixedTopRowsCount * rowHeight;
         var fixedBottomRowsHeight = fixedBottomRowsCount * rowHeight;
-        var fixedSummaryRowHeight = fixedSummaryRow && hasSummaryRow ? rowHeight : 0;
+        var fixedSummaryRowHeight = summaryFixed && hasSummaryRow ? rowHeight : 0;
         // 计算可视区域的数据区域高度（不包括表头、固定行和固定合计行）
         var dataAreaHeight = displayHeight -
             headerHeight -
@@ -1182,6 +1244,35 @@ var useTableRender = function (params) {
             Math.ceil((scrollState.scrollTop + dataAreaHeight) / rowHeight), processedDataSource.length - fixedBottomRowsCount
         // 注意：不再减去合计行数量，因为合计行的空间已在 dataAreaHeight 中考虑
         );
+        // 关键修复：向前扩展渲染范围，检查是否有合并单元格延伸到可视区域
+        // 策略：对每一列独立检查，找到该列最靠前的需要渲染的主合并单元格
+        if (mergeCellMap && scrollStartRow > fixedTopRowsCount) {
+            var originalStartRow = scrollStartRow;
+            var minStartRow = scrollStartRow;
+            // 对每一列独立检查
+            for (var colIndex = 0; colIndex < columnRenderInfos.length; colIndex++) {
+                // 向前查找这一列的主合并单元格，最多向前查找20行
+                for (var checkRow = originalStartRow - 1; checkRow >= fixedTopRowsCount && checkRow >= originalStartRow - 20; checkRow--) {
+                    var mergeCellKey = "".concat(checkRow, "-").concat(colIndex);
+                    var mergeInfo = mergeCellMap.get(mergeCellKey);
+                    // 如果找到主单元格（不是被合并的单元格）
+                    if (mergeInfo && !mergeInfo.skip && mergeInfo.rowSpan > 1) {
+                        // 计算合并单元格的底部行索引
+                        var mergeEndRow = checkRow + mergeInfo.rowSpan - 1;
+                        // 如果这个合并单元格延伸到可视区域
+                        if (mergeEndRow >= originalStartRow) {
+                            // 更新最小起始行
+                            minStartRow = Math.min(minStartRow, checkRow);
+                        }
+                        // 找到这一列的主单元格后，停止向前查找该列
+                        break;
+                    }
+                    // 如果是skip的单元格或没有合并信息，继续向前查找
+                    // 因为主单元格可能在更前面
+                }
+            }
+            scrollStartRow = minStartRow;
+        }
         // 1. 绘制可滚动区域的数据行（包括边框）
         renderWithFixedLayer(ctx, 
         // 渲染行内容
@@ -1215,7 +1306,7 @@ var useTableRender = function (params) {
             ctx.save();
             var bottomRowsStartIndex_1 = processedDataSource.length -
                 fixedBottomRowsCount -
-                (fixedSummaryRow && hasSummaryRow ? 1 : 0);
+                (summaryFixed && hasSummaryRow ? 1 : 0);
             renderWithFixedLayer(ctx, 
             // 渲染行内容
             function (onlyFixed) {
@@ -1233,7 +1324,7 @@ var useTableRender = function (params) {
         // 7. 绘制固定列阴影
         drawFixedColumns(ctx, scrollStartRow, scrollEndRow, displayWidth, displayHeight);
         // 4. 绘制固定合计行（如果启用）
-        if (fixedSummaryRow && hasSummaryRow) {
+        if (summaryFixed && hasSummaryRow) {
             var summaryRowIndex_1 = processedDataSource.length - 1;
             var summaryRowY_1 = displayHeight -
                 (needHorizontalScrollbar ? SCROLLBAR_SIZE : 0) -

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

@@ -1,6 +1,7 @@
 import { __assign, __spreadArray } from '../../_virtual/_tslib.js';
 import { useState, useEffect, useMemo } from 'react';
 import { useMemoizedFn } from 'ahooks';
+import 'zmdms-utils';
 import 'dayjs';
 import { getAllLeafColumns, findColumnByKey } from '../utils/columnHelpers.js';
 

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

@@ -129,6 +129,13 @@ interface ICanvasColumnType<RecordType = any> {
      * 开启合计
      */
     isSummary?: boolean;
+    /**
+     * 合计自定义计算回调函数
+     * @param value 当前值
+     * @param values 所有值的数组
+     * @returns 计算后的合计值
+     */
+    totalCalcCallback?: (value: any, values: any) => any;
     /**
      * 开启合并的字段,按其他字段维度合并
      */
@@ -172,6 +179,7 @@ interface ICanvasColumnType<RecordType = any> {
         [key: string]: any;
     };
 }
+type ICanvasColumnsType<RecordType = any> = ICanvasColumnType<RecordType>[];
 interface IBadgeProps {
     /**
      * 角标颜色
@@ -237,6 +245,10 @@ interface ICanvasTableProps<RecordType = any> {
      * 表头高度
      */
     headerHeight?: number;
+    /**
+     * 表头换行
+     */
+    headerWrap?: boolean;
     /**
      * 勾选配置
      */
@@ -369,7 +381,19 @@ interface ICanvasTableProps<RecordType = any> {
      * 合计行是否固定在底部（默认为false）
      * 当为true时，合计行固定在表格底部不参与滚动
      */
-    fixedSummaryRow?: boolean;
+    summaryFixed?: boolean;
+    /**
+     * 是否开启自动计算Y轴高度
+     */
+    isAutoScrollY?: boolean;
+    /**
+     * 自动计算Y轴高度时，canvas table下面留出的距离
+     */
+    autoScrollYMarginBottom?: number;
+    /**
+     * 表格id（用于自动高度计算时定位元素）
+     */
+    canvasTableId?: string;
 }
 
-export { ColumnDataType, FilterConfig, IBadgeProps, ICanvasColumnType, ICanvasRowSelection, ICanvasTableProps, SortOrder };
+export { ColumnDataType, FilterConfig, IBadgeProps, ICanvasColumnType, ICanvasColumnsType, ICanvasRowSelection, ICanvasTableProps, SortOrder };

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

@@ -5,7 +5,7 @@
  * 获取鼠标位置对应的单元格
  */
 var getCellFromMousePosition = function (params) {
-    var x = params.x, y = params.y, headerHeight = params.headerHeight, rowHeight = params.rowHeight, scrollTop = params.scrollTop, scrollLeft = params.scrollLeft, columnRenderInfos = params.columnRenderInfos, dataLength = params.dataLength, _a = params.fixedTopRowsCount, fixedTopRowsCount = _a === void 0 ? 0 : _a, _b = params.fixedBottomRowsCount, fixedBottomRowsCount = _b === void 0 ? 0 : _b, _c = params.hasSummaryRow, hasSummaryRow = _c === void 0 ? false : _c, _d = params.fixedSummaryRow, fixedSummaryRow = _d === void 0 ? false : _d, _e = params.displayHeight, displayHeight = _e === void 0 ? 0 : _e, _f = params.needHorizontalScrollbar, needHorizontalScrollbar = _f === void 0 ? false : _f, _g = params.scrollbarSize, scrollbarSize = _g === void 0 ? 12 : _g;
+    var x = params.x, y = params.y, headerHeight = params.headerHeight, rowHeight = params.rowHeight, scrollTop = params.scrollTop, scrollLeft = params.scrollLeft, columnRenderInfos = params.columnRenderInfos, dataLength = params.dataLength, _a = params.fixedTopRowsCount, fixedTopRowsCount = _a === void 0 ? 0 : _a, _b = params.fixedBottomRowsCount, fixedBottomRowsCount = _b === void 0 ? 0 : _b, _c = params.hasSummaryRow, hasSummaryRow = _c === void 0 ? false : _c, _d = params.summaryFixed, summaryFixed = _d === void 0 ? false : _d, _e = params.displayHeight, displayHeight = _e === void 0 ? 0 : _e, _f = params.needHorizontalScrollbar, needHorizontalScrollbar = _f === void 0 ? false : _f, _g = params.scrollbarSize, scrollbarSize = _g === void 0 ? 12 : _g;
     // 判断是否在表头区域（row=-1表示表头）
     var rowIndex;
     if (y < headerHeight) {
@@ -23,7 +23,7 @@ var getCellFromMousePosition = function (params) {
             return findColumn(x, scrollLeft, columnRenderInfos, rowIndex);
         }
         // 检查是否在固定合计行区域
-        if (fixedSummaryRow && hasSummaryRow && displayHeight > 0) {
+        if (summaryFixed && hasSummaryRow && displayHeight > 0) {
             var summaryRowY = displayHeight -
                 (needHorizontalScrollbar ? scrollbarSize : 0) -
                 rowHeight;
@@ -35,7 +35,7 @@ var getCellFromMousePosition = function (params) {
         }
         // 检查是否在固定底部行区域
         if (fixedBottomRowsCount > 0 && displayHeight > 0) {
-            var fixedSummaryHeight = fixedSummaryRow && hasSummaryRow ? rowHeight : 0;
+            var fixedSummaryHeight = summaryFixed && hasSummaryRow ? rowHeight : 0;
             var fixedBottomAreaStart = displayHeight -
                 (needHorizontalScrollbar ? scrollbarSize : 0) -
                 fixedSummaryHeight -
@@ -50,7 +50,7 @@ var getCellFromMousePosition = function (params) {
                 var relativeIndex = Math.floor(relativeY / rowHeight);
                 var bottomRowsStartIndex = dataLength -
                     fixedBottomRowsCount -
-                    (fixedSummaryRow && hasSummaryRow ? 1 : 0);
+                    (summaryFixed && hasSummaryRow ? 1 : 0);
                 rowIndex = bottomRowsStartIndex + relativeIndex;
                 if (rowIndex < 0 || rowIndex >= dataLength)
                     return null;
@@ -65,7 +65,7 @@ var getCellFromMousePosition = function (params) {
         // 如果有固定底部行或合计行，需要排除它们
         var maxScrollableRow = dataLength -
             fixedBottomRowsCount -
-            (fixedSummaryRow && hasSummaryRow ? 1 : 0);
+            (summaryFixed && hasSummaryRow ? 1 : 0);
         if (rowIndex >= maxScrollableRow) {
             // 超出可滚动区域，可能在滚动条或空白区域
             return null;

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

@@ -24,9 +24,13 @@ var findColumnByKey = function (columns, key) {
 /**
  * 递归处理列的render函数（转换为统一的调用格式）
  */
-var processColumnRender = function (column, renderMode) {
+var processColumnRender = function (column, renderMode, headerWrap) {
     if (renderMode === void 0) { renderMode = "object"; }
     var processedColumn = __assign({}, column);
+    if (headerWrap) {
+        processedColumn.wrap =
+            processedColumn.wrap === undefined ? headerWrap : processedColumn.wrap;
+    }
     // 处理当前列的render函数
     if (column.render) {
         var render_1 = column.render;
@@ -40,7 +44,7 @@ var processColumnRender = function (column, renderMode) {
     // 递归处理children
     if (column.children && Array.isArray(column.children)) {
         processedColumn.children = column.children.map(function (child) {
-            return processColumnRender(child, renderMode);
+            return processColumnRender(child, renderMode, headerWrap);
         });
     }
     return processedColumn;

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

@@ -18,7 +18,7 @@ var COLORS = {
     hoverBg: "rgb(239, 245, 254)",
     selectionBg: "rgba(24, 144, 255, 0.1)",
     // 文本色
-    text: "rgba(0, 0, 0, 0.85)",
+    text: "#333333",
     emptyText: "rgba(0, 0, 0, 0.25)",
     // 边框色
     border: "rgb(222, 233, 246)",
@@ -33,8 +33,8 @@ var COLORS = {
     checkboxDisabled: "#d9d9d9",
 };
 // 字体配置
-var FONT_FAMILY = '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto';
-var FONT_SIZE = 14;
+var FONT_FAMILY = '"Microsoft YaHei", 微软雅黑, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif';
+var FONT_SIZE = 13; // 增大1px，提升清晰度
 // 图标尺寸
 var CHECKBOX_SIZE = 16;
 var SORT_ICON_SIZE = 6;

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

@@ -1,30 +1,9 @@
+import { exactRound, addThousedSeparator } from 'zmdms-utils';
 import dayjs from 'dayjs';
 
 /**
  * 数据格式化工具函数
  */
-/**
- * 格式化数值（千分符）
- */
-var formatThousand = function (value) {
-    if (value === null || value === undefined || value === "")
-        return "";
-    var num = typeof value === "string" ? parseFloat(value) : value;
-    if (isNaN(num))
-        return String(value);
-    return num.toLocaleString("en-US");
-};
-/**
- * 格式化精度
- */
-var formatPrecision = function (value, precision) {
-    if (value === null || value === undefined || value === "")
-        return "";
-    var num = typeof value === "string" ? parseFloat(value) : value;
-    if (isNaN(num))
-        return String(value);
-    return num.toFixed(precision);
-};
 /**
  * 格式化日期
  */
@@ -48,13 +27,13 @@ var formatCellValue = function (value, column) {
     }
     // 数值精度
     if (column.precision !== undefined && typeof formattedValue === "number") {
-        formattedValue = formatPrecision(formattedValue, column.precision);
+        formattedValue = exactRound(formattedValue, column.precision);
     }
     // 千分符
     if (column.thousand && !isNaN(Number(formattedValue))) {
-        formattedValue = formatThousand(formattedValue);
+        formattedValue = addThousedSeparator(formattedValue);
     }
     return String(formattedValue);
 };
 
-export { formatCellValue, formatDate, formatPrecision, formatThousand };
+export { formatCellValue, formatDate };

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, ICanvasTableProps } from './es/canvastable/interface.js';
+export { ICanvasColumnType, ICanvasColumnsType, ICanvasTableProps } 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.3",
+  "version": "2.3.5",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",