zmdms-webui 2.4.0 → 2.4.2

package/dist/es/canvastable/canvasTable.js

@@ -39,7 +39,8 @@ import { getTableColumns } from '../table/utils.js';
 import DynamicSetting from '../dynamicsetting/dynamicSetting.js';
 
 function CanvasTable(props) {
-    var _a = props.dataSource, dataSource = _a === void 0 ? [] : _a, _b = props.columns, columns = _b === void 0 ? [] : _b, _c = props.rowKey, rowKey = _c === void 0 ? "id" : _c, _d = props.height, height = _d === void 0 ? 600 : _d, width = props.width, _e = props.rowHeight, rowHeight = _e === void 0 ? 36 : _e, _f = props.headerHeight, headerHeight = _f === void 0 ? 36 : _f, rowSelection = props.rowSelection, onSortChange = props.onSortChange, onFilterChange = props.onFilterChange, onScroll = props.onScroll, onRowClick = props.onRowClick, onColumnResize = props.onColumnResize, _g = props.bordered, bordered = _g === void 0 ? true : _g, _h = props.striped, striped = _h === void 0 ? false : _h, _j = props.emptyText, emptyText = _j === void 0 ? "暂无数据" : _j, style = props.style, className = props.className, _k = props.loading, loading = _k === void 0 ? false : _k, _l = props.isContextMenu, isContextMenu = _l === void 0 ? true : _l, isFullscreenHandle = props.isFullscreenHandle, _m = props.mode, mode = _m === void 0 ? "index" : _m, dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isDimensionDynamic = props.isDimensionDynamic, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, _o = props.isIndexMerge, isIndexMerge = _o === void 0 ? true : _o, _p = props.isSelectionMerge, isSelectionMerge = _p === void 0 ? false : _p, _q = props.renderMode, renderMode = _q === void 0 ? "object" : _q, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, _r = props.summaryFixed, summaryFixed = _r === void 0 ? false : _r, _s = props.isAutoScrollY, isAutoScrollY = _s === void 0 ? false : _s, _t = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _t === void 0 ? 65 : _t, canvasTableId = props.canvasTableId, headerWrap = props.headerWrap, _u = props.headerAlign, headerAlign = _u === void 0 ? "center" : _u, tableRefHandle = props.tableRefHandle, exportExcelConfig = props.exportExcelConfig;
+    var _a = props.dataSource, dataSource = _a === void 0 ? [] : _a, _b = props.columns, columns = _b === void 0 ? [] : _b, _c = props.rowKey, rowKey = _c === void 0 ? "id" : _c, _d = props.height, height = _d === void 0 ? 600 : _d, width = props.width, _e = props.rowHeight, rowHeight = _e === void 0 ? 36 : _e, _f = props.headerHeight, headerHeight = _f === void 0 ? 36 : _f, rowSelection = props.rowSelection, onSortChange = props.onSortChange, onFilterChange = props.onFilterChange, onScroll = props.onScroll, onRowClick = props.onRowClick, onColumnResize = props.onColumnResize, _g = props.bordered, bordered = _g === void 0 ? true : _g, _h = props.striped, striped = _h === void 0 ? false : _h, _j = props.emptyText, emptyText = _j === void 0 ? "暂无数据" : _j, style = props.style, className = props.className, _k = props.loading, loading = _k === void 0 ? false : _k, _l = props.isContextMenu, isContextMenu = _l === void 0 ? true : _l, isFullscreenHandle = props.isFullscreenHandle, mode = props.mode, dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isDimensionDynamic = props.isDimensionDynamic, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, _m = props.isIndexMerge, isIndexMerge = _m === void 0 ? true : _m, _o = props.isSelectionMerge, isSelectionMerge = _o === void 0 ? false : _o, _p = props.renderMode, renderMode = _p === void 0 ? "object" : _p, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, _q = props.summaryFixed, summaryFixed = _q === void 0 ? false : _q, _r = props.isAutoScrollY, isAutoScrollY = _r === void 0 ? false : _r, _s = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _s === void 0 ? 65 : _s, canvasTableId = props.canvasTableId, headerWrap = props.headerWrap, _t = props.headerAlign, headerAlign = _t === void 0 ? "center" : _t, tableRefHandle = props.tableRefHandle, exportExcelConfig = props.exportExcelConfig;
+    var actualMode = "mode" in props ? mode : "index";
     var canvasRef = useRef(null);
     var containerRef = useRef(null);
     var filterPopoverRef = useRef(null);
@@ -61,22 +62,22 @@ function CanvasTable(props) {
         return String((_a = record[rowKey]) !== null && _a !== void 0 ? _a : index);
     }, [rowKey]);
     // 动态列配置
-    var _v = useDynamicListByColumns(columns, {
+    var _u = useDynamicListByColumns(columns, {
         dynamicKey: dynamicKey,
         dynamicVersion: dynamicVersion,
         customDynamicListHandle: customDynamicListHandle,
-    }), defaultDynamicList = _v.defaultDynamicList, currentDynamicList = _v.currentDynamicList, onCurrentListChange = _v.onCurrentListChange, dynamicSettingRef = _v.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;
     // 内部列宽状态（未开启动态配置时使用）
-    var _w = useState({}), internalColumnWidths = _w[0], setInternalColumnWidths = _w[1];
+    var _v = useState({}), internalColumnWidths = _v[0], setInternalColumnWidths = _v[1];
     // 跟踪用户手动调整过宽度的列（用于排除自动宽度分配）
-    var _x = useState(new Set()), manuallyResizedColumnKeys = _x[0], setManuallyResizedColumnKeys = _x[1];
+    var _w = useState(new Set()), manuallyResizedColumnKeys = _w[0], setManuallyResizedColumnKeys = _w[1];
     // 处理选中框列、序号列等
     var processedColumnsOld = useProcessedColumns({
         columns: columns,
         dynamicColumns: dynamicColumns,
-        mode: mode,
+        mode: actualMode,
         rowSelection: rowSelection,
         internalColumnWidths: internalColumnWidths,
         dynamicKey: dynamicKey,
@@ -86,29 +87,29 @@ function CanvasTable(props) {
         headerAlign: headerAlign,
     });
     // 表格状态管理
-    var _y = useTableState({
+    var _x = useTableState({
         dataSource: dataSource,
         columns: processedColumnsOld,
         rowSelection: rowSelection,
         onFilterChange: onFilterChange,
         isAutoMerge: isAutoMerge,
-    }), state = _y.state, setState = _y.setState, processedDataSource = _y.processedDataSource, handleFilterChange = _y.handleFilterChange, closeFilterPopover = _y.closeFilterPopover, autoGeneratedFilters = _y.autoGeneratedFilters;
+    }), state = _x.state, setState = _x.setState, processedDataSource = _x.processedDataSource, handleFilterChange = _x.handleFilterChange, closeFilterPopover = _x.closeFilterPopover, autoGeneratedFilters = _x.autoGeneratedFilters;
     var order = useMemo(function () {
         return state.sortOrder && state.sortField
             ? { field: state.sortField, order: state.sortOrder }
             : undefined;
     }, [state.sortOrder, state.sortField]);
-    var _z = useAutoMerge(processedDataSource, processedColumnsOld, {
+    var _y = useAutoMerge(processedDataSource, processedColumnsOld, {
         isAutoMerge: isAutoMerge,
         isDimensionDynamic: isDimensionDynamic,
         order: order,
         dimensionCustomSumKeys: dimensionCustomSumKeys,
-    }), newDataSource = _z[0], processedColumns = _z[1];
+    }), newDataSource = _y[0], processedColumns = _y[1];
     // 生成合计行和最终数据源
-    var _0 = useSummaryRow({
+    var _z = useSummaryRow({
         columns: processedColumns,
         dataSource: newDataSource,
-    }), finalDataSource = _0.finalDataSource, hasSummaryRow = _0.hasSummaryRow;
+    }), finalDataSource = _z.finalDataSource, hasSummaryRow = _z.hasSummaryRow;
     // 自动高度计算（需要在容器尺寸计算之前）
     var autoHeight = useCanvasTableAutoHeight(isAutoScrollY, autoScrollYMarginBottom, canvasTableId);
     // 监听容器尺寸变化（提前计算，用于列宽自适应）
@@ -144,7 +145,7 @@ function CanvasTable(props) {
         return calculateTotalHeight(calculatedHeaderHeight, finalDataSource.length, rowHeight);
     }, [calculatedHeaderHeight, finalDataSource.length, rowHeight]);
     // 计算滚动条指标
-    var _1 = useScrollbarMetrics({
+    var _0 = useScrollbarMetrics({
         containerWidth: containerWidth,
         containerHeight: containerHeight,
         totalWidth: totalWidth,
@@ -152,14 +153,14 @@ function CanvasTable(props) {
         headerHeight: calculatedHeaderHeight,
         scrollTop: 0,
         scrollLeft: 0,
-    }), maxScrollTop = _1.maxScrollTop, maxScrollLeft = _1.maxScrollLeft;
+    }), maxScrollTop = _0.maxScrollTop, maxScrollLeft = _0.maxScrollLeft;
     // 滚动管理（使用预先计算的maxScrollTop和maxScrollLeft）
-    var _2 = useTableScroll({
+    var _1 = useTableScroll({
         containerRef: containerRef,
         maxScrollTop: maxScrollTop,
         maxScrollLeft: maxScrollLeft,
         onScroll: onScroll,
-    }), scrollState = _2.scrollState, setScrollState = _2.setScrollState;
+    }), scrollState = _1.scrollState, setScrollState = _1.setScrollState;
     // 数据变化时重置滚动位置（筛选、排序、数据源更新等操作后）
     useScrollReset({
         dataSourceLength: dataSource.length,
@@ -180,12 +181,12 @@ function CanvasTable(props) {
         scrollLeft: scrollState.scrollLeft,
     }).actualMetrics;
     // 单元格框选
-    var _3 = useTableSelection({
+    var _2 = useTableSelection({
         state: state,
         setState: setState,
     }), 
     // selectionStartRef,
-    startSelection = _3.startSelection, updateSelection = _3.updateSelection, extendSelection = _3.extendSelection;
+    startSelection = _2.startSelection, updateSelection = _2.updateSelection, extendSelection = _2.extendSelection;
     // 处理列宽调整
     var handleColumnResize = useCallback(function (columnKey, newWidth) {
         var _a;
@@ -240,13 +241,13 @@ function CanvasTable(props) {
         onCurrentListChange,
     ]);
     // 列宽调整
-    var _4 = useColumnResize({
+    var _3 = useColumnResize({
         columnRenderInfos: columnRenderInfos,
         containerWidth: containerWidth,
         headerHeight: calculatedHeaderHeight,
         scrollLeft: scrollState.scrollLeft,
         onColumnResize: handleColumnResize,
-    }), resizeState = _4.resizeState, checkResizeHandle = _4.checkResizeHandle, startResize = _4.startResize, updateResize = _4.updateResize, endResize = _4.endResize, setHoverResizeColumn = _4.setHoverResizeColumn, getColumnWidth = _4.getColumnWidth, RESIZE_HANDLE_WIDTH = _4.RESIZE_HANDLE_WIDTH;
+    }), resizeState = _3.resizeState, checkResizeHandle = _3.checkResizeHandle, startResize = _3.startResize, updateResize = _3.updateResize, endResize = _3.endResize, setHoverResizeColumn = _3.setHoverResizeColumn, getColumnWidth = _3.getColumnWidth, RESIZE_HANDLE_WIDTH = _3.RESIZE_HANDLE_WIDTH;
     // 复制到剪贴板
     var getSelectedCellsText = useCopyToClipboard({
         cellSelection: state.cellSelection,
@@ -274,7 +275,7 @@ function CanvasTable(props) {
         summaryConfig: [],
     });
     // 交互事件处理（使用baseScrollbarMetrics的maxScrollTop/maxScrollLeft以保持稳定）
-    var _5 = useTableInteraction({
+    var _4 = useTableInteraction({
         state: state,
         setState: setState,
         scrollState: scrollState,
@@ -289,6 +290,7 @@ function CanvasTable(props) {
         containerHeight: containerHeight,
         scrollbarSize: SCROLLBAR_SIZE,
         canvasRef: canvasRef,
+        containerRef: containerRef,
         totalHeight: totalHeight,
         totalWidth: totalWidth,
         // 使用scrollbarMetrics的显示相关属性（需要随滚动更新）
@@ -320,7 +322,7 @@ function CanvasTable(props) {
         fixedRowsCount: fixedRowsCount,
         fixedRowsConfig: fixedRowsConfig,
         summaryFixed: summaryFixed,
-    }), handleCanvasMouseDown = _5.handleCanvasMouseDown, handleCanvasMouseMove = _5.handleCanvasMouseMove, handleCanvasMouseUp = _5.handleCanvasMouseUp, handleCanvasMouseLeave = _5.handleCanvasMouseLeave, handleCanvasContextMenu = _5.handleCanvasContextMenu;
+    }), handleCanvasMouseDown = _4.handleCanvasMouseDown, handleCanvasMouseMove = _4.handleCanvasMouseMove, handleCanvasMouseUp = _4.handleCanvasMouseUp, handleCanvasMouseLeave = _4.handleCanvasMouseLeave, handleCanvasContextMenu = _4.handleCanvasContextMenu;
     // 渲染表格
     useTableRender(__assign(__assign({ canvasRef: canvasRef, processedDataSource: finalDataSource, columnRenderInfos: columnRenderInfos, columns: processedColumns, // 传递原始columns用于渲染多级表头
         state: state, scrollState: scrollState, rowSelection: rowSelection, containerWidth: containerWidth, containerHeight: containerHeight, headerHeight: calculatedHeaderHeight, baseHeaderHeight: headerHeight, // 传入原始基础高度用于计算每层高度

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

@@ -1,5 +1,5 @@
 import { __assign } from '../../_virtual/_tslib.js';
-import { useMemo, useState, useRef, useEffect } from 'react';
+import { useMemo, useState, useRef, useEffect, useCallback } from 'react';
 import { SCROLLBAR_SIZE, MIN_SCROLLBAR_SIZE } from '../utils/constants.js';
 import { calculateScrollbarMetrics } from '../utils/tableCalculations.js';
 import 'zmdms-utils';
@@ -115,8 +115,17 @@ var useTableScroll = function (params) {
             e.stopPropagation();
             // 当鼠标在容器内任何位置（包括CellOverlay）时都能滚动
             // 累积滚动增量
-            pendingDeltaRef.current.deltaX += e.deltaX;
-            pendingDeltaRef.current.deltaY += e.deltaY;
+            // 支持 Shift + 鼠标滚轮进行水平滚动
+            if (e.shiftKey) {
+                // 按住 Shift 键时，将垂直滚动转换为水平滚动
+                pendingDeltaRef.current.deltaX += e.deltaY;
+                pendingDeltaRef.current.deltaY += 0;
+            }
+            else {
+                // 正常滚动逻辑
+                pendingDeltaRef.current.deltaX += e.deltaX;
+                pendingDeltaRef.current.deltaY += e.deltaY;
+            }
             // 如果已经有pending的动画帧，不需要再次请求
             if (rafIdRef.current !== null) {
                 return;
@@ -178,7 +187,239 @@ var useTableScroll = function (params) {
         setScrollState: setScrollState,
     };
 };
-// ==================== Hook 3: 滚动位置重置 ====================
+var useSelectionBoundaryScroll = function (params) {
+    var containerRef = params.containerRef, isSelecting = params.isSelecting, 
+    // scrollState,
+    setScrollState = params.setScrollState, maxScrollTop = params.maxScrollTop, maxScrollLeft = params.maxScrollLeft, onScroll = params.onScroll, getCellFromPosition = params.getCellFromPosition, updateSelection = params.updateSelection, columnRenderInfos = params.columnRenderInfos;
+    var scrollRafRef = useRef(null);
+    var currentMousePosRef = useRef(null);
+    var lastCellRef = useRef(null);
+    var scrollVelocityRef = useRef({
+        deltaX: 0,
+        deltaY: 0,
+    });
+    // 状态更新去抖：避免频繁的状态更新
+    var stateUpdateRafRef = useRef(null);
+    var pendingStateUpdateRef = useRef(null);
+    // 缓存当前的滚动状态，避免频繁读取
+    var currentScrollStateRef = useRef({ scrollLeft: 0, scrollTop: 0 });
+    // 使用 ref 保存最新的函数引用，避免闭包问题
+    var setScrollStateRef = useRef(setScrollState);
+    var onScrollRef = useRef(onScroll);
+    var getCellFromPositionRef = useRef(getCellFromPosition);
+    var updateSelectionRef = useRef(updateSelection);
+    var columnRenderInfosRef = useRef(columnRenderInfos);
+    // 更新 ref 中的函数引用
+    useEffect(function () {
+        setScrollStateRef.current = setScrollState;
+        onScrollRef.current = onScroll;
+        getCellFromPositionRef.current = getCellFromPosition;
+        updateSelectionRef.current = updateSelection;
+        columnRenderInfosRef.current = columnRenderInfos;
+    });
+    // 同步当前滚动状态到 ref
+    useEffect(function () {
+        // 通过 setScrollState 的返回值来获取当前状态（不触发状态更新）
+        var currentState;
+        setScrollStateRef.current(function (prev) {
+            currentState = prev;
+            return prev; // 不修改状态，只读取
+        });
+        if (currentState) {
+            currentScrollStateRef.current = {
+                scrollLeft: currentState.scrollLeft,
+                scrollTop: currentState.scrollTop,
+            };
+        }
+    });
+    var SCROLL_BOUNDARY_SIZE = 50; // 触发滚动的边界距离
+    var SCROLL_SPEED = 6; // 每次滚动的距离（进一步降低以减少频率）
+    // 防抖：避免鼠标移动时过度频繁地触发边界检测
+    var boundaryCheckThrottleRef = useRef(0);
+    // 批量状态更新函数：减少重新渲染次数
+    var batchUpdateScrollState = useCallback(function (newScrollLeft, newScrollTop) {
+        // 立即更新缓存状态
+        currentScrollStateRef.current = {
+            scrollLeft: newScrollLeft,
+            scrollTop: newScrollTop,
+        };
+        // 保存待更新的状态
+        pendingStateUpdateRef.current = {
+            scrollLeft: newScrollLeft,
+            scrollTop: newScrollTop,
+        };
+        // 如果已经有待处理的更新，直接返回
+        if (stateUpdateRafRef.current !== null) {
+            return;
+        }
+        // 延迟到下一个渲染周期批量更新
+        stateUpdateRafRef.current = requestAnimationFrame(function () {
+            var pendingUpdate = pendingStateUpdateRef.current;
+            if (pendingUpdate) {
+                setScrollStateRef.current(function (prev) {
+                    if (prev.scrollLeft !== pendingUpdate.scrollLeft ||
+                        prev.scrollTop !== pendingUpdate.scrollTop) {
+                        // 延迟调用 onScroll 回调，避免阻塞滚动
+                        setTimeout(function () {
+                            var _a;
+                            (_a = onScrollRef.current) === null || _a === void 0 ? void 0 : _a.call(onScrollRef, pendingUpdate.scrollLeft, pendingUpdate.scrollTop);
+                        }, 0);
+                        return __assign(__assign({}, prev), { scrollLeft: pendingUpdate.scrollLeft, scrollTop: pendingUpdate.scrollTop });
+                    }
+                    return prev;
+                });
+            }
+            // 清理状态
+            stateUpdateRafRef.current = null;
+            pendingStateUpdateRef.current = null;
+        });
+    }, []);
+    // 检查边界滚动
+    var checkBoundaryScroll = useCallback(function (mouseX, mouseY) {
+        if (!containerRef.current || !isSelecting)
+            return;
+        // 节流：限制边界检测频率（每16ms最多执行一次，约60fps）
+        var now = performance.now();
+        if (now - boundaryCheckThrottleRef.current < 16) {
+            return;
+        }
+        boundaryCheckThrottleRef.current = now;
+        var rect = containerRef.current.getBoundingClientRect();
+        var containerWidth = rect.width;
+        var containerHeight = rect.height;
+        var scrollDeltaX = 0;
+        var scrollDeltaY = 0;
+        // 检查水平边界
+        if (mouseX < SCROLL_BOUNDARY_SIZE) {
+            // 接近左边界，向左滚动
+            scrollDeltaX = -SCROLL_SPEED;
+        }
+        else if (mouseX > containerWidth - SCROLL_BOUNDARY_SIZE) {
+            // 接近右边界，向右滚动
+            scrollDeltaX = SCROLL_SPEED;
+        }
+        // 检查垂直边界
+        if (mouseY < SCROLL_BOUNDARY_SIZE) {
+            // 接近顶部边界，向上滚动
+            scrollDeltaY = -SCROLL_SPEED;
+        }
+        else if (mouseY > containerHeight - SCROLL_BOUNDARY_SIZE) {
+            // 接近底部边界，向下滚动
+            scrollDeltaY = SCROLL_SPEED;
+        }
+        // 保存当前鼠标位置和滚动速度
+        currentMousePosRef.current = { x: mouseX, y: mouseY };
+        scrollVelocityRef.current = {
+            deltaX: scrollDeltaX,
+            deltaY: scrollDeltaY,
+        };
+        // 如果需要滚动
+        if (scrollDeltaX !== 0 || scrollDeltaY !== 0) {
+            // 清除之前的动画帧
+            if (scrollRafRef.current) {
+                cancelAnimationFrame(scrollRafRef.current);
+            }
+            // 开始持续滚动（优化版本）
+            var performScroll_1 = function () {
+                var _a;
+                var velocity = scrollVelocityRef.current;
+                if (velocity.deltaX === 0 && velocity.deltaY === 0) {
+                    return; // 停止滚动
+                }
+                // 获取当前滚动状态（从缓存中读取，避免触发状态更新）
+                var currentState = currentScrollStateRef.current;
+                var newScrollLeft = Math.max(0, Math.min(maxScrollLeft, currentState.scrollLeft + velocity.deltaX));
+                var newScrollTop = Math.max(0, Math.min(maxScrollTop, currentState.scrollTop + velocity.deltaY));
+                // 只有在位置真正发生变化时才更新
+                if (newScrollLeft !== currentState.scrollLeft ||
+                    newScrollTop !== currentState.scrollTop) {
+                    // 使用批量更新机制
+                    batchUpdateScrollState(newScrollLeft, newScrollTop);
+                    // 优化的框选更新：减少不必要的计算
+                    if (getCellFromPositionRef.current &&
+                        updateSelectionRef.current &&
+                        columnRenderInfosRef.current &&
+                        currentMousePosRef.current) {
+                        var _b = currentMousePosRef.current, x = _b.x, y = _b.y;
+                        // 添加位置计算的缓存，避免重复计算
+                        try {
+                            var cell = getCellFromPositionRef.current(x, y);
+                            // 只有当单元格位置发生变化时才更新框选
+                            if (cell &&
+                                (!lastCellRef.current ||
+                                    lastCellRef.current.row !== cell.row ||
+                                    lastCellRef.current.col !== cell.col)) {
+                                var isSelectionColumn = ((_a = columnRenderInfosRef.current[cell.col]) === null || _a === void 0 ? void 0 : _a.column.key) ===
+                                    "__selection__";
+                                if (!isSelectionColumn) {
+                                    updateSelectionRef.current(cell);
+                                    lastCellRef.current = cell;
+                                }
+                            }
+                        }
+                        catch (error) {
+                            // 如果计算单元格位置出错，静默处理，不影响滚动
+                            console.warn("Cell position calculation error during boundary scroll:", error);
+                        }
+                    }
+                }
+                // 继续滚动
+                scrollRafRef.current = requestAnimationFrame(performScroll_1);
+            };
+            scrollRafRef.current = requestAnimationFrame(performScroll_1);
+        }
+        else {
+            // 停止滚动
+            if (scrollRafRef.current) {
+                cancelAnimationFrame(scrollRafRef.current);
+                scrollRafRef.current = null;
+            }
+            scrollVelocityRef.current = { deltaX: 0, deltaY: 0 };
+        }
+    }, [
+        containerRef,
+        isSelecting,
+        maxScrollTop,
+        maxScrollLeft,
+        batchUpdateScrollState,
+    ]);
+    // 停止边界滚动
+    var stopBoundaryScroll = useCallback(function () {
+        if (scrollRafRef.current) {
+            cancelAnimationFrame(scrollRafRef.current);
+            scrollRafRef.current = null;
+        }
+        if (stateUpdateRafRef.current) {
+            cancelAnimationFrame(stateUpdateRafRef.current);
+            stateUpdateRafRef.current = null;
+        }
+        scrollVelocityRef.current = { deltaX: 0, deltaY: 0 };
+        pendingStateUpdateRef.current = null;
+        lastCellRef.current = null; // 重置缓存的单元格位置
+    }, []);
+    // 当框选结束时停止滚动
+    useEffect(function () {
+        if (!isSelecting) {
+            stopBoundaryScroll();
+        }
+    }, [isSelecting, stopBoundaryScroll]);
+    // 组件卸载时清理动画帧
+    useEffect(function () {
+        return function () {
+            if (scrollRafRef.current) {
+                cancelAnimationFrame(scrollRafRef.current);
+            }
+            if (stateUpdateRafRef.current) {
+                cancelAnimationFrame(stateUpdateRafRef.current);
+            }
+        };
+    }, []);
+    return {
+        checkBoundaryScroll: checkBoundaryScroll,
+        stopBoundaryScroll: stopBoundaryScroll,
+    };
+};
+// ==================== Hook 4: 滚动位置重置 ====================
 /**
  * 滚动位置重置 Hook
  *
@@ -236,4 +477,4 @@ var useScrollReset = function (params) {
     ]);
 };
 
-export { useScrollReset, useScrollbarMetrics, useTableScroll };
+export { useScrollReset, useScrollbarMetrics, useSelectionBoundaryScroll, useTableScroll };

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

@@ -22,6 +22,8 @@ var useSummaryRow = function (params) {
         if (!hasSummary)
             return null;
         var summaryRecord = {};
+        // 原始值，为转为千分符的
+        var summaryOriginalValues = {};
         // 找到第一个列（包括序号列、选择框列）
         var firstColIndex = leafColumns.length > 0 ? 0 : -1;
         leafColumns.forEach(function (column, colIndex) {
@@ -43,9 +45,11 @@ var useSummaryRow = function (params) {
                 calculatedSum = sum_1;
                 // 应用格式化（仅在没有自定义回调或回调返回数值时）
                 var formattedSum = calculatedSum;
+                summaryOriginalValues[dataIndex] = calculatedSum;
                 if (typeof calculatedSum === "number") {
                     if (column.precision !== undefined) {
                         formattedSum = exactRound(calculatedSum, column.precision);
+                        summaryOriginalValues[dataIndex] = calculatedSum;
                     }
                     if (column.thousand) {
                         formattedSum = addThousedSeparator(formattedSum);
@@ -64,7 +68,7 @@ var useSummaryRow = function (params) {
         leafColumns.forEach(function (column) {
             if (column.totalCalcCallback) {
                 var dataIndex = column.dataIndex || column.key;
-                summaryRecord[dataIndex] = column.totalCalcCallback(summaryRecord[dataIndex], summaryRecord);
+                summaryRecord[dataIndex] = column.totalCalcCallback(summaryOriginalValues[dataIndex], summaryOriginalValues);
             }
         });
         summaryRecord[IS_SUMMARY] = true;

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

@@ -1,6 +1,7 @@
 import { __assign, __spreadArray } from '../../_virtual/_tslib.js';
 import { useRef, useEffect } from 'react';
 import { useMemoizedFn } from 'ahooks';
+import { useSelectionBoundaryScroll } from './useScroll.js';
 import { FONT_SIZE, FONT_FAMILY } from '../utils/constants.js';
 import { isTextTruncated } from '../utils/canvasDrawHelpers.js';
 import { getMaxDepth, flattenHeaders, getLeafColumns } from '../utils/multiHeaderHelpers.js';
@@ -13,7 +14,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, summaryFixed = params.summaryFixed;
+    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, containerRef = params.containerRef, 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;
@@ -464,6 +465,8 @@ var useTableInteraction = function (params) {
                     updateSelection(cell);
                 }
             }
+            // 检查边界滚动 - 当鼠标接近容器边界时自动滚动
+            checkBoundaryScroll(x, y);
             return;
         }
         // 检测列宽调整手柄hover状态
@@ -612,6 +615,8 @@ var useTableInteraction = function (params) {
         // 结束框选
         if (state.isSelecting) {
             setState(function (prev) { return (__assign(__assign({}, prev), { isSelecting: false })); });
+            // 停止边界滚动
+            stopBoundaryScroll();
         }
     });
     // 检查目标元素是否是Canvas内部渲染的元素
@@ -808,6 +813,8 @@ var useTableInteraction = function (params) {
             // 结束框选
             if (currentState.isSelecting) {
                 setState(function (prev) { return (__assign(__assign({}, prev), { isSelecting: false })); });
+                // 停止边界滚动
+                stopBoundaryScroll();
             }
             setScrollState(function (prev) { return (__assign(__assign({}, prev), { isDraggingVertical: false, isDraggingHorizontal: false })); });
         };
@@ -828,6 +835,21 @@ var useTableInteraction = function (params) {
         // updateResize, endResize, handleVerticalScrollDrag, handleHorizontalScrollDrag,
         // updateSelection, setState, getCellFromPosition, columnRenderInfos,
     ]);
+    // 边界滚动Hook - 用于框选时的自动滚动
+    var _c = useSelectionBoundaryScroll({
+        containerRef: containerRef,
+        isSelecting: state.isSelecting,
+        scrollState: scrollState,
+        setScrollState: setScrollState,
+        maxScrollTop: maxScrollTop,
+        maxScrollLeft: maxScrollLeft,
+        onScroll: function (scrollLeft, scrollTop) {
+            // 边界滚动时的回调，可以在这里添加额外的逻辑
+        },
+        getCellFromPosition: getCellFromPosition,
+        updateSelection: updateSelection,
+        columnRenderInfos: columnRenderInfos,
+    }), checkBoundaryScroll = _c.checkBoundaryScroll, stopBoundaryScroll = _c.stopBoundaryScroll;
     return {
         handleCanvasMouseDown: handleCanvasMouseDown,
         handleCanvasMouseMove: handleCanvasMouseMove,

package/package.json

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