@hi-ui/table 4.1.0-beta.2 → 4.1.0-beta.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @hi-ui/table
 
+## 4.1.0-beta.3
+
+### Patch Changes
+
+- 优化大数据表格
+
 ## 4.1.0-beta.2
 
 ### Patch Changes

package/lib/cjs/TableBody.js

@@ -57,7 +57,7 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _useTableContext = context.useTableContext(),
       columns = _useTableContext.columns,
       leafColumns = _useTableContext.leafColumns,
-      measureRowElementRef = _useTableContext.measureRowElementRef,
+      setMeasureRowElement = _useTableContext.setMeasureRowElement,
       isExpandTreeRows = _useTableContext.isExpandTreeRows,
       transitionData = _useTableContext.transitionData,
       getColgroupProps = _useTableContext.getColgroupProps,
@@ -122,7 +122,9 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
         overflowX: canScroll ? 'scroll' : undefined
       }
     }, /*#__PURE__*/React__default["default"].createElement("div", {
-      ref: measureRowElementRef,
+      ref: function ref(domElement) {
+        setMeasureRowElement(domElement);
+      },
       style: {
         height: 1,
         background: 'transparent'
@@ -187,7 +189,11 @@ var TableBody = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     }, getColgroupProps(col, idx)));
   })), /*#__PURE__*/React__default["default"].createElement("tbody", null, typeAssertion.isArrayNonEmpty(transitionData) ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, transitionData.map(function (row, index) {
     return /*#__PURE__*/React__default["default"].createElement(TableRow.TableRow, Object.assign({
-      ref: index === 0 ? measureRowElementRef : null,
+      ref: function ref(dom) {
+        if (index === 0) {
+          setMeasureRowElement(dom);
+        }
+      },
       // key={depth + index}
       key: row.id,
       // @ts-ignore

package/lib/cjs/hooks/use-col-width.js

@@ -32,52 +32,62 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var useColWidth = function useColWidth(_ref) {
   var columns = _ref.columns,
       virtual = _ref.virtual;
-  var measureRowElementRef = React.useRef(null);
 
-  var _React$useState = React__default["default"].useState(function () {
+  var _React$useState = React__default["default"].useState(null),
+      measureRowElement = _React$useState[0],
+      setMeasureRowElement = _React$useState[1];
+
+  var _React$useState2 = React__default["default"].useState(function () {
     return index.getGroupItemWidth(columns);
   }),
-      colWidths = _React$useState[0],
-      setColWidths = _React$useState[1];
+      colWidths = _React$useState2[0],
+      setColWidths = _React$useState2[1];
 
-  console.error({
-    useColWidth: 1,
-    colWidths: colWidths
-  });
+  var getVirtualWidths = React.useCallback(function () {
+    if (!measureRowElement) {
+      return index.getGroupItemWidth(columns);
+    }
+    /** 虚拟滚动时，内容宽度不能用以前table自动渲染的方式获取，需要手动计算 */
+
+
+    var columnDefaultWidth = 200;
+    var containerWidth = measureRowElement.clientWidth;
+    var totalWidth = 0;
+    /** 虚拟滚动，需要根据collist的虚拟宽度来计算宽度 */
+
+    columns.forEach(function (columnItem) {
+      totalWidth += columnItem.width || columnDefaultWidth;
+    });
+
+    if (totalWidth < containerWidth) {
+      // 容器宽度大于设置的宽度总和时，col宽度等比分分配占满容器。
+      return columns.map(function (columnItem) {
+        return (columnItem.width || columnDefaultWidth) * containerWidth / totalWidth;
+      });
+    } else {
+      // 容器宽度小于设置的宽度总和时，col宽度等于设置/默认宽度。
+      return columns.map(function (columnItem) {
+        return columnItem.width || columnDefaultWidth;
+      });
+    }
+  }, [measureRowElement, columns]);
   useUpdateEffect.useUpdateEffect(function () {
-    setColWidths(index.getGroupItemWidth(columns));
-  }, [columns]);
+    if (virtual) {
+      // 虚拟滚动的计算需要根据容器来做分配，不能使用没有witdh默认设置为0的方式来做表格平均分配
+      setColWidths(getVirtualWidths());
+    } else {
+      setColWidths(index.getGroupItemWidth(columns));
+    }
+  }, [columns, getVirtualWidths, virtual]);
   /**
    * 根据实际内容区（table 的第一行）渲染，再次精确收集并设置每列宽度
    */
 
   React__default["default"].useEffect(function () {
-    var measureRowElement = measureRowElementRef.current;
-
     if (measureRowElement) {
       var _resizeObserver = new ResizeObserver(function () {
         if (virtual) {
-          /** 虚拟滚动时，内容宽度不能用以前table自动渲染的方式获取，需要手动计算 */
-          var columnDefaultWidth = 200;
-          var containerWidth = measureRowElement.clientWidth;
-          var totalWidth = 0;
-          /** 虚拟滚动，需要根据collist的虚拟宽度来计算宽度 */
-
-          columns.forEach(function (columnItem) {
-            totalWidth += columnItem.width || columnDefaultWidth;
-          });
-
-          if (totalWidth < containerWidth) {
-            // 容器宽度大于设置的宽度总和时，col宽度等比分分配占满容器。
-            setColWidths(columns.map(function (columnItem) {
-              return (columnItem.width || columnDefaultWidth) * containerWidth / totalWidth;
-            }));
-          } else {
-            // 容器宽度小于设置的宽度总和时，col宽度等于设置/默认宽度。
-            setColWidths(columns.map(function (columnItem) {
-              return columnItem.width || columnDefaultWidth;
-            }));
-          }
+          setColWidths(getVirtualWidths());
         } else {
           if (measureRowElement.childNodes) {
             var _realColumnsWidth = Array.from(measureRowElement.childNodes).map(function (node) {
@@ -96,12 +106,12 @@ var useColWidth = function useColWidth(_ref) {
       _resizeObserver.observe(measureRowElement);
     }
 
-    return function () {};
-  }, []);
+    return function () {}; // 测量元素在内容列为空时会是空，切换会使测量元素变化，导致后续的resize时间无法响应,此处测量元素变化时需要重新绑定
+  }, [measureRowElement, virtual]);
 
-  var _React$useState2 = React__default["default"].useState(null),
-      headerTableElement = _React$useState2[0],
-      setHeaderTableElement = _React$useState2[1];
+  var _React$useState3 = React__default["default"].useState(null),
+      headerTableElement = _React$useState3[0],
+      setHeaderTableElement = _React$useState3[1];
   /**
    *  控制列最小可调整宽度
    */
@@ -155,7 +165,8 @@ var useColWidth = function useColWidth(_ref) {
     };
   }, [colWidths]);
   return {
-    measureRowElementRef: measureRowElementRef,
+    measureRowElement: measureRowElement,
+    setMeasureRowElement: setMeasureRowElement,
     onColumnResizable: onColumnResizable,
     getColgroupProps: getColgroupProps,
     setHeaderTableElement: setHeaderTableElement,

package/lib/cjs/use-table.js

@@ -215,7 +215,7 @@ var useTable = function useTable(_a) {
     resizable: resizable,
     virtual: virtual
   }),
-      measureRowElementRef = _useColWidth.measureRowElementRef,
+      setMeasureRowElement = _useColWidth.setMeasureRowElement,
       getColgroupProps = _useColWidth.getColgroupProps,
       onColumnResizable = _useColWidth.onColumnResizable,
       colWidths = _useColWidth.colWidths; // ************************ 列冻结 ************************ //
@@ -565,7 +565,7 @@ var useTable = function useTable(_a) {
     // 行多选
     rowSelection: rowSelection,
     cacheData: cacheData,
-    measureRowElementRef: measureRowElementRef,
+    setMeasureRowElement: setMeasureRowElement,
     leafColumns: leafColumns,
     // ui
     // 有表头分组那么也要 bordered

package/lib/esm/TableBody.js

@@ -32,7 +32,7 @@ var TableBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var _useTableContext = useTableContext(),
       columns = _useTableContext.columns,
       leafColumns = _useTableContext.leafColumns,
-      measureRowElementRef = _useTableContext.measureRowElementRef,
+      setMeasureRowElement = _useTableContext.setMeasureRowElement,
       isExpandTreeRows = _useTableContext.isExpandTreeRows,
       transitionData = _useTableContext.transitionData,
       getColgroupProps = _useTableContext.getColgroupProps,
@@ -97,7 +97,9 @@ var TableBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
         overflowX: canScroll ? 'scroll' : undefined
       }
     }, /*#__PURE__*/React__default.createElement("div", {
-      ref: measureRowElementRef,
+      ref: function ref(domElement) {
+        setMeasureRowElement(domElement);
+      },
       style: {
         height: 1,
         background: 'transparent'
@@ -162,7 +164,11 @@ var TableBody = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }, getColgroupProps(col, idx)));
   })), /*#__PURE__*/React__default.createElement("tbody", null, isArrayNonEmpty(transitionData) ? /*#__PURE__*/React__default.createElement(React__default.Fragment, null, transitionData.map(function (row, index) {
     return /*#__PURE__*/React__default.createElement(TableRow, Object.assign({
-      ref: index === 0 ? measureRowElementRef : null,
+      ref: function ref(dom) {
+        if (index === 0) {
+          setMeasureRowElement(dom);
+        }
+      },
       // key={depth + index}
       key: row.id,
       // @ts-ignore

package/lib/esm/hooks/use-col-width.js

@@ -7,59 +7,69 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import React__default, { useRef } from 'react';
+import React__default, { useCallback } from 'react';
 import { getGroupItemWidth } from '../utils/index.js';
 import { useUpdateEffect } from '@hi-ui/use-update-effect';
 
 var useColWidth = function useColWidth(_ref) {
   var columns = _ref.columns,
       virtual = _ref.virtual;
-  var measureRowElementRef = useRef(null);
 
-  var _React$useState = React__default.useState(function () {
+  var _React$useState = React__default.useState(null),
+      measureRowElement = _React$useState[0],
+      setMeasureRowElement = _React$useState[1];
+
+  var _React$useState2 = React__default.useState(function () {
     return getGroupItemWidth(columns);
   }),
-      colWidths = _React$useState[0],
-      setColWidths = _React$useState[1];
+      colWidths = _React$useState2[0],
+      setColWidths = _React$useState2[1];
 
-  console.error({
-    useColWidth: 1,
-    colWidths: colWidths
-  });
+  var getVirtualWidths = useCallback(function () {
+    if (!measureRowElement) {
+      return getGroupItemWidth(columns);
+    }
+    /** 虚拟滚动时，内容宽度不能用以前table自动渲染的方式获取，需要手动计算 */
+
+
+    var columnDefaultWidth = 200;
+    var containerWidth = measureRowElement.clientWidth;
+    var totalWidth = 0;
+    /** 虚拟滚动，需要根据collist的虚拟宽度来计算宽度 */
+
+    columns.forEach(function (columnItem) {
+      totalWidth += columnItem.width || columnDefaultWidth;
+    });
+
+    if (totalWidth < containerWidth) {
+      // 容器宽度大于设置的宽度总和时，col宽度等比分分配占满容器。
+      return columns.map(function (columnItem) {
+        return (columnItem.width || columnDefaultWidth) * containerWidth / totalWidth;
+      });
+    } else {
+      // 容器宽度小于设置的宽度总和时，col宽度等于设置/默认宽度。
+      return columns.map(function (columnItem) {
+        return columnItem.width || columnDefaultWidth;
+      });
+    }
+  }, [measureRowElement, columns]);
   useUpdateEffect(function () {
-    setColWidths(getGroupItemWidth(columns));
-  }, [columns]);
+    if (virtual) {
+      // 虚拟滚动的计算需要根据容器来做分配，不能使用没有witdh默认设置为0的方式来做表格平均分配
+      setColWidths(getVirtualWidths());
+    } else {
+      setColWidths(getGroupItemWidth(columns));
+    }
+  }, [columns, getVirtualWidths, virtual]);
   /**
    * 根据实际内容区（table 的第一行）渲染，再次精确收集并设置每列宽度
    */
 
   React__default.useEffect(function () {
-    var measureRowElement = measureRowElementRef.current;
-
     if (measureRowElement) {
       var _resizeObserver = new ResizeObserver(function () {
         if (virtual) {
-          /** 虚拟滚动时，内容宽度不能用以前table自动渲染的方式获取，需要手动计算 */
-          var columnDefaultWidth = 200;
-          var containerWidth = measureRowElement.clientWidth;
-          var totalWidth = 0;
-          /** 虚拟滚动，需要根据collist的虚拟宽度来计算宽度 */
-
-          columns.forEach(function (columnItem) {
-            totalWidth += columnItem.width || columnDefaultWidth;
-          });
-
-          if (totalWidth < containerWidth) {
-            // 容器宽度大于设置的宽度总和时，col宽度等比分分配占满容器。
-            setColWidths(columns.map(function (columnItem) {
-              return (columnItem.width || columnDefaultWidth) * containerWidth / totalWidth;
-            }));
-          } else {
-            // 容器宽度小于设置的宽度总和时，col宽度等于设置/默认宽度。
-            setColWidths(columns.map(function (columnItem) {
-              return columnItem.width || columnDefaultWidth;
-            }));
-          }
+          setColWidths(getVirtualWidths());
         } else {
           if (measureRowElement.childNodes) {
             var _realColumnsWidth = Array.from(measureRowElement.childNodes).map(function (node) {
@@ -78,12 +88,12 @@ var useColWidth = function useColWidth(_ref) {
       _resizeObserver.observe(measureRowElement);
     }
 
-    return function () {};
-  }, []);
+    return function () {}; // 测量元素在内容列为空时会是空，切换会使测量元素变化，导致后续的resize时间无法响应,此处测量元素变化时需要重新绑定
+  }, [measureRowElement, virtual]);
 
-  var _React$useState2 = React__default.useState(null),
-      headerTableElement = _React$useState2[0],
-      setHeaderTableElement = _React$useState2[1];
+  var _React$useState3 = React__default.useState(null),
+      headerTableElement = _React$useState3[0],
+      setHeaderTableElement = _React$useState3[1];
   /**
    *  控制列最小可调整宽度
    */
@@ -137,7 +147,8 @@ var useColWidth = function useColWidth(_ref) {
     };
   }, [colWidths]);
   return {
-    measureRowElementRef: measureRowElementRef,
+    measureRowElement: measureRowElement,
+    setMeasureRowElement: setMeasureRowElement,
     onColumnResizable: onColumnResizable,
     getColgroupProps: getColgroupProps,
     setHeaderTableElement: setHeaderTableElement,

package/lib/esm/use-table.js

@@ -183,7 +183,7 @@ var useTable = function useTable(_a) {
     resizable: resizable,
     virtual: virtual
   }),
-      measureRowElementRef = _useColWidth.measureRowElementRef,
+      setMeasureRowElement = _useColWidth.setMeasureRowElement,
       getColgroupProps = _useColWidth.getColgroupProps,
       onColumnResizable = _useColWidth.onColumnResizable,
       colWidths = _useColWidth.colWidths; // ************************ 列冻结 ************************ //
@@ -533,7 +533,7 @@ var useTable = function useTable(_a) {
     // 行多选
     rowSelection: rowSelection,
     cacheData: cacheData,
-    measureRowElementRef: measureRowElementRef,
+    setMeasureRowElement: setMeasureRowElement,
     leafColumns: leafColumns,
     // ui
     // 有表头分组那么也要 bordered

package/lib/types/context.d.ts

@@ -69,7 +69,7 @@ export declare const TableProvider: import("react").Provider<(Omit<{
     flattedColumnsWithoutChildren: import("./types").FlattedTableColumnItemData[];
     rowSelection: import("./types").TableRowSelection | undefined;
     cacheData: object[];
-    measureRowElementRef: import("react").RefObject<HTMLTableRowElement>;
+    setMeasureRowElement: import("react").Dispatch<import("react").SetStateAction<Element | null>>;
     leafColumns: import("packages/utils/tree-utils/lib/types/types").BaseFlattedTreeNodeData<any, any>[];
     bordered: boolean;
     scrollHeaderElementRef: import("react").RefObject<HTMLTableElement>;
@@ -174,7 +174,7 @@ export declare const useTableContext: () => Omit<{
     flattedColumnsWithoutChildren: import("./types").FlattedTableColumnItemData[];
     rowSelection: import("./types").TableRowSelection | undefined;
     cacheData: object[];
-    measureRowElementRef: import("react").RefObject<HTMLTableRowElement>;
+    setMeasureRowElement: import("react").Dispatch<import("react").SetStateAction<Element | null>>;
     leafColumns: import("packages/utils/tree-utils/lib/types/types").BaseFlattedTreeNodeData<any, any>[];
     bordered: boolean;
     scrollHeaderElementRef: import("react").RefObject<HTMLTableElement>;

package/lib/types/hooks/use-col-width.d.ts

@@ -6,7 +6,8 @@ export declare const useColWidth: ({ resizable, data, columns, virtual, }: {
     columns: TableColumnItem[];
     virtual?: boolean | undefined;
 }) => {
-    measureRowElementRef: React.RefObject<HTMLTableRowElement>;
+    measureRowElement: Element | null;
+    setMeasureRowElement: React.Dispatch<React.SetStateAction<Element | null>>;
     onColumnResizable: (_: any, { size }: any, index: number) => void;
     getColgroupProps: (column: FlattedTableColumnItemData, index: number) => {
         style: {

package/lib/types/use-table.d.ts

@@ -85,7 +85,7 @@ export declare const useTable: ({ data, columns: columnsProp, defaultFixedToColu
     flattedColumnsWithoutChildren: FlattedTableColumnItemData[];
     rowSelection: TableRowSelection | undefined;
     cacheData: object[];
-    measureRowElementRef: React.RefObject<HTMLTableRowElement>;
+    setMeasureRowElement: React.Dispatch<React.SetStateAction<Element | null>>;
     leafColumns: import("packages/utils/tree-utils/lib/types/types").BaseFlattedTreeNodeData<any, any>[];
     bordered: boolean;
     scrollHeaderElementRef: React.RefObject<HTMLTableElement>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/table",
-  "version": "4.1.0-beta.2",
+  "version": "4.1.0-beta.3",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",