zmdms-webui 2.3.4 → 2.3.5

package/dist/es/canvastable/canvasTable.js

@@ -39,7 +39,7 @@ import { getTableColumns } from '../table/utils.js';
 import DynamicSetting from '../dynamicsetting/dynamicSetting.js';
 
 function CanvasTable(props) {
-    var _a = props.dataSource, dataSource = _a === void 0 ? [] : _a, _b = props.columns, columns = _b === void 0 ? [] : _b, _c = props.rowKey, rowKey = _c === void 0 ? "id" : _c, _d = props.height, height = _d === void 0 ? 600 : _d, width = props.width, _e = props.rowHeight, rowHeight = _e === void 0 ? 36 : _e, _f = props.headerHeight, headerHeight = _f === void 0 ? 36 : _f, rowSelection = props.rowSelection, onSortChange = props.onSortChange, onFilterChange = props.onFilterChange, onScroll = props.onScroll, onRowClick = props.onRowClick, onColumnResize = props.onColumnResize, _g = props.bordered, bordered = _g === void 0 ? true : _g, _h = props.striped, striped = _h === void 0 ? false : _h, _j = props.emptyText, emptyText = _j === void 0 ? "暂无数据" : _j, style = props.style, className = props.className, _k = props.loading, loading = _k === void 0 ? false : _k, _l = props.isContextMenu, isContextMenu = _l === void 0 ? true : _l, isFullscreenHandle = props.isFullscreenHandle, _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;
+    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);
@@ -85,6 +85,7 @@ function CanvasTable(props) {
         dynamicKey: dynamicKey,
         renderMode: renderMode,
         dynamicSettingRef: dynamicSettingRef,
+        headerWrap: headerWrap,
     });
     // 表格状态管理
     var _w = useTableState({

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

@@ -3,7 +3,7 @@ import { useState, useEffect } from 'react';
 import { getMaxDepth } from '../utils/multiHeaderHelpers.js';
 
 var FONT_SIZE = 13;
-var FONT_FAMILY = "Arial, sans-serif";
+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/usePopovers.js

@@ -1,6 +1,6 @@
 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';
@@ -20,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: {
@@ -30,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: "",
@@ -42,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

@@ -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;
+    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);
         // 添加序号列
@@ -79,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/useSummaryRow.js

@@ -8,6 +8,7 @@ import 'react/jsx-runtime';
 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,45 +16,38 @@ 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;
-                if (column.totalCalcCallback) {
-                    // 使用自定义计算回调
-                    var values = dataSource
-                        .filter(function (record) { return !record[IS_SUMMARY]; })
-                        .map(function (record) { return record[dataIndex]; });
-                    calculatedSum = column.totalCalcCallback(null, values);
-                }
-                else {
-                    // 默认计算逻辑：数值求和
-                    var sum_1 = 0;
-                    dataSource.forEach(function (record) {
-                        var value = record[dataIndex];
-                        var num = typeof value === "string" ? parseFloat(value) : value;
-                        if (!isNaN(num) &&
-                            num !== null &&
-                            num !== undefined &&
-                            !record[IS_SUMMARY]) {
-                            sum_1 = plus(sum_1, num);
-                        }
-                    });
-                    calculatedSum = sum_1;
-                }
+                // 默认计算逻辑：数值求和
+                var sum_1 = 0;
+                dataSource.forEach(function (record) {
+                    var value = record[dataIndex];
+                    var num = typeof value === "string" ? parseFloat(value) : value;
+                    if (!isNaN(num) &&
+                        num !== null &&
+                        num !== undefined &&
+                        !record[IS_SUMMARY]) {
+                        sum_1 = plus(sum_1, num);
+                    }
+                });
+                calculatedSum = sum_1;
                 // 应用格式化（仅在没有自定义回调或回调返回数值时）
                 var formattedSum = calculatedSum;
                 if (typeof calculatedSum === "number") {
@@ -74,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/useTableRender.js

@@ -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) {
@@ -370,8 +396,25 @@ var useTableRender = function (params) {
             (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,16 +540,23 @@ 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;
                     // 合计行字体加粗
@@ -509,14 +565,14 @@ var useTableRender = function (params) {
                         : "".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";
@@ -528,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);
                             }
                         });
                     }
@@ -544,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)
@@ -790,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" &&
@@ -1160,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);
         // 绘制背景
@@ -1185,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, 
         // 渲染行内容

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

@@ -135,7 +135,7 @@ interface ICanvasColumnType<RecordType = any> {
      * @param values 所有值的数组
      * @returns 计算后的合计值
      */
-    totalCalcCallback?: (value: any, values: any[]) => any;
+    totalCalcCallback?: (value: any, values: any) => any;
     /**
      * 开启合并的字段,按其他字段维度合并
      */

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

@@ -33,8 +33,8 @@ var COLORS = {
     checkboxDisabled: "#d9d9d9",
 };
 // 字体配置
-var FONT_FAMILY = '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto';
-var FONT_SIZE = 13;
+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/package.json

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