zmdms-webui 2.4.4 → 2.4.5

package/dist/es/canvastable/canvasTable.js

@@ -1,6 +1,6 @@
 import { __assign } from '../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useRef, useState, useCallback, useMemo, useImperativeHandle } from 'react';
+import { useRef, useState, useCallback, useMemo, useEffect, useImperativeHandle } from 'react';
 import { Spin } from 'antd';
 import './components/FilterPopover.js';
 import CellOverlay from './components/CellOverlay.js';
@@ -161,6 +161,14 @@ function CanvasTable(props) {
         maxScrollLeft: maxScrollLeft,
         onScroll: onScroll,
     }), scrollState = _1.scrollState, setScrollState = _1.setScrollState;
+    // 使用 ref 保存最新的滚动位置，确保在组件卸载过程中仍能访问
+    var scrollPositionRef = useRef({ x: 0, y: 0 });
+    useEffect(function () {
+        scrollPositionRef.current = {
+            x: scrollState.scrollLeft,
+            y: scrollState.scrollTop,
+        };
+    }, [scrollState.scrollLeft, scrollState.scrollTop]);
     // 数据变化时重置滚动位置（筛选、排序、数据源更新等操作后）
     useScrollReset({
         dataSourceLength: dataSource.length,
@@ -421,9 +429,10 @@ function CanvasTable(props) {
         },
         /** 获取滚动条位置信息 */
         getScrollPosition: function () {
+            // 返回 ref 中的值，确保在组件卸载过程中仍能获取到最后的滚动位置
             return {
-                x: scrollState.scrollLeft,
-                y: scrollState.scrollTop,
+                x: scrollPositionRef.current.x,
+                y: scrollPositionRef.current.y,
             };
         },
         /** 获取当前排序状态 */
@@ -455,8 +464,6 @@ function CanvasTable(props) {
         state.filters,
         setState,
         setScrollState,
-        scrollState.scrollLeft,
-        scrollState.scrollTop,
     ]);
     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",

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

@@ -409,7 +409,7 @@ interface ICanvasTableProps<RecordType = any> {
     /**
      * 表格ref句柄，用于暴露表格的一些方法
      */
-    tableRefHandle?: React__default.Ref<ICanvasTableRefHandle | undefined>;
+    tableRefHandle?: React__default.MutableRefObject<ICanvasTableRefHandle | undefined>;
     /**
      * 导出excel的一些配置
      */

package/dist/es/table/table.js

@@ -193,6 +193,8 @@ var Table = function (props) {
     });
     // 表格验证
     var _y = useTableValidate(), tableRef = _y.tableRef, getCurrentTable = _y.getCurrentTable, clearErrorClass = _y.clearErrorClass;
+    // 使用 ref 缓存最新的滚动位置，确保在组件卸载过程中仍能访问
+    var scrollPositionRef = useRef({ x: 0, y: 0 });
     // 滚动条控制方法
     var scrollToPosition = useMemoizedFn(function (options) {
         var _a;
@@ -235,14 +237,17 @@ var Table = function (props) {
         var _a;
         var tableBody = (_a = tableRef.current) === null || _a === void 0 ? void 0 : _a.querySelector(".ant-table-body");
         if (tableBody) {
-            return {
+            // 更新 ref 缓存
+            scrollPositionRef.current = {
                 x: tableBody.scrollLeft,
                 y: tableBody.scrollTop,
             };
+            return scrollPositionRef.current;
         }
+        // 如果 DOM 已销毁，返回最后缓存的位置
         return {
-            x: 0,
-            y: 0,
+            x: scrollPositionRef.current.x,
+            y: scrollPositionRef.current.y,
         };
     });
     // 虚拟滚动选项

package/package.json

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