@aloudata/aloudata-design 0.4.0-beta.10 → 0.4.0-beta.12

package/lib/Table/Table.js

@@ -1,150 +1,116 @@
 "use strict";
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _classnames4 = _interopRequireDefault(require("classnames"));
-
+var _classnames3 = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
-
 var _usePrefixCls = _interopRequireDefault(require("../_utils/hooks/usePrefixCls"));
-
 var _rcResizeObserver = _interopRequireDefault(require("rc-resize-observer"));
-
 var _reactTable = require("react-table");
-
 var _utils = require("./utils");
-
 require("./style/index");
-
 var _message = _interopRequireDefault(require("../message"));
-
 var _Loading = _interopRequireDefault(require("./components/Loading"));
-
 var _Empty = _interopRequireDefault(require("./components/Empty"));
-
 var _TableHead = _interopRequireDefault(require("./components/TableHead"));
-
 var _TableBodyRowList = _interopRequireDefault(require("./components/TableBodyRowList"));
-
-var _useFrame = require("./hooks/useFrame");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 var tableHeadRowHeight = 44;
-var SCROLLBAR_SIZE = 15;
 var ZERO = 0;
-
 function Table(props, ref) {
-  var _classnames3;
-
-  var tableKey = props.key,
-      columns = props.columns,
-      data = props.data,
-      onRowSelected = props.onRowSelected,
-      loadMore = props.loadMore,
-      loading = props.loading,
-      hasNextPage = props.hasNextPage,
-      _props$sortable = props.sortable,
-      sortable = _props$sortable === void 0 ? false : _props$sortable,
-      defaultSort = props.defaultSort,
-      _props$resizeColumn = props.resizeColumn,
-      resizeColumn = _props$resizeColumn === void 0 ? false : _props$resizeColumn,
-      allSortDirections = props.sortDirections,
-      _props$onChange = props.onChange,
-      onChange = _props$onChange === void 0 ? function () {} : _props$onChange,
-      _props$scrollThreshol = props.scrollThreshold,
-      scrollThreshold = _props$scrollThreshol === void 0 ? '150px' : _props$scrollThreshol,
-      _props$rowClassName = props.rowClassName,
-      rowClassName = _props$rowClassName === void 0 ? '' : _props$rowClassName,
-      _props$ellipsis = props.ellipsis,
-      ellipsis = _props$ellipsis === void 0 ? true : _props$ellipsis,
-      rowKey = props.rowKey,
-      height = props.height;
-
+  var _classnames2;
+  var outerKey = props.key,
+    columns = props.columns,
+    data = props.data,
+    onRowSelected = props.onRowSelected,
+    loadMore = props.loadMore,
+    loading = props.loading,
+    hasNextPage = props.hasNextPage,
+    _props$sortable = props.sortable,
+    sortable = _props$sortable === void 0 ? false : _props$sortable,
+    defaultSort = props.defaultSort,
+    _props$resizeColumn = props.resizeColumn,
+    resizeColumn = _props$resizeColumn === void 0 ? false : _props$resizeColumn,
+    allSortDirections = props.sortDirections,
+    _props$onChange = props.onChange,
+    onChange = _props$onChange === void 0 ? function () {} : _props$onChange,
+    _props$scrollThreshol = props.scrollThreshold,
+    scrollThreshold = _props$scrollThreshol === void 0 ? '150px' : _props$scrollThreshol,
+    _props$rowClassName = props.rowClassName,
+    rowClassName = _props$rowClassName === void 0 ? '' : _props$rowClassName,
+    _props$ellipsis = props.ellipsis,
+    ellipsis = _props$ellipsis === void 0 ? true : _props$ellipsis,
+    rowKey = props.rowKey,
+    height = props.height;
   var _useState = (0, _react.useState)(undefined),
-      _useState2 = _slicedToArray(_useState, 2),
-      tableClientWidth = _useState2[0],
-      setTableClientWidth = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    tableClientWidth = _useState2[0],
+    setTableClientWidth = _useState2[1];
   var _useState3 = (0, _react.useState)(undefined),
-      _useState4 = _slicedToArray(_useState3, 2),
-      tableClientHeight = _useState4[0],
-      setTableClientHeight = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    tableClientHeight = _useState4[0],
+    setTableClientHeight = _useState4[1];
   var prefixCls = (0, _usePrefixCls.default)('', 'ald-table');
   var tableRef = (0, _react.useRef)(null);
-  var tableHeadRef = (0, _react.useRef)(null);
   var tableBodyRef = (0, _react.useRef)(null);
   var columnsWidthMapRef = (0, _react.useRef)();
   var columnsTotalWidthRef = (0, _react.useRef)(ZERO);
-
   var _useState5 = (0, _react.useState)(false),
-      _useState6 = _slicedToArray(_useState5, 2),
-      loadMoreLoading = _useState6[0],
-      setLoadMoreLoading = _useState6[1];
-
-  var lastOffsetLeftRef = (0, _react.useRef)(ZERO);
+    _useState6 = _slicedToArray(_useState5, 2),
+    loadMoreLoading = _useState6[0],
+    setLoadMoreLoading = _useState6[1];
   var lastOffsetTopRef = (0, _react.useRef)(ZERO);
-
-  var _useTimeoutLock = (0, _useFrame.useTimeoutLock)(),
-      _useTimeoutLock2 = _slicedToArray(_useTimeoutLock, 2),
-      setScrollTarget = _useTimeoutLock2[0],
-      getScrollTarget = _useTimeoutLock2[1]; // 初始化进入时 渲染表格容器宽度
-
-
+  var _useState7 = (0, _react.useState)(ZERO),
+    _useState8 = _slicedToArray(_useState7, 2),
+    tableBodyContentHeight = _useState8[0],
+    setTableBodyContentHeight = _useState8[1];
+  // 如果列长度存在变化时，触发重新计算页面的宽度，否则需要用户手动更改key
+  var tableKey = (0, _react.useMemo)(function () {
+    var columnLength = (columns === null || columns === void 0 ? void 0 : columns.length) || ZERO;
+    if (outerKey) {
+      return "".concat(outerKey, "-").concat(columnLength);
+    }
+    return "".concat(columnLength);
+  }, [columns === null || columns === void 0 ? void 0 : columns.length, outerKey]);
+  // 初始化进入时 渲染表格容器宽度
   (0, _react.useEffect)(function () {
     if (tableRef.current) {
       setTableClientWidth(tableRef.current.clientWidth);
     }
-  }, []); // 转换外部传入的columns
-
+  }, []);
+  // 转换外部传入的columns
   var newColumns = (0, _react.useMemo)(function () {
     if (!tableClientWidth) {
       return [];
     }
-
     var _getColumnsWidthMap = (0, _utils.getColumnsWidthMap)(columns, tableClientWidth, columnsWidthMapRef.current),
-        columnsWidthMap = _getColumnsWidthMap.columnsWidthMap,
-        totalColumnWidth = _getColumnsWidthMap.totalColumnWidth;
-
+      columnsWidthMap = _getColumnsWidthMap.columnsWidthMap,
+      totalColumnWidth = _getColumnsWidthMap.totalColumnWidth;
     columnsWidthMapRef.current = columnsWidthMap;
     columnsTotalWidthRef.current = totalColumnWidth;
     return columns.map(function (column, index) {
       var _columnsWidthMapRef$c, _columnsWidthMapRef$c2;
-
-      var key = index.toString(); // 不设置dataIndex同时进行排序 则报错
-
+      var key = index.toString();
+      // 不设置dataIndex同时进行排序 则报错
       if (column.dataIndex === undefined && sortable) {
         _message.default.error('不支持未设置dataIndex时进行排序设置');
       }
-
       return _objectSpread(_objectSpread({}, column), {}, {
         width: (_columnsWidthMapRef$c = columnsWidthMapRef.current) === null || _columnsWidthMapRef$c === void 0 ? void 0 : (_columnsWidthMapRef$c2 = _columnsWidthMapRef$c.get(key)) === null || _columnsWidthMapRef$c2 === void 0 ? void 0 : _columnsWidthMapRef$c2.width,
         Header: column.title ? column.title : function () {
@@ -154,25 +120,23 @@ function Table(props, ref) {
         accessor: column.dataIndex,
         Cell: function Cell(_ref) {
           var row = _ref.row,
-              value = _ref.value;
+            value = _ref.value;
           return typeof column.render === 'function' ? column.render(value, row.original, row.index) : value;
         }
       });
     });
-  }, [columns, sortable, tableClientWidth]); // 将rowId转为React Table支持的值
+  }, [columns, sortable, tableClientWidth]);
+  // 将rowId转为React Table支持的值
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
   var transformRowId = function transformRowId(row, relativeIndex, parent) {
     if (rowKey && parent) {
       if (typeof rowKey === 'string') {
         return [rowKey, relativeIndex].join('.');
       }
-
       if (typeof rowKey === 'function') {
         return [rowKey(row), relativeIndex].join('.');
       }
     }
-
     return relativeIndex.toString();
   };
   /**
@@ -182,56 +146,45 @@ function Table(props, ref) {
    * 3. 如果给了排序但没有默认，则按第一行排序
    * @returns
    */
-
-
   var getTableInitSort = function getTableInitSort() {
     var EMPTY_SIZE = 0;
-
     if (!sortable || loadMore || newColumns.length === EMPTY_SIZE) {
       return [];
     }
-
     if (defaultSort && defaultSort.id) {
       return [defaultSort];
     }
-
     var firstColumnSortData = {
       id: newColumns[ZERO].accessor,
       desc: !!(newColumns[ZERO].sortOrder && newColumns[ZERO].sortOrder === 'descend')
     };
-
     if (firstColumnSortData.id) {
       return [firstColumnSortData];
     }
-
     return [];
   };
-
   var _useTable = (0, _reactTable.useTable)({
-    columns: newColumns,
-    data: data,
-    disableMultiSort: true,
-    disableSortBy: !sortable,
-    getRowId: transformRowId,
-    initialState: {
-      sortBy: getTableInitSort()
-    }
-  }, _reactTable.useBlockLayout, _reactTable.useSortBy, _reactTable.useRowSelect, _reactTable.useResizeColumns),
-      getTableProps = _useTable.getTableProps,
-      getTableBodyProps = _useTable.getTableBodyProps,
-      headerGroups = _useTable.headerGroups,
-      rows = _useTable.rows,
-      prepareRow = _useTable.prepareRow,
-      setSortBy = _useTable.setSortBy;
-
+      columns: newColumns,
+      data: data,
+      disableMultiSort: true,
+      disableSortBy: !sortable,
+      getRowId: transformRowId,
+      initialState: {
+        sortBy: getTableInitSort()
+      }
+    }, _reactTable.useBlockLayout, _reactTable.useSortBy, _reactTable.useRowSelect, _reactTable.useResizeColumns),
+    getTableProps = _useTable.getTableProps,
+    getTableBodyProps = _useTable.getTableBodyProps,
+    headerGroups = _useTable.headerGroups,
+    rows = _useTable.rows,
+    prepareRow = _useTable.prepareRow,
+    setSortBy = _useTable.setSortBy;
   var scrollToTop = function scrollToTop() {
     var INITIAL_OFFSET_TOP = 0;
-
     if (tableBodyRef && tableBodyRef.current) {
       tableBodyRef.current.scrollTop = INITIAL_OFFSET_TOP;
     }
   };
-
   _react.default.useImperativeHandle(ref, function () {
     return {
       backToTop: function backToTop() {
@@ -239,11 +192,9 @@ function Table(props, ref) {
       }
     };
   });
-
   var tableHeadNode = /*#__PURE__*/_react.default.createElement(_TableHead.default, {
     canResizeColumn: resizeColumn,
     headerGroups: headerGroups,
-    // tableContentWidth={columnsTotalWidthRef.current}
     defaultSort: defaultSort,
     sortable: sortable,
     columns: newColumns,
@@ -253,7 +204,6 @@ function Table(props, ref) {
     columnsWidthMapRef: columnsWidthMapRef,
     columnsTotalWidthRef: columnsTotalWidthRef
   });
-
   var tableRowListNode = /*#__PURE__*/_react.default.createElement(_TableBodyRowList.default, {
     data: data,
     rows: rows,
@@ -262,139 +212,92 @@ function Table(props, ref) {
     rowClassName: rowClassName,
     ellipsis: ellipsis,
     onRowSelected: onRowSelected
-  }); // 渲染没有设置高度的表格
-
-
+  });
+  // 渲染没有设置高度的表格
   var renderTableWithoutHeight = function renderTableWithoutHeight() {
     var renderNoHeightTableBody = function renderNoHeightTableBody() {
       if (loading && !rows.length) {
         return /*#__PURE__*/_react.default.createElement(_Loading.default, null);
       }
-
       if (!loading && !rows.length) {
         return /*#__PURE__*/_react.default.createElement(_Empty.default, null);
       }
-
       return /*#__PURE__*/_react.default.createElement("div", {
         className: "".concat(prefixCls, "-list")
       }, tableRowListNode);
     };
-
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _classnames4.default)("".concat(prefixCls, "-inner-wrap"))
-    }, tableHeadNode, /*#__PURE__*/_react.default.createElement("div", Object.assign({}, getTableBodyProps(), {
-      className: (0, _classnames4.default)("".concat(prefixCls, "-tbody")),
+      className: (0, _classnames3.default)("".concat(prefixCls, "-inner-wrap"))
+    }, tableHeadNode, /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, getTableBodyProps()), {}, {
+      className: (0, _classnames3.default)("".concat(prefixCls, "-tbody")),
       style: {
         width: columnsTotalWidthRef.current
       }
     }), renderNoHeightTableBody()));
   };
-
-  var forceScroll = (0, _react.useCallback)(function (scrollLeftNum, target) {
-    if (!target) {
+  // 存在高度时，内部的纵向的滚动
+  var onBodyVerticalScroll = (0, _react.useCallback)(function (e) {
+    if (!tableClientHeight) {
       return;
     }
-
-    if (typeof target === 'function') {
-      target(scrollLeftNum);
-    } else if (target.scrollLeft !== scrollLeftNum) {
-      // eslint-disable-next-line no-param-reassign
-      target.scrollLeft = scrollLeftNum;
-    }
-  }, []); // 内部滚动时 纵向的滚动
-
-  var onBodyVerticalScroll = (0, _react.useCallback)(function (target) {
-    if (!tableClientHeight) {
+    var _e$target = e.target,
+      scrollHeight = _e$target.scrollHeight,
+      clientHeight = _e$target.clientHeight,
+      currentTargetScrollTop = _e$target.scrollTop;
+    // 说明是横向滚动
+    if (lastOffsetTopRef.current === currentTargetScrollTop) {
       return;
     }
-
-    var scrollHeight = target.scrollHeight,
-        clientHeight = target.clientHeight,
-        scrollTop = target.scrollTop;
-    var currentPosToBottomGap = scrollHeight - clientHeight - scrollTop; // 当前滚动条到底部的距离
-
+    var currentPosToBottomGap = scrollHeight - clientHeight - currentTargetScrollTop + tableHeadRowHeight; // 当前滚动条到底部的距离
     var scrollThresholdValue = (0, _utils.getValidScrollThreshold)(scrollThreshold, tableClientHeight);
-
     if (currentPosToBottomGap < scrollThresholdValue && hasNextPage && !loadMoreLoading) {
       var _loadMore;
-
       setLoadMoreLoading(true);
       (_loadMore = loadMore()) === null || _loadMore === void 0 ? void 0 : _loadMore.then(function () {
         setLoadMoreLoading(false);
       });
     }
-
-    lastOffsetTopRef.current = scrollTop;
-  }, [hasNextPage, loadMore, loadMoreLoading, scrollThreshold, tableClientHeight]); // 内部滚动 对于滚动的处理
-
-  var onBodyScroll = (0, _react.useCallback)(function (e) {
-    var currentTarget = e.target;
-
-    if (!currentTarget) {
-      return;
-    }
-
-    var scrollLeftNum = currentTarget.scrollLeft;
-    var scrollTopNum = currentTarget.scrollTop; // 纵向滚动
-
-    if (scrollTopNum !== lastOffsetLeftRef.current) {
-      onBodyVerticalScroll(currentTarget);
-    }
-
-    if (scrollLeftNum === lastOffsetLeftRef.current) {
-      return;
-    }
-
-    var compareTarget = currentTarget; // 横向滚动
-
-    if (!getScrollTarget() || getScrollTarget() === compareTarget) {
-      setScrollTarget(compareTarget);
-      forceScroll(scrollLeftNum, tableBodyRef.current);
-      forceScroll(scrollLeftNum, tableHeadRef.current);
-      lastOffsetLeftRef.current = scrollLeftNum;
-    }
-  }, [forceScroll, getScrollTarget, onBodyVerticalScroll, setScrollTarget]);
+    lastOffsetTopRef.current = currentTargetScrollTop;
+  }, [hasNextPage, loadMore, loadMoreLoading, scrollThreshold, tableClientHeight]);
   (0, _react.useEffect)(function () {
     if (!hasNextPage) {
       setLoadMoreLoading(false);
     }
-  }, [hasNextPage]); // 渲染有设置高度的表格
-
+  }, [hasNextPage]);
+  // 渲染有设置高度的表格
   var renderTableWithHeight = function renderTableWithHeight() {
     if (!tableClientWidth || !tableClientHeight) {
       return null;
     }
-
-    var renderNoHeightTableBody = function renderNoHeightTableBody() {
+    var renderTableBody = function renderTableBody() {
       if (loading && !rows.length) {
         return /*#__PURE__*/_react.default.createElement(_Loading.default, null);
       }
-
       if (!loading && !rows.length) {
         return /*#__PURE__*/_react.default.createElement(_Empty.default, null);
       }
-
-      return /*#__PURE__*/_react.default.createElement("div", {
-        style: {
-          overflow: 'overlay',
-          overflowX: tableClientWidth + SCROLLBAR_SIZE > columnsTotalWidthRef.current ? 'hidden' : 'unset',
-          height: tableClientHeight - tableHeadRowHeight
-        },
-        ref: tableBodyRef,
-        onScroll: onBodyScroll
-      }, tableRowListNode, loadMoreLoading && /*#__PURE__*/_react.default.createElement(_Loading.default, null));
+      return /*#__PURE__*/_react.default.createElement(_rcResizeObserver.default, {
+        onResize: function onResize(_ref2) {
+          var clientHeight = _ref2.height;
+          setTableBodyContentHeight(clientHeight);
+        }
+      }, /*#__PURE__*/_react.default.createElement("div", null, tableRowListNode, loadMoreLoading && /*#__PURE__*/_react.default.createElement(_Loading.default, null)));
     };
-
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _classnames4.default)("".concat(prefixCls, "-inner-wrap"), _defineProperty({}, "".concat(prefixCls, "-innerScroll"), !!height))
+      className: (0, _classnames3.default)("".concat(prefixCls, "-inner-wrap"), _defineProperty({}, "".concat(prefixCls, "-innerScroll"), !!height)),
+      ref: tableBodyRef,
+      onScroll: onBodyVerticalScroll
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      style: {
+        width: columnsTotalWidthRef.current,
+        height: tableBodyContentHeight
+      }
     }, /*#__PURE__*/_react.default.createElement("div", {
-      ref: tableHeadRef,
       className: "".concat(prefixCls, "-tableHeadScrollWrap")
-    }, tableHeadNode), /*#__PURE__*/_react.default.createElement("div", Object.assign({}, getTableBodyProps(), {
-      className: (0, _classnames4.default)("".concat(prefixCls, "-tbody"), _defineProperty({}, "".concat(prefixCls, "-tbody-innerScroll"), !!height))
-    }), renderNoHeightTableBody()));
+    }, tableHeadNode), /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, getTableBodyProps()), {}, {
+      className: (0, _classnames3.default)("".concat(prefixCls, "-tbody"))
+    }), renderTableBody())));
   };
-
   return /*#__PURE__*/_react.default.createElement("div", {
     key: tableKey,
     className: prefixCls,
@@ -403,17 +306,15 @@ function Table(props, ref) {
       height: !height ? 'unset' : height
     }
   }, /*#__PURE__*/_react.default.createElement(_rcResizeObserver.default, {
-    onResize: function onResize(_ref2) {
-      var clientWidth = _ref2.width,
-          clientHeight = _ref2.height;
+    onResize: function onResize(_ref3) {
+      var clientWidth = _ref3.width,
+        clientHeight = _ref3.height;
       setTableClientWidth(clientWidth);
       setTableClientHeight(clientHeight);
     }
-  }, !tableClientWidth ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null)) : /*#__PURE__*/_react.default.createElement("div", Object.assign({}, getTableProps(), {
-    className: (0, _classnames4.default)("".concat(prefixCls, "-table-wrap"), (_classnames3 = {}, _defineProperty(_classnames3, "".concat(prefixCls, "-init-loading"), data.length === ZERO && loading), _defineProperty(_classnames3, "".concat(prefixCls, "-empty"), data.length === ZERO && loading), _classnames3))
+  }, !tableClientWidth ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null)) : /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, getTableProps()), {}, {
+    className: (0, _classnames3.default)("".concat(prefixCls, "-table-wrap"), (_classnames2 = {}, _defineProperty(_classnames2, "".concat(prefixCls, "-init-loading"), data.length === ZERO && loading), _defineProperty(_classnames2, "".concat(prefixCls, "-empty"), data.length === ZERO && loading), _classnames2))
   }), height ? renderTableWithHeight() : renderTableWithoutHeight())));
 }
-
 var _default = /*#__PURE__*/_react.default.forwardRef(Table);
-
 exports.default = _default;

package/lib/Table/components/Empty/index.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _usePrefixCls = _interopRequireDefault(require("../../../_utils/hooks/usePrefixCls"));
-
 var _Empty = _interopRequireDefault(require("../../../Empty"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function LoadingNode() {
   var prefixCls = (0, _usePrefixCls.default)('', 'ald-table');
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -23,6 +18,5 @@ function LoadingNode() {
     image: _Empty.default.PRESENTED_IMAGE_SIMPLE
   }));
 }
-
 var _default = LoadingNode;
 exports.default = _default;

package/lib/Table/components/Loading/index.js

@@ -4,17 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 require("@aloudata/icons-react/styles/index.less");
-
 var _LoadingLine2 = _interopRequireDefault(require("@aloudata/icons-react/es/icons/LoadingLine"));
-
 var _react = _interopRequireDefault(require("react"));
-
 var _usePrefixCls = _interopRequireDefault(require("../../../_utils/hooks/usePrefixCls"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function LoadingNode() {
   var prefixCls = (0, _usePrefixCls.default)('', 'ald-table');
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -26,6 +20,5 @@ function LoadingNode() {
     className: "".concat(prefixCls, "-loading-icon")
   }), "Loading");
 }
-
 var _default = LoadingNode;
 exports.default = _default;