@aloudata/aloudata-design 0.2.0-beta.13 → 0.2.0-beta.14

package/es/Table/index.d.ts

@@ -1,4 +1,4 @@
-import { ReactElement } from 'react';
+import React from 'react';
 import { ITableProps } from './interface';
-declare function Table<T extends Record<string, unknown>>({ columns, data, total, renderHeaderLeft, renderHeaderRight, onRowSelected, loadMore, hasNextPage, loading, sortable, defaultSort, resizeColumn, sortDirections: allSortDirections, showHeader, onChange, }: ITableProps<T>): ReactElement;
-export default Table;
+declare const _default: React.ForwardRefExoticComponent<Pick<ITableProps<Record<string, unknown>>, "onChange" | "loading" | "data" | "columns" | "total" | "renderHeaderLeft" | "renderHeaderRight" | "onRowSelected" | "loadMore" | "hasNextPage" | "sortable" | "defaultSort" | "resizeColumn" | "sortDirections" | "showHeader" | "innerScroll"> & React.RefAttributes<unknown>>;
+export default _default;

package/es/Table/index.js

@@ -26,19 +26,17 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /// <reference types ='./react-table-config' />
 import _ from 'lodash';
 import classnames from 'classnames';
-import Empty from '../Empty';
 import Icon from '../Icon';
-import InfiniteLoader from 'react-window-infinite-loader';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import usePrefixCls from '../_utils/hooks/usePrefixCls';
-import { FixedSizeList } from 'react-window';
+import InfiniteScroll from 'react-infinite-scroll-component';
+import Empty from '../Empty';
 import { useTable, useBlockLayout, useRowSelect, useSortBy, useResizeColumns } from 'react-table';
-var DEFAULT_ROW_HEIGHT = 40;
 var ARRAY_FIRST_INDEX = 0;
 var DEFAULT_ROW_WIDTH = 0;
 var DEFAULT_BODY_HEIGHT = 0;
 
-function Table(_ref) {
+function Table(_ref, ref) {
   var columns = _ref.columns,
       data = _ref.data,
       total = _ref.total,
@@ -46,8 +44,8 @@ function Table(_ref) {
       renderHeaderRight = _ref.renderHeaderRight,
       onRowSelected = _ref.onRowSelected,
       loadMore = _ref.loadMore,
-      hasNextPage = _ref.hasNextPage,
       loading = _ref.loading,
+      hasNextPage = _ref.hasNextPage,
       _ref$sortable = _ref.sortable,
       sortable = _ref$sortable === void 0 ? false : _ref$sortable,
       defaultSort = _ref.defaultSort,
@@ -57,28 +55,64 @@ function Table(_ref) {
       _ref$showHeader = _ref.showHeader,
       showHeader = _ref$showHeader === void 0 ? true : _ref$showHeader,
       _ref$onChange = _ref.onChange,
-      onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
+      onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
+      _ref$innerScroll = _ref.innerScroll,
+      innerScroll = _ref$innerScroll === void 0 ? false : _ref$innerScroll;
 
   var _React$useState = React.useState(null),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       selectedRowId = _React$useState2[0],
       setSelectedRowId = _React$useState2[1];
 
-  var tableBodyRef = useRef(null);
+  var tableBodyListRef = useRef(null);
+  var tableRef = useRef(null);
 
   var _useState = useState(DEFAULT_BODY_HEIGHT),
       _useState2 = _slicedToArray(_useState, 2),
-      bodyClientHeight = _useState2[0],
-      setBodyClientHeight = _useState2[1];
+      tableClientWidth = _useState2[0],
+      setTableClientWidth = _useState2[1];
 
+  var RANDOM_ID = "INNER_SCROLL_ID_".concat(Math.random());
   useEffect(function () {
-    if (tableBodyRef.current) {
-      setBodyClientHeight(tableBodyRef.current.clientHeight);
+    if (tableRef.current) {
+      setTableClientWidth(tableRef.current.clientWidth);
     }
   }, []);
+  var initialColumnsWidthMap = useMemo(function () {
+    var map = new Map();
+
+    if (tableClientWidth !== DEFAULT_BODY_HEIGHT) {
+      var noGivenColumns = 0;
+      var givenColumnsTotalWidth = 0;
+      columns.forEach(function (column) {
+        if (column.width) {
+          map.set(column.dataIndex, column.width);
+          givenColumnsTotalWidth += column.width;
+        } else {
+          noGivenColumns += 1;
+        }
+      });
+      var averageWidth = (tableClientWidth - givenColumnsTotalWidth) / noGivenColumns;
+      return {
+        columnMap: map,
+        averageWidth: averageWidth
+      };
+    }
+
+    columns.forEach(function (column) {
+      if (column.width) {
+        map.set(column.dataIndex, column.width);
+      }
+    });
+    return {
+      columnMap: map,
+      averageWidth: DEFAULT_ROW_WIDTH
+    };
+  }, [columns, tableClientWidth]);
   var newColumns = useMemo(function () {
     return columns.map(function (column) {
       return _objectSpread(_objectSpread({}, column), {}, {
+        width: initialColumnsWidthMap.columnMap.get(column.dataIndex) || initialColumnsWidthMap.averageWidth,
         Header: column.title,
         disableSortBy: !sortable || typeof column.sorter === 'boolean',
         accessor: column.dataIndex,
@@ -89,7 +123,7 @@ function Table(_ref) {
         }
       });
     });
-  }, [columns, sortable]);
+  }, [columns, sortable, initialColumnsWidthMap]);
 
   var getInitialSortDirection = function getInitialSortDirection() {
     if (defaultSort && defaultSort.id) {
@@ -144,7 +178,8 @@ function Table(_ref) {
       headerGroups = _useTable.headerGroups,
       rows = _useTable.rows,
       prepareRow = _useTable.prepareRow,
-      setSortBy = _useTable.setSortBy;
+      setSortBy = _useTable.setSortBy,
+      totalColumnsWidth = _useTable.totalColumnsWidth;
 
   var theadRowWidthRef = React.useRef(DEFAULT_ROW_WIDTH);
   var prefixCls = usePrefixCls('block-table');
@@ -156,48 +191,6 @@ function Table(_ref) {
     setSelectedRowId(row.id);
     onRowSelected(row.original);
   }, [onRowSelected]);
-  var itemCount = hasNextPage ? data.length + 1 : data.length;
-  var loadMoreItems = loading ? function () {} : loadMore;
-
-  var isItemLoaded = function isItemLoaded(index) {
-    return !hasNextPage || index < data.length;
-  };
-
-  var RenderRow = function RenderRow(_ref3) {
-    var index = _ref3.index,
-        style = _ref3.style;
-
-    if (!isItemLoaded(index)) {
-      return /*#__PURE__*/React.createElement("div", {
-        style: style,
-        className: classnames("".concat(prefixCls, "-loading"))
-      }, /*#__PURE__*/React.createElement(Icon, {
-        type: "waiting",
-        size: 16
-      }), "Loading");
-    }
-
-    var row = rows[index];
-    prepareRow(row);
-
-    var _row$getRowProps = row.getRowProps(),
-        rowStyle = _row$getRowProps.style,
-        rowProps = _objectWithoutProperties(_row$getRowProps, _excluded);
-
-    return /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, rowProps), {}, {
-      style: _objectSpread(_objectSpread(_objectSpread({}, style), rowStyle), {}, {
-        width: resizeColumn ? style === null || style === void 0 ? void 0 : style.width : '100%'
-      }),
-      className: classnames("".concat(prefixCls, "-row"), _defineProperty({}, "".concat(prefixCls, "-row-selected"), row.id === selectedRowId)),
-      onClick: function onClick() {
-        return onRowClick(row);
-      }
-    }), row.cells.map(function (cell) {
-      return /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, cell.getCellProps()), {}, {
-        className: classnames("".concat(prefixCls, "-cell"))
-      }), cell.render('Cell'));
-    }));
-  };
 
   var renderHeader = function renderHeader(len) {
     return /*#__PURE__*/React.createElement("div", {
@@ -289,8 +282,8 @@ function Table(_ref) {
     return column.getHeaderProps();
   };
 
-  var SortIcons = function SortIcons(_ref4) {
-    var id = _ref4.id;
+  var SortIcons = function SortIcons(_ref3) {
+    var id = _ref3.id;
     var currentSortId = sortDirection.id,
         desc = sortDirection.desc;
 
@@ -309,45 +302,79 @@ function Table(_ref) {
     });
   };
 
+  var scrollToTop = function scrollToTop() {
+    var INITIAL_OFFSET_TOP = 0;
+
+    if (tableBodyListRef && tableBodyListRef.current) {
+      tableBodyListRef.current.scrollTop = INITIAL_OFFSET_TOP;
+    }
+  };
+
+  React.useImperativeHandle(ref, function () {
+    return {
+      backToTop: function backToTop() {
+        scrollToTop();
+      }
+    };
+  });
+  var LoadingNode = /*#__PURE__*/React.createElement("div", {
+    className: classnames("".concat(prefixCls, "-loading"))
+  }, /*#__PURE__*/React.createElement(Icon, {
+    type: "waiting",
+    size: 16
+  }), "Loading");
+
   var renderTableBody = function renderTableBody() {
+    if (loading && !rows.length) {
+      return LoadingNode;
+    }
+
     if (!loading && !rows.length) {
       return /*#__PURE__*/React.createElement(Empty, {
         description: "\u5F53\u524D\u65E0\u6570\u636E"
       });
     }
 
-    if (loadMore && typeof loadMore === 'function') {
-      return /*#__PURE__*/React.createElement(InfiniteLoader, {
-        isItemLoaded: isItemLoaded,
-        itemCount: itemCount,
-        loadMoreItems: loadMoreItems,
-        threshold: 3
-      }, function (_ref5) {
-        var onItemsRendered = _ref5.onItemsRendered,
-            ref = _ref5.ref;
-        return /*#__PURE__*/React.createElement(FixedSizeList, {
-          itemCount: itemCount,
-          onItemsRendered: onItemsRendered,
-          height: bodyClientHeight,
-          itemSize: DEFAULT_ROW_HEIGHT,
-          width: resizeColumn ? theadRowWidthRef.current : '100%',
-          ref: ref,
-          className: "".concat(prefixCls, "-list")
-        }, RenderRow);
+    var renderRowList = function renderRowList() {
+      return data.map(function (item, index) {
+        var row = rows[index];
+        prepareRow(row);
+
+        var _row$getRowProps = row.getRowProps(),
+            rowStyle = _row$getRowProps.style,
+            rowProps = _objectWithoutProperties(_row$getRowProps, _excluded);
+
+        return /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, rowProps), {}, {
+          style: _objectSpread({}, rowStyle),
+          className: classnames("".concat(prefixCls, "-row"), _defineProperty({}, "".concat(prefixCls, "-row-selected"), row.id === selectedRowId)),
+          onClick: function onClick() {
+            return onRowClick(row);
+          },
+          key: row.id
+        }), row.cells.map(function (cell) {
+          return /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, cell.getCellProps()), {}, {
+            className: classnames("".concat(prefixCls, "-cell"))
+          }), cell.render('Cell'));
+        }));
       });
-    }
+    };
 
-    return /*#__PURE__*/React.createElement(FixedSizeList, {
-      itemCount: itemCount,
-      height: bodyClientHeight,
-      itemSize: DEFAULT_ROW_HEIGHT,
-      width: resizeColumn ? theadRowWidthRef.current : '100%',
-      className: "".concat(prefixCls, "-list")
-    }, RenderRow);
+    return /*#__PURE__*/React.createElement("div", {
+      className: classnames("".concat(prefixCls, "-list"), _defineProperty({}, "".concat(prefixCls, "-innerScroll"), innerScroll)),
+      id: RANDOM_ID,
+      ref: tableBodyListRef
+    }, innerScroll && loadMore ? /*#__PURE__*/React.createElement(InfiniteScroll, {
+      dataLength: rows.length,
+      next: loadMore,
+      hasMore: !!hasNextPage,
+      loader: LoadingNode,
+      scrollableTarget: RANDOM_ID
+    }, renderRowList()) : renderRowList());
   };
 
   return /*#__PURE__*/React.createElement("div", {
-    className: prefixCls
+    className: prefixCls,
+    ref: tableRef
   }, showHeader && renderHeader(data.length), /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, getTableProps()), {}, {
     className: classnames("".concat(prefixCls, "-table-wrap"), _defineProperty({}, "".concat(prefixCls, "-column-resizable"), resizeColumn))
   }), /*#__PURE__*/React.createElement("div", {
@@ -365,21 +392,28 @@ function Table(_ref) {
       className: "".concat(prefixCls, "-row")
     }), headerGroup.headers.map(function (column) {
       var barPorps = resizeColumn ? column.getResizerProps() : {};
-      return /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({
-        // {...column.getHeaderProps(column.getSortByToggleProps())}
-        className: classnames(_defineProperty({}, "".concat(prefixCls, "-cell-sorting"), column.id === sortDirection.id), "".concat(prefixCls, "-cell"))
-      }, getHeaderProps(column)), {}, {
+      return /*#__PURE__*/React.createElement("div", {
+        className: classnames(_defineProperty({}, "".concat(prefixCls, "-cell-sorting"), column.id === sortDirection.id), "".concat(prefixCls, "-cell")),
+        style: getHeaderProps(column).style,
         key: column.id
-      }), column.render('Header'), /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, barPorps), {}, {
-        className: classnames(_defineProperty({}, "".concat(prefixCls, "-dragBar"), resizeColumn), "".concat(prefixCls, "-bar"))
-      })), /*#__PURE__*/React.createElement(SortIcons, {
+      }, /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({
+        className: "".concat(prefixCls, "-cell-content")
+      }, getHeaderProps(column)), {}, {
+        style: {
+          width: '100%'
+        }
+      }), column.render('Header'), /*#__PURE__*/React.createElement(SortIcons, {
         id: column.id
-      }));
+      })), /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, barPorps), {}, {
+        className: classnames(_defineProperty({}, "".concat(prefixCls, "-dragBar"), resizeColumn), "".concat(prefixCls, "-bar"))
+      })));
     }));
   })), /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, getTableBodyProps()), {}, {
-    className: classnames("".concat(prefixCls, "-tbody")),
-    ref: tableBodyRef
+    className: classnames("".concat(prefixCls, "-tbody"), _defineProperty({}, "".concat(prefixCls, "-innerScroll"), innerScroll)),
+    style: {
+      width: totalColumnsWidth
+    }
   }), renderTableBody())));
 }
 
-export default Table;
+export default /*#__PURE__*/React.forwardRef(Table);

package/es/Table/interface.d.ts

@@ -21,7 +21,7 @@ export interface ITableProps<T extends object> {
     data: T[];
     total?: number;
     onRowSelected?: (row: T) => void;
-    loadMore?: (startIndex: number, stopIndex: number) => void | Promise<void>;
+    loadMore?: () => void | Promise<void>;
     hasNextPage?: boolean;
     loading?: boolean;
     renderHeaderLeft?: () => React.ReactNode;
@@ -32,4 +32,6 @@ export interface ITableProps<T extends object> {
     sortDirections?: Array<'ascend' | 'descend'>;
     resizeColumn?: boolean;
     showHeader?: boolean;
+    innerScroll?: boolean;
+    ref?: React.RefObject<unknown>;
 }

package/es/Table/style/index.less

@@ -12,23 +12,33 @@
   overflow: hidden;
   user-select: none;
 
+  &-page-loading {
+    opacity: 0;
+  }
+
   &-table-wrap {
     display: flex;
     flex: 1;
     flex-direction: column;
+    overflow: hidden;
   }
 
   &-cell {
     flex-grow: 1;
-    height: @table-row-height;
-    padding: 0 12px;
-    overflow: hidden;
+    height: unset;
+    min-height: @table-row-height;
     color: @NL0;
     line-height: @table-row-height;
-    white-space: nowrap;
     text-align: left;
-    text-overflow: ellipsis;
     border-bottom: 1px solid @NL95;
+    word-break: break-all;
+    display: flex;
+    padding: 0 12px;
+    align-items: center;
+
+    &-content {
+      flex: 1;
+    }
   }
 
   &-row {
@@ -51,12 +61,19 @@
         right: 0;
         z-index: 1;
         display: inline-block;
-        width: 1px;
+        width: 12px;
         height: 12px;
-        background: blue;
-        background-color: @NL95;
         transform: translateY(-50%);
         touch-action: none;
+        padding-left: 5px;
+
+        &::after {
+          display: block;
+          height: 100%;
+          width: 1px;
+          content: '';
+          background-color: @NL95;
+        }
       }
 
       &:last-child {
@@ -73,6 +90,8 @@
 
     .ant-empty {
       padding-top: 80px;
+      display: flex;
+      justify-content: center;
     }
 
     .ant-block-table-row {
@@ -125,9 +144,18 @@
     }
   }
 
-  &-list {
+  /* stylelint-disable-next-line selector-class-pattern */
+  &-list&-innerScroll {
+    height: 100%;
     overflow: overlay !important;
+  }
+
+  // 当出现多行的时候 会顶出一个滚动条 通过复写三方库的样式覆盖
+  &-list&-canNotInnerScroll {
+    overflow: hidden !important;
+  }
 
+  &-list {
     &::-webkit-scrollbar-thumb {
       background: @NL90;
       background-clip: padding-box;

package/lib/Table/index.d.ts

@@ -1,4 +1,4 @@
-import { ReactElement } from 'react';
+import React from 'react';
 import { ITableProps } from './interface';
-declare function Table<T extends Record<string, unknown>>({ columns, data, total, renderHeaderLeft, renderHeaderRight, onRowSelected, loadMore, hasNextPage, loading, sortable, defaultSort, resizeColumn, sortDirections: allSortDirections, showHeader, onChange, }: ITableProps<T>): ReactElement;
-export default Table;
+declare const _default: React.ForwardRefExoticComponent<Pick<ITableProps<Record<string, unknown>>, "onChange" | "loading" | "data" | "columns" | "total" | "renderHeaderLeft" | "renderHeaderRight" | "onRowSelected" | "loadMore" | "hasNextPage" | "sortable" | "defaultSort" | "resizeColumn" | "sortDirections" | "showHeader" | "innerScroll"> & React.RefAttributes<unknown>>;
+export default _default;

package/lib/Table/index.js

@@ -9,19 +9,17 @@ exports.default = void 0;
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _classnames5 = _interopRequireDefault(require("classnames"));
-
-var _Empty = _interopRequireDefault(require("../Empty"));
+var _classnames7 = _interopRequireDefault(require("classnames"));
 
 var _Icon = _interopRequireDefault(require("../Icon"));
 
-var _reactWindowInfiniteLoader = _interopRequireDefault(require("react-window-infinite-loader"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _usePrefixCls = _interopRequireDefault(require("../_utils/hooks/usePrefixCls"));
 
-var _reactWindow = require("react-window");
+var _reactInfiniteScrollComponent = _interopRequireDefault(require("react-infinite-scroll-component"));
+
+var _Empty = _interopRequireDefault(require("../Empty"));
 
 var _reactTable = require("react-table");
 
@@ -56,12 +54,11 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var DEFAULT_ROW_HEIGHT = 40;
 var ARRAY_FIRST_INDEX = 0;
 var DEFAULT_ROW_WIDTH = 0;
 var DEFAULT_BODY_HEIGHT = 0;
 
-function Table(_ref) {
+function Table(_ref, ref) {
   var columns = _ref.columns,
       data = _ref.data,
       total = _ref.total,
@@ -69,8 +66,8 @@ function Table(_ref) {
       renderHeaderRight = _ref.renderHeaderRight,
       onRowSelected = _ref.onRowSelected,
       loadMore = _ref.loadMore,
-      hasNextPage = _ref.hasNextPage,
       loading = _ref.loading,
+      hasNextPage = _ref.hasNextPage,
       _ref$sortable = _ref.sortable,
       sortable = _ref$sortable === void 0 ? false : _ref$sortable,
       defaultSort = _ref.defaultSort,
@@ -80,28 +77,64 @@ function Table(_ref) {
       _ref$showHeader = _ref.showHeader,
       showHeader = _ref$showHeader === void 0 ? true : _ref$showHeader,
       _ref$onChange = _ref.onChange,
-      onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
+      onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
+      _ref$innerScroll = _ref.innerScroll,
+      innerScroll = _ref$innerScroll === void 0 ? false : _ref$innerScroll;
 
   var _React$useState = _react.default.useState(null),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       selectedRowId = _React$useState2[0],
       setSelectedRowId = _React$useState2[1];
 
-  var tableBodyRef = (0, _react.useRef)(null);
+  var tableBodyListRef = (0, _react.useRef)(null);
+  var tableRef = (0, _react.useRef)(null);
 
   var _useState = (0, _react.useState)(DEFAULT_BODY_HEIGHT),
       _useState2 = _slicedToArray(_useState, 2),
-      bodyClientHeight = _useState2[0],
-      setBodyClientHeight = _useState2[1];
+      tableClientWidth = _useState2[0],
+      setTableClientWidth = _useState2[1];
 
+  var RANDOM_ID = "INNER_SCROLL_ID_".concat(Math.random());
   (0, _react.useEffect)(function () {
-    if (tableBodyRef.current) {
-      setBodyClientHeight(tableBodyRef.current.clientHeight);
+    if (tableRef.current) {
+      setTableClientWidth(tableRef.current.clientWidth);
     }
   }, []);
+  var initialColumnsWidthMap = (0, _react.useMemo)(function () {
+    var map = new Map();
+
+    if (tableClientWidth !== DEFAULT_BODY_HEIGHT) {
+      var noGivenColumns = 0;
+      var givenColumnsTotalWidth = 0;
+      columns.forEach(function (column) {
+        if (column.width) {
+          map.set(column.dataIndex, column.width);
+          givenColumnsTotalWidth += column.width;
+        } else {
+          noGivenColumns += 1;
+        }
+      });
+      var averageWidth = (tableClientWidth - givenColumnsTotalWidth) / noGivenColumns;
+      return {
+        columnMap: map,
+        averageWidth: averageWidth
+      };
+    }
+
+    columns.forEach(function (column) {
+      if (column.width) {
+        map.set(column.dataIndex, column.width);
+      }
+    });
+    return {
+      columnMap: map,
+      averageWidth: DEFAULT_ROW_WIDTH
+    };
+  }, [columns, tableClientWidth]);
   var newColumns = (0, _react.useMemo)(function () {
     return columns.map(function (column) {
       return _objectSpread(_objectSpread({}, column), {}, {
+        width: initialColumnsWidthMap.columnMap.get(column.dataIndex) || initialColumnsWidthMap.averageWidth,
         Header: column.title,
         disableSortBy: !sortable || typeof column.sorter === 'boolean',
         accessor: column.dataIndex,
@@ -112,7 +145,7 @@ function Table(_ref) {
         }
       });
     });
-  }, [columns, sortable]);
+  }, [columns, sortable, initialColumnsWidthMap]);
 
   var getInitialSortDirection = function getInitialSortDirection() {
     if (defaultSort && defaultSort.id) {
@@ -167,7 +200,8 @@ function Table(_ref) {
       headerGroups = _useTable.headerGroups,
       rows = _useTable.rows,
       prepareRow = _useTable.prepareRow,
-      setSortBy = _useTable.setSortBy;
+      setSortBy = _useTable.setSortBy,
+      totalColumnsWidth = _useTable.totalColumnsWidth;
 
   var theadRowWidthRef = _react.default.useRef(DEFAULT_ROW_WIDTH);
 
@@ -180,56 +214,14 @@ function Table(_ref) {
     setSelectedRowId(row.id);
     onRowSelected(row.original);
   }, [onRowSelected]);
-  var itemCount = hasNextPage ? data.length + 1 : data.length;
-  var loadMoreItems = loading ? function () {} : loadMore;
-
-  var isItemLoaded = function isItemLoaded(index) {
-    return !hasNextPage || index < data.length;
-  };
-
-  var RenderRow = function RenderRow(_ref3) {
-    var index = _ref3.index,
-        style = _ref3.style;
-
-    if (!isItemLoaded(index)) {
-      return /*#__PURE__*/_react.default.createElement("div", {
-        style: style,
-        className: (0, _classnames5.default)("".concat(prefixCls, "-loading"))
-      }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
-        type: "waiting",
-        size: 16
-      }), "Loading");
-    }
-
-    var row = rows[index];
-    prepareRow(row);
-
-    var _row$getRowProps = row.getRowProps(),
-        rowStyle = _row$getRowProps.style,
-        rowProps = _objectWithoutProperties(_row$getRowProps, _excluded);
-
-    return /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, rowProps), {}, {
-      style: _objectSpread(_objectSpread(_objectSpread({}, style), rowStyle), {}, {
-        width: resizeColumn ? style === null || style === void 0 ? void 0 : style.width : '100%'
-      }),
-      className: (0, _classnames5.default)("".concat(prefixCls, "-row"), _defineProperty({}, "".concat(prefixCls, "-row-selected"), row.id === selectedRowId)),
-      onClick: function onClick() {
-        return onRowClick(row);
-      }
-    }), row.cells.map(function (cell) {
-      return /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, cell.getCellProps()), {}, {
-        className: (0, _classnames5.default)("".concat(prefixCls, "-cell"))
-      }), cell.render('Cell'));
-    }));
-  };
 
   var renderHeader = function renderHeader(len) {
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _classnames5.default)("".concat(prefixCls, "-header"))
+      className: (0, _classnames7.default)("".concat(prefixCls, "-header"))
     }, renderHeaderLeft ? renderHeaderLeft() : /*#__PURE__*/_react.default.createElement("span", {
-      className: (0, _classnames5.default)("".concat(prefixCls, "-header-left"))
+      className: (0, _classnames7.default)("".concat(prefixCls, "-header-left"))
     }, "\u5171\u8BA1", total || len, "\u6761"), /*#__PURE__*/_react.default.createElement("div", {
-      className: (0, _classnames5.default)("".concat(prefixCls, "-header-right"))
+      className: (0, _classnames7.default)("".concat(prefixCls, "-header-right"))
     }, renderHeaderRight ? renderHeaderRight() : null));
   };
 
@@ -313,8 +305,8 @@ function Table(_ref) {
     return column.getHeaderProps();
   };
 
-  var SortIcons = function SortIcons(_ref4) {
-    var id = _ref4.id;
+  var SortIcons = function SortIcons(_ref3) {
+    var id = _ref3.id;
     var currentSortId = sortDirection.id,
         desc = sortDirection.desc;
 
@@ -333,47 +325,82 @@ function Table(_ref) {
     });
   };
 
+  var scrollToTop = function scrollToTop() {
+    var INITIAL_OFFSET_TOP = 0;
+
+    if (tableBodyListRef && tableBodyListRef.current) {
+      tableBodyListRef.current.scrollTop = INITIAL_OFFSET_TOP;
+    }
+  };
+
+  _react.default.useImperativeHandle(ref, function () {
+    return {
+      backToTop: function backToTop() {
+        scrollToTop();
+      }
+    };
+  });
+
+  var LoadingNode = /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames7.default)("".concat(prefixCls, "-loading"))
+  }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
+    type: "waiting",
+    size: 16
+  }), "Loading");
+
   var renderTableBody = function renderTableBody() {
+    if (loading && !rows.length) {
+      return LoadingNode;
+    }
+
     if (!loading && !rows.length) {
       return /*#__PURE__*/_react.default.createElement(_Empty.default, {
         description: "\u5F53\u524D\u65E0\u6570\u636E"
       });
     }
 
-    if (loadMore && typeof loadMore === 'function') {
-      return /*#__PURE__*/_react.default.createElement(_reactWindowInfiniteLoader.default, {
-        isItemLoaded: isItemLoaded,
-        itemCount: itemCount,
-        loadMoreItems: loadMoreItems,
-        threshold: 3
-      }, function (_ref5) {
-        var onItemsRendered = _ref5.onItemsRendered,
-            ref = _ref5.ref;
-        return /*#__PURE__*/_react.default.createElement(_reactWindow.FixedSizeList, {
-          itemCount: itemCount,
-          onItemsRendered: onItemsRendered,
-          height: bodyClientHeight,
-          itemSize: DEFAULT_ROW_HEIGHT,
-          width: resizeColumn ? theadRowWidthRef.current : '100%',
-          ref: ref,
-          className: "".concat(prefixCls, "-list")
-        }, RenderRow);
+    var renderRowList = function renderRowList() {
+      return data.map(function (item, index) {
+        var row = rows[index];
+        prepareRow(row);
+
+        var _row$getRowProps = row.getRowProps(),
+            rowStyle = _row$getRowProps.style,
+            rowProps = _objectWithoutProperties(_row$getRowProps, _excluded);
+
+        return /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, rowProps), {}, {
+          style: _objectSpread({}, rowStyle),
+          className: (0, _classnames7.default)("".concat(prefixCls, "-row"), _defineProperty({}, "".concat(prefixCls, "-row-selected"), row.id === selectedRowId)),
+          onClick: function onClick() {
+            return onRowClick(row);
+          },
+          key: row.id
+        }), row.cells.map(function (cell) {
+          return /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, cell.getCellProps()), {}, {
+            className: (0, _classnames7.default)("".concat(prefixCls, "-cell"))
+          }), cell.render('Cell'));
+        }));
       });
-    }
+    };
 
-    return /*#__PURE__*/_react.default.createElement(_reactWindow.FixedSizeList, {
-      itemCount: itemCount,
-      height: bodyClientHeight,
-      itemSize: DEFAULT_ROW_HEIGHT,
-      width: resizeColumn ? theadRowWidthRef.current : '100%',
-      className: "".concat(prefixCls, "-list")
-    }, RenderRow);
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames7.default)("".concat(prefixCls, "-list"), _defineProperty({}, "".concat(prefixCls, "-innerScroll"), innerScroll)),
+      id: RANDOM_ID,
+      ref: tableBodyListRef
+    }, innerScroll && loadMore ? /*#__PURE__*/_react.default.createElement(_reactInfiniteScrollComponent.default, {
+      dataLength: rows.length,
+      next: loadMore,
+      hasMore: !!hasNextPage,
+      loader: LoadingNode,
+      scrollableTarget: RANDOM_ID
+    }, renderRowList()) : renderRowList());
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: prefixCls
+    className: prefixCls,
+    ref: tableRef
   }, showHeader && renderHeader(data.length), /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, getTableProps()), {}, {
-    className: (0, _classnames5.default)("".concat(prefixCls, "-table-wrap"), _defineProperty({}, "".concat(prefixCls, "-column-resizable"), resizeColumn))
+    className: (0, _classnames7.default)("".concat(prefixCls, "-table-wrap"), _defineProperty({}, "".concat(prefixCls, "-column-resizable"), resizeColumn))
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-thead")
   }, headerGroups.map(function (headerGroup) {
@@ -389,22 +416,30 @@ function Table(_ref) {
       className: "".concat(prefixCls, "-row")
     }), headerGroup.headers.map(function (column) {
       var barPorps = resizeColumn ? column.getResizerProps() : {};
-      return /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({
-        // {...column.getHeaderProps(column.getSortByToggleProps())}
-        className: (0, _classnames5.default)(_defineProperty({}, "".concat(prefixCls, "-cell-sorting"), column.id === sortDirection.id), "".concat(prefixCls, "-cell"))
-      }, getHeaderProps(column)), {}, {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: (0, _classnames7.default)(_defineProperty({}, "".concat(prefixCls, "-cell-sorting"), column.id === sortDirection.id), "".concat(prefixCls, "-cell")),
+        style: getHeaderProps(column).style,
         key: column.id
-      }), column.render('Header'), /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, barPorps), {}, {
-        className: (0, _classnames5.default)(_defineProperty({}, "".concat(prefixCls, "-dragBar"), resizeColumn), "".concat(prefixCls, "-bar"))
-      })), /*#__PURE__*/_react.default.createElement(SortIcons, {
+      }, /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({
+        className: "".concat(prefixCls, "-cell-content")
+      }, getHeaderProps(column)), {}, {
+        style: {
+          width: '100%'
+        }
+      }), column.render('Header'), /*#__PURE__*/_react.default.createElement(SortIcons, {
         id: column.id
-      }));
+      })), /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, barPorps), {}, {
+        className: (0, _classnames7.default)(_defineProperty({}, "".concat(prefixCls, "-dragBar"), resizeColumn), "".concat(prefixCls, "-bar"))
+      })));
     }));
   })), /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, getTableBodyProps()), {}, {
-    className: (0, _classnames5.default)("".concat(prefixCls, "-tbody")),
-    ref: tableBodyRef
+    className: (0, _classnames7.default)("".concat(prefixCls, "-tbody"), _defineProperty({}, "".concat(prefixCls, "-innerScroll"), innerScroll)),
+    style: {
+      width: totalColumnsWidth
+    }
   }), renderTableBody())));
 }
 
-var _default = Table;
+var _default = /*#__PURE__*/_react.default.forwardRef(Table);
+
 exports.default = _default;

package/lib/Table/interface.d.ts

@@ -21,7 +21,7 @@ export interface ITableProps<T extends object> {
     data: T[];
     total?: number;
     onRowSelected?: (row: T) => void;
-    loadMore?: (startIndex: number, stopIndex: number) => void | Promise<void>;
+    loadMore?: () => void | Promise<void>;
     hasNextPage?: boolean;
     loading?: boolean;
     renderHeaderLeft?: () => React.ReactNode;
@@ -32,4 +32,6 @@ export interface ITableProps<T extends object> {
     sortDirections?: Array<'ascend' | 'descend'>;
     resizeColumn?: boolean;
     showHeader?: boolean;
+    innerScroll?: boolean;
+    ref?: React.RefObject<unknown>;
 }

package/lib/Table/style/index.less

@@ -12,23 +12,33 @@
   overflow: hidden;
   user-select: none;
 
+  &-page-loading {
+    opacity: 0;
+  }
+
   &-table-wrap {
     display: flex;
     flex: 1;
     flex-direction: column;
+    overflow: hidden;
   }
 
   &-cell {
     flex-grow: 1;
-    height: @table-row-height;
-    padding: 0 12px;
-    overflow: hidden;
+    height: unset;
+    min-height: @table-row-height;
     color: @NL0;
     line-height: @table-row-height;
-    white-space: nowrap;
     text-align: left;
-    text-overflow: ellipsis;
     border-bottom: 1px solid @NL95;
+    word-break: break-all;
+    display: flex;
+    padding: 0 12px;
+    align-items: center;
+
+    &-content {
+      flex: 1;
+    }
   }
 
   &-row {
@@ -51,12 +61,19 @@
         right: 0;
         z-index: 1;
         display: inline-block;
-        width: 1px;
+        width: 12px;
         height: 12px;
-        background: blue;
-        background-color: @NL95;
         transform: translateY(-50%);
         touch-action: none;
+        padding-left: 5px;
+
+        &::after {
+          display: block;
+          height: 100%;
+          width: 1px;
+          content: '';
+          background-color: @NL95;
+        }
       }
 
       &:last-child {
@@ -73,6 +90,8 @@
 
     .ant-empty {
       padding-top: 80px;
+      display: flex;
+      justify-content: center;
     }
 
     .ant-block-table-row {
@@ -125,9 +144,18 @@
     }
   }
 
-  &-list {
+  /* stylelint-disable-next-line selector-class-pattern */
+  &-list&-innerScroll {
+    height: 100%;
     overflow: overlay !important;
+  }
+
+  // 当出现多行的时候 会顶出一个滚动条 通过复写三方库的样式覆盖
+  &-list&-canNotInnerScroll {
+    overflow: hidden !important;
+  }
 
+  &-list {
     &::-webkit-scrollbar-thumb {
       background: @NL90;
       background-clip: padding-box;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "0.2.0-beta.13",
+  "version": "0.2.0-beta.14",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -57,6 +57,7 @@
     "rc-overflow": "^1.2.3",
     "rc-trigger": "^5.2.10",
     "rc-virtual-list": "^3.4.2",
+    "react-infinite-scroll-component": "^6.1.0",
     "react-table": "^7.7.0",
     "react-window": "^1.8.6",
     "react-window-infinite-loader": "^1.0.7"