ztxkui 10.0.47 → 10.0.49

package/dist/DemoCom/TableDemo.js

@@ -68,7 +68,7 @@ import { useContextMenu } from 'react-contexify';
 // 获取表格数据
 function useGetTableRecords() {
     // 表格数据
-    var _a = useState(Array.from({ length: 10 }).map(function (item, index) {
+    var _a = useState(Array.from({ length: 1000 }).map(function (item, index) {
         var newItem = {
             id: "" + (index + 1),
             test1: index + 1 + "-test1",

package/dist/components/Table/table.js

@@ -708,28 +708,48 @@ function Table(props) {
             (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange) &&
                 rowSelection.onChange(selectedRowKeys, selectedRows);
         } })); }, [rowSelection]);
-    var virtualRef = useRef();
-    // 自动开启虚拟滚动
-    var virtual = useMemo(function () {
-        if (virtualTableKey)
-            return virtualTableKey;
-        if (expandableDataSource.length > 400) {
-            if (virtualRef.current)
-                return virtualRef.current;
-            var key = Math.random().toString(36).slice(-12);
-            virtualRef.current = key;
-            return key;
+    var isVirtialInit = useRef(true);
+    var _o = useState(), virtual = _o[0], setVirtual = _o[1];
+    var _p = useState(), virtualY = _p[0], setVirtialY = _p[1];
+    useEffect(function () {
+        if (onEditableSave)
+            return;
+        if (virtualTableKey) {
+            if (isVirtialInit.current) {
+                setVirtual(virtualTableKey);
+                setHeight();
+                isVirtialInit.current = false;
+            }
+        }
+        else if (expandableDataSource && (expandableDataSource === null || expandableDataSource === void 0 ? void 0 : expandableDataSource.length) > 400) {
+            var key_1 = Math.random().toString(36).slice(-10);
+            setVirtual(function (item) {
+                return item || key_1;
+            });
+            setHeight();
+        }
+        else {
+            setVirtual(undefined);
+        }
+        function setHeight() {
+            var _a;
+            if (isFlex) {
+                var body = (_a = tableRef.current) === null || _a === void 0 ? void 0 : _a.querySelector('.ant-table-body');
+                var height = body === null || body === void 0 ? void 0 : body.clientHeight;
+                setVirtialY(height);
+            }
         }
-        virtualRef.current = undefined;
-        return undefined;
-    }, [virtualTableKey, expandableDataSource]);
+    }, [isFlex, expandableDataSource, virtualTableKey, onEditableSave]);
     // 虚拟滚动选项
     var vComponents = useMemo(function () {
         if (virtual) {
             // 使用VList 即可有虚拟列表的效果
+            var height = myScroll.y ? myScroll.y : 200;
+            if (virtualY)
+                height = virtualY;
             return VList({
                 vid: virtual,
-                height: myScroll.y ? myScroll.y : 200,
+                height: height,
                 resetTopWhenDataChange: false,
             });
         }
@@ -737,7 +757,7 @@ function Table(props) {
             return null;
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [virtual]);
+    }, [virtual, virtualY]);
     var tableComponents = useMemo(function () {
         var _a, _b;
         var result = onMoveRow || onEditableSave

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "10.0.47",
+  "version": "10.0.49",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",