@aloudata/aloudata-design 0.2.0-beta.9 → 0.2.1

package/es/Table/index.js

@@ -23,32 +23,31 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+/* eslint-disable no-unneeded-ternary */
 /// <reference types ='./react-table-config' />
-import React, { useCallback, useMemo } from 'react';
-import { useTable, useBlockLayout, useRowSelect, useSortBy, useResizeColumns } from 'react-table';
-import usePrefixCls from '../_utils/hooks/usePrefixCls';
-import { FixedSizeList } from 'react-window';
-import InfiniteLoader from 'react-window-infinite-loader';
+import _ from 'lodash';
 import classnames from 'classnames';
 import Icon from '../Icon';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import usePrefixCls from '../_utils/hooks/usePrefixCls';
+import InfiniteScroll from 'react-infinite-scroll-component';
 import Empty from '../Empty';
-import _ from 'lodash';
-var DEFAULT_ROW_HEIGHT = 40;
+import ResizeObserver from 'rc-resize-observer';
+import { useTable, useBlockLayout, useRowSelect, useSortBy, useResizeColumns } from 'react-table';
 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,
       renderHeaderLeft = _ref.renderHeaderLeft,
       renderHeaderRight = _ref.renderHeaderRight,
-      scrollY = _ref.scrollY,
       onRowSelected = _ref.onRowSelected,
-      _ref$loadMore = _ref.loadMore,
-      loadMore = _ref$loadMore === void 0 ? function () {} : _ref$loadMore,
-      hasNextPage = _ref.hasNextPage,
+      loadMore = _ref.loadMore,
       loading = _ref.loading,
+      hasNextPage = _ref.hasNextPage,
       _ref$sortable = _ref.sortable,
       sortable = _ref$sortable === void 0 ? false : _ref$sortable,
       defaultSort = _ref.defaultSort,
@@ -58,17 +57,82 @@ 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,
+      _ref$scrollThreshold = _ref.scrollThreshold,
+      scrollThreshold = _ref$scrollThreshold === void 0 ? '150px' : _ref$scrollThreshold,
+      _ref$rowClassName = _ref.rowClassName,
+      rowClassName = _ref$rowClassName === void 0 ? '' : _ref$rowClassName,
+      _ref$ellipsis = _ref.ellipsis,
+      ellipsis = _ref$ellipsis === void 0 ? true : _ref$ellipsis,
+      renderEmpty = _ref.renderEmpty,
+      rowKey = _ref.rowKey;
 
   var _React$useState = React.useState(null),
       _React$useState2 = _slicedToArray(_React$useState, 2),
       selectedRowId = _React$useState2[0],
       setSelectedRowId = _React$useState2[1];
 
+  var tableBodyListRef = useRef(null);
+  var tableRef = useRef(null);
+
+  var _useState = useState(DEFAULT_BODY_HEIGHT),
+      _useState2 = _slicedToArray(_useState, 2),
+      tableClientWidth = _useState2[0],
+      setTableClientWidth = _useState2[1];
+
+  var RANDOM_ID = "INNER_SCROLL_ID_".concat(Math.random());
+
+  var _useState3 = useState(DEFAULT_ROW_WIDTH),
+      _useState4 = _slicedToArray(_useState3, 2),
+      width = _useState4[0],
+      setWidth = _useState4[1]; // 如果页面整体宽度变化则重新计算
+
+
+  useEffect(function () {
+    if (tableRef.current) {
+      setTableClientWidth(tableRef.current.clientWidth);
+    }
+  }, [width]);
+  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), {}, {
-        Header: column.title,
+        width: initialColumnsWidthMap.columnMap.get(column.dataIndex) || initialColumnsWidthMap.averageWidth,
+        Header: column.title ? column.title : function () {
+          return null;
+        },
         disableSortBy: !sortable || typeof column.sorter === 'boolean',
         accessor: column.dataIndex,
         Cell: function Cell(_ref2) {
@@ -78,7 +142,12 @@ function Table(_ref) {
         }
       });
     });
-  }, [columns, sortable]);
+  }, [columns, sortable, initialColumnsWidthMap]); // 默认排序的对象
+
+  var defaultSortObject = {
+    id: newColumns[ARRAY_FIRST_INDEX].accessor,
+    desc: newColumns[ARRAY_FIRST_INDEX].sortOrder && newColumns[ARRAY_FIRST_INDEX].sortOrder === 'descend' ? true : false
+  }; // 如果支持排序 但是没有默认排序 则默认按第一列倒叙排序
 
   var getInitialSortDirection = function getInitialSortDirection() {
     if (defaultSort && defaultSort.id) {
@@ -86,10 +155,7 @@ function Table(_ref) {
     }
 
     if (sortable) {
-      return {
-        id: newColumns[ARRAY_FIRST_INDEX].accessor,
-        desc: false
-      };
+      return defaultSortObject;
     }
 
     return {
@@ -103,13 +169,30 @@ function Table(_ref) {
       sortDirection = _React$useState4[0],
       setSortDirection = _React$useState4[1];
 
+  var getInitSortBy = function getInitSortBy() {
+    if (!(sortDirection === null || sortDirection === void 0 ? void 0 : sortDirection.id)) {
+      return [];
+    }
+
+    var sortColumn = newColumns.find(function (column) {
+      return column.accessor === sortDirection.id;
+    });
+
+    if (sortColumn === null || sortColumn === void 0 ? void 0 : sortColumn.sorter) {
+      return [];
+    }
+
+    return [sortDirection];
+  };
+
   var _useTable = useTable({
     columns: newColumns,
     data: data,
     disableMultiSort: true,
     disableSortBy: !sortable,
+    getRowId: rowKey,
     initialState: {
-      sortBy: sortDirection.id ? [sortDirection] : []
+      sortBy: getInitSortBy()
     }
   }, useBlockLayout, useSortBy, useRowSelect, useResizeColumns),
       getTableProps = _useTable.getTableProps,
@@ -117,21 +200,11 @@ 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');
-
-  function getTbodyStyle() {
-    if (scrollY) {
-      return {
-        height: "".concat(scrollY, "px")
-      };
-    }
-
-    return {};
-  }
-
   var onRowClick = useCallback(function (row) {
     if (!onRowSelected) {
       return;
@@ -140,48 +213,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", {
@@ -191,41 +222,65 @@ function Table(_ref) {
     }, "\u5171\u8BA1", total || len, "\u6761"), /*#__PURE__*/React.createElement("div", {
       className: classnames("".concat(prefixCls, "-header-right"))
     }, renderHeaderRight ? renderHeaderRight() : null));
-  };
+  }; // 排序的方向 倒叙{ id: 'xx', desc: true }、正序{ id: 'xx', desc: false }、无序 { id: '', desc: undefined }
+  // 获取排序方向以及排序的id
+
 
-  var getNextSortDesc = function getNextSortDesc(currentDesc) {
+  var getSortBy = function getSortBy(id) {
     var sortDirections = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['ascend', 'descend'];
-    var sortOrder = arguments.length > 2 ? arguments[2] : undefined;
+    var // 如果传了sortDirections，则使用传入的，否则使用默认的
+    sortOrder = arguments.length > 2 ? arguments[2] : undefined;
+    var res = {
+      id: id,
+      desc: undefined // 给个默认的排序
+
+    };
+    var isSameCol = sortDirection.id === id;
     var descMap = new Map([['ascend', false], ['descend', true]]);
-    var directions = allSortDirections || sortDirections;
+    var directions = allSortDirections || sortDirections; // 如果不是同一列 则返回默认排序 或者排序顺序的第一个
+
+    if (!isSameCol) {
+      if (sortOrder === 'ascend' || sortOrder === 'descend') {
+        res.desc = descMap.get(sortOrder);
+      } else {
+        res.desc = sortOrder ? sortOrder : descMap.get(directions[ARRAY_FIRST_INDEX]);
+      }
+
+      return res;
+    } // 如果是同一列
+    // 如果列给了默认的sortOrder则不在变化
+
 
     if (sortOrder === 'ascend' || sortOrder === 'descend') {
-      return descMap.get(sortOrder);
-    }
+      res.desc = descMap.get(sortOrder);
+      return res;
+    } // 在所有方向上 往后取一个
 
-    if (typeof currentDesc === 'undefined') {
-      return descMap.get(directions[ARRAY_FIRST_INDEX]);
-    }
 
-    var direction = currentDesc ? 'descend' : 'ascend';
+    var lastSortDirection = sortDirection.desc ? 'descend' : 'ascend';
 
     var index = _.findIndex(directions, function (item) {
-      return item === direction;
+      return item === lastSortDirection;
     });
 
     var nextIndex = index + 1;
-    return descMap.get(directions[nextIndex]);
+    res.desc = descMap.get(directions[nextIndex]); // 如果没有排序方向，则返回默认排序对象
+
+    if (res.desc === undefined) {
+      res.id = '';
+    }
+
+    return res;
   };
 
   var getHeaderProps = function getHeaderProps(column) {
     // @ts-ignore
     var id = column.id,
-        isSortedDesc = column.isSortedDesc,
         canSort = column.canSort,
         sorter = column.sorter,
         sortOrder = column.sortOrder,
         sortDirections = column.sortDirections;
-    var toggleProps = column.getSortByToggleProps();
+    var toggleProps = column.getSortByToggleProps(); // 仅在Table设置sortable时,所有列的canSort为true,此时为前端排序
 
     if (canSort) {
       // client sort
@@ -234,19 +289,16 @@ function Table(_ref) {
           e.stopPropagation();
 
           if (typeof toggleProps.onClick === 'function') {
-            // toggleProps.onClick(e);
-            var desc = getNextSortDesc(isSortedDesc, sortDirections, sortOrder);
-            var sortBy = {
-              id: typeof desc === 'undefined' ? '' : id,
-              desc: desc
-            };
-            setSortBy(typeof desc === 'undefined' ? [] : [sortBy]);
+            var sortBy = getSortBy(id, sortDirections, sortOrder);
+            setSortBy(sortBy.desc === undefined ? [defaultSortObject] : [sortBy]); // 客户端排序时 需要重新设置排序
+
             setSortDirection(sortBy);
             onChange(sortBy);
           }
         }
       });
-    }
+    } // 当列设置sorter属性时，则为服务端排序
+
 
     if (sorter) {
       // server sort
@@ -256,14 +308,8 @@ function Table(_ref) {
         }
       })), {}, {
         onClick: function onClick(e) {
-          e.stopPropagation(); // 需要触发onChange
-          // debugger;
-
-          var desc = getNextSortDesc(sortDirection.desc, sortDirections, sortOrder);
-          var sortBy = {
-            id: typeof desc === 'boolean' ? id : '',
-            desc: desc
-          };
+          e.stopPropagation();
+          var sortBy = getSortBy(id, sortDirections, sortOrder);
           setSortDirection(sortBy);
           onChange(sortBy);
         }
@@ -273,8 +319,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;
 
@@ -293,10 +339,89 @@ function Table(_ref) {
     });
   };
 
-  return /*#__PURE__*/React.createElement("div", {
-    className: prefixCls
+  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 renderEmpty ? renderEmpty() : /*#__PURE__*/React.createElement(Empty, {
+        description: "\u5F53\u524D\u65E0\u6570\u636E"
+      });
+    }
+
+    var renderRowList = function renderRowList() {
+      return data.map(function (item, index) {
+        var _classnames;
+
+        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"), (_classnames = {}, _defineProperty(_classnames, "".concat(prefixCls, "-row-selected"), row.id === selectedRowId), _defineProperty(_classnames, rowClassName, rowClassName), _defineProperty(_classnames, "".concat(prefixCls, "-row-ellipsis"), ellipsis), _classnames)),
+          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("div", {
+      className: classnames("".concat(prefixCls, "-list"), _defineProperty({}, "".concat(prefixCls, "-innerScroll"), innerScroll)),
+      id: RANDOM_ID,
+      ref: tableBodyListRef
+    }, innerScroll ? /*#__PURE__*/React.createElement(InfiniteScroll, {
+      dataLength: rows.length,
+      next: loadMore,
+      hasMore: !!hasNextPage,
+      loader: LoadingNode,
+      scrollableTarget: RANDOM_ID,
+      scrollThreshold: scrollThreshold
+    }, renderRowList()) : renderRowList());
+  };
+
+  return /*#__PURE__*/React.createElement(ResizeObserver, {
+    onResize: function onResize(_ref4) {
+      var domWidth = _ref4.width;
+      setWidth(domWidth);
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: prefixCls,
+    ref: tableRef
   }, showHeader && renderHeader(data.length), /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, getTableProps()), {}, {
-    className: classnames(_defineProperty({}, "".concat(prefixCls, "-column-resizable"), resizeColumn))
+    className: classnames("".concat(prefixCls, "-table-wrap"), _defineProperty({}, "".concat(prefixCls, "-column-resizable"), resizeColumn))
   }), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-thead")
   }, headerGroups.map(function (headerGroup) {
@@ -312,39 +437,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"), _defineProperty({}, "".concat(prefixCls, "-tbody-scroll"), !loadMoreItems)),
-    style: getTbodyStyle()
-  }), !loading && !rows.length && /*#__PURE__*/React.createElement(Empty, {
-    description: "\u5F53\u524D\u65E0\u6570\u636E"
-  }), /*#__PURE__*/React.createElement(InfiniteLoader, {
-    isItemLoaded: isItemLoaded,
-    itemCount: itemCount,
-    loadMoreItems: loadMoreItems
-  }, function (_ref5) {
-    var onItemsRendered = _ref5.onItemsRendered,
-        ref = _ref5.ref;
-    return /*#__PURE__*/React.createElement(FixedSizeList, {
-      itemCount: itemCount,
-      onItemsRendered: onItemsRendered,
-      height: scrollY || data.length * DEFAULT_ROW_HEIGHT,
-      itemSize: DEFAULT_ROW_HEIGHT,
-      width: resizeColumn ? theadRowWidthRef.current : '100%',
-      ref: ref,
-      className: "".concat(prefixCls, "-list")
-    }, RenderRow);
-  }))));
+    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

@@ -6,9 +6,9 @@ export interface ISort<T> {
     desc?: boolean;
 }
 export interface IColumn<T extends object> {
-    title: string;
+    title: string | null;
     dataIndex: string;
-    render?: (value: any, row: Record<string, T>, index: number) => React.ReactNode;
+    render?: (value: any, row: any, index: number) => React.ReactNode;
     width?: number;
     minWidth?: number;
     sorter?: boolean | 'string' | 'number' | 'basic' | 'datetime' | 'alphanumeric' | ((rowA: Row<T>, rowB: Row<T>, columnId: IdType<T>, desc?: boolean) => number);
@@ -20,9 +20,8 @@ export interface ITableProps<T extends object> {
     columns: IColumn<T>[];
     data: T[];
     total?: number;
-    scrollY?: number;
     onRowSelected?: (row: T) => void;
-    loadMore?: (startIndex: number, stopIndex: number) => void | Promise<void>;
+    loadMore?: () => void | Promise<void>;
     hasNextPage?: boolean;
     loading?: boolean;
     renderHeaderLeft?: () => React.ReactNode;
@@ -33,4 +32,11 @@ export interface ITableProps<T extends object> {
     sortDirections?: Array<'ascend' | 'descend'>;
     resizeColumn?: boolean;
     showHeader?: boolean;
+    innerScroll?: boolean;
+    ref?: React.RefObject<unknown>;
+    scrollThreshold?: string | number;
+    rowKey?: (row: any) => string;
+    rowClassName?: string;
+    ellipsis?: boolean;
+    renderEmpty?: () => React.ReactNode;
 }