@aloudata/aloudata-design 0.2.0-beta.2 → 0.2.0-beta.5

package/es/Table/index.js

@@ -23,9 +23,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-// @ts-nocheck
+/// <reference types ='./react-table-config' />
 import React, { useCallback, useMemo } from 'react';
-import { useTable, useBlockLayout, useRowSelect } from 'react-table';
+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';
@@ -33,7 +33,10 @@ import classnames from 'classnames';
 import './style';
 import Icon from '../Icon';
 import Empty from '../Empty';
+import _ from 'lodash';
 var DEFAULT_ROW_HEIGHT = 40;
+var ARRAY_FIRST_INDEX = 0;
+var DEFAULT_ROW_WIDTH = 0;
 
 function Table(_ref) {
   var columns = _ref.columns,
@@ -46,40 +49,64 @@ function Table(_ref) {
       _ref$loadMore = _ref.loadMore,
       loadMore = _ref$loadMore === void 0 ? function () {} : _ref$loadMore,
       hasNextPage = _ref.hasNextPage,
-      loading = _ref.loading;
+      loading = _ref.loading,
+      _ref$sortable = _ref.sortable,
+      sortable = _ref$sortable === void 0 ? false : _ref$sortable,
+      defaultSort = _ref.defaultSort,
+      _ref$resizeColumn = _ref.resizeColumn,
+      resizeColumn = _ref$resizeColumn === void 0 ? false : _ref$resizeColumn,
+      allSortDirections = _ref.sortDirections,
+      _ref$onChange = _ref.onChange,
+      onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange;
   var newColumns = useMemo(function () {
     return columns.map(function (column) {
-      // @ts-ignore
-      if (column.Cell) {
-        return _objectSpread(_objectSpread({}, column), {}, {
-          // @ts-ignore
-          Cell: function Cell(instance) {
-            // eslint-disable-next-line
-            return column.Cell(instance.row.original);
-          }
-        });
-      }
-
-      return column;
+      return _objectSpread(_objectSpread({}, column), {}, {
+        Header: column.title,
+        disableSortBy: !sortable || typeof column.sorter === 'boolean',
+        accessor: column.dataIndex,
+        Cell: function Cell(_ref2) {
+          var row = _ref2.row,
+              value = _ref2.value;
+          return typeof column.render === 'function' ? column.render(value, row.original, row.index) : value;
+        }
+      });
     });
-  }, [columns]);
+  }, [columns, sortable]);
+
+  var _React$useState = React.useState({
+    id: (defaultSort === null || defaultSort === void 0 ? void 0 : defaultSort.id) || sortable ? newColumns[ARRAY_FIRST_INDEX].dataIndex : '',
+    desc: (defaultSort === null || defaultSort === void 0 ? void 0 : defaultSort.desc) || false
+  }),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      sortDirection = _React$useState2[0],
+      setSortDirection = _React$useState2[1];
 
   var _useTable = useTable({
     columns: newColumns,
-    data: data
-  }, useBlockLayout, useRowSelect),
+    data: data,
+    disableMultiSort: true,
+    disableSortBy: !sortable,
+    initialState: {
+      sortBy: [{
+        id: sortDirection.id,
+        desc: sortDirection.desc
+      }]
+    }
+  }, useBlockLayout, useSortBy, useRowSelect, useResizeColumns),
       getTableProps = _useTable.getTableProps,
       getTableBodyProps = _useTable.getTableBodyProps,
       headerGroups = _useTable.headerGroups,
       rows = _useTable.rows,
-      prepareRow = _useTable.prepareRow;
+      prepareRow = _useTable.prepareRow,
+      setSortBy = _useTable.setSortBy;
 
-  var _React$useState = React.useState(null),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      selectedRowId = _React$useState2[0],
-      setSelectedRowId = _React$useState2[1];
+  var _React$useState3 = React.useState(null),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      selectedRowId = _React$useState4[0],
+      setSelectedRowId = _React$useState4[1];
 
-  var prefixCls = usePrefixCls('blockTable');
+  var theadRowWidthRef = React.useRef(DEFAULT_ROW_WIDTH);
+  var prefixCls = usePrefixCls('block-table');
 
   function getTbodyStyle() {
     if (scrollY) {
@@ -94,8 +121,7 @@ function Table(_ref) {
   var onRowClick = useCallback(function (row) {
     if (!onRowSelected) {
       return;
-    } // @ts-ignore
-
+    }
 
     setSelectedRowId(row.id);
     onRowSelected(row.original);
@@ -107,9 +133,9 @@ function Table(_ref) {
     return !hasNextPage || index < data.length;
   };
 
-  var RenderRow = function RenderRow(_ref2) {
-    var index = _ref2.index,
-        style = _ref2.style;
+  var RenderRow = function RenderRow(_ref3) {
+    var index = _ref3.index,
+        style = _ref3.style;
 
     if (!isItemLoaded(index)) {
       return /*#__PURE__*/React.createElement("div", {
@@ -129,8 +155,8 @@ function Table(_ref) {
         rowProps = _objectWithoutProperties(_row$getRowProps, _excluded);
 
     return /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, rowProps), {}, {
-      style: _objectSpread(_objectSpread({}, style), {}, {
-        display: rowStyle === null || rowStyle === void 0 ? void 0 : rowStyle.display
+      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() {
@@ -148,31 +174,140 @@ function Table(_ref) {
       className: classnames("".concat(prefixCls, "-header"))
     }, renderHeaderLeft ? renderHeaderLeft() : /*#__PURE__*/React.createElement("span", {
       className: classnames("".concat(prefixCls, "-header-left"))
-    }, "\u5171", total || len, "\u6761"), /*#__PURE__*/React.createElement("div", {
+    }, "\u5171\u8BA1", total || len, "\u6761"), /*#__PURE__*/React.createElement("div", {
       className: classnames("".concat(prefixCls, "-header-right"))
     }, renderHeaderRight ? renderHeaderRight() : null));
   };
 
+  var getNextSortDesc = function getNextSortDesc(currentDesc) {
+    var sortDirections = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['ascend', 'descend'];
+    var sortOrder = arguments.length > 2 ? arguments[2] : undefined;
+    var descMap = new Map([['ascend', false], ['descend', true]]);
+    var directions = allSortDirections || sortDirections;
+
+    if (sortOrder === 'ascend' || sortOrder === 'descend') {
+      return descMap.get(sortOrder);
+    }
+
+    if (typeof currentDesc === 'undefined') {
+      return descMap.get(directions[ARRAY_FIRST_INDEX]);
+    }
+
+    var direction = currentDesc ? 'descend' : 'ascend';
+
+    var index = _.findIndex(directions, function (item) {
+      return item === direction;
+    });
+
+    var nextIndex = index + 1;
+    return descMap.get(directions[nextIndex]);
+  };
+
+  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();
+
+    if (canSort) {
+      // client sort
+      return _objectSpread(_objectSpread({}, column.getHeaderProps(_objectSpread({}, toggleProps))), {}, {
+        onClick: function onClick(e) {
+          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([sortBy]);
+            setSortDirection(sortBy);
+            onChange(sortBy);
+          }
+        }
+      });
+    }
+
+    if (sorter) {
+      // server sort
+      return _objectSpread(_objectSpread({}, column.getHeaderProps({
+        style: {
+          cursor: 'pointer'
+        }
+      })), {}, {
+        onClick: function onClick(e) {
+          e.stopPropagation(); // 需要触发onChange
+          // debugger;
+
+          var desc = getNextSortDesc(sortDirection.desc, sortDirections, sortOrder);
+          var sortBy = {
+            id: typeof desc === 'boolean' ? id : '',
+            desc: desc
+          };
+          setSortDirection(sortBy);
+          onChange(sortBy);
+        }
+      });
+    }
+
+    return column.getHeaderProps();
+  };
+
+  var SortIcons = function SortIcons(_ref4) {
+    var id = _ref4.id;
+    var currentSortId = sortDirection.id,
+        desc = sortDirection.desc;
+
+    if (id !== currentSortId || !sortable) {
+      return null;
+    }
+
+    return desc ? /*#__PURE__*/React.createElement(Icon, {
+      className: "".concat(prefixCls, "-sortIcon"),
+      type: "sort_descending",
+      size: 12
+    }) : /*#__PURE__*/React.createElement(Icon, {
+      className: "".concat(prefixCls, "-sortIcon"),
+      type: "sort_ascending",
+      size: 12
+    });
+  };
+
   return /*#__PURE__*/React.createElement("div", {
     className: prefixCls
-  }, renderHeader(data.length), /*#__PURE__*/React.createElement("div", _objectSpread({}, getTableProps()), /*#__PURE__*/React.createElement("div", {
-    className: classnames("".concat(prefixCls, "-thead"))
+  }, renderHeader(data.length), /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, getTableProps()), {}, {
+    className: classnames(_defineProperty({}, "".concat(prefixCls, "-column-resizable"), resizeColumn))
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-thead")
   }, headerGroups.map(function (headerGroup) {
     var _headerGroup$getHeade = headerGroup.getHeaderGroupProps(),
         style = _headerGroup$getHeade.style,
         headerGroupProps = _objectWithoutProperties(_headerGroup$getHeade, _excluded2);
 
+    theadRowWidthRef.current = (style === null || style === void 0 ? void 0 : style.width) || DEFAULT_ROW_WIDTH;
     return /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, headerGroupProps), {}, {
-      style: {
-        display: style === null || style === void 0 ? void 0 : style.display
-      },
-      className: classnames("".concat(prefixCls, "-row"))
+      style: _objectSpread(_objectSpread({}, style), {}, {
+        width: resizeColumn ? style === null || style === void 0 ? void 0 : style.width : '100%'
+      }),
+      className: "".concat(prefixCls, "-row")
     }), headerGroup.headers.map(function (column) {
-      return /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, column.getHeaderProps()), {}, {
-        className: classnames("".concat(prefixCls, "-cell"))
-      }), /*#__PURE__*/React.createElement("div", {
-        className: classnames("".concat(prefixCls, "-dragBar"))
-      }), column.render('Header'));
+      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)), {}, {
+        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, {
+        id: column.id
+      }));
     }));
   })), /*#__PURE__*/React.createElement("div", _objectSpread(_objectSpread({}, getTableBodyProps()), {}, {
     className: classnames("".concat(prefixCls, "-tbody"), _defineProperty({}, "".concat(prefixCls, "-tbody-scroll"), !loadMoreItems)),
@@ -183,17 +318,17 @@ function Table(_ref) {
     isItemLoaded: isItemLoaded,
     itemCount: itemCount,
     loadMoreItems: loadMoreItems
-  }, function (_ref3) {
-    var onItemsRendered = _ref3.onItemsRendered,
-        ref = _ref3.ref;
+  }, 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: "100%",
+      width: resizeColumn ? theadRowWidthRef.current : '100%',
       ref: ref,
-      className: classnames("".concat(prefixCls, "-list"))
+      className: "".concat(prefixCls, "-list")
     }, RenderRow);
   }))));
 }

package/es/Table/interface.d.ts

@@ -1,14 +1,34 @@
 /// <reference types="react" />
-import { Column } from 'react-table';
+import { Row, IdType } from 'react-table';
+export declare type TSortOrder = 'ascend' | 'descend' | false;
+export interface ISort<T> {
+    id: IdType<T>;
+    desc?: boolean;
+}
+export interface IColumn<T extends object> {
+    title: string;
+    dataIndex: string;
+    render?: (value: unknown, row: Record<string, T>, 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);
+    sortOrder?: TSortOrder;
+    sortDirections?: Array<'ascend' | 'descend'>;
+}
 export interface ITableProps<T extends object> {
-    columns: Column<T>[];
+    columns: IColumn<T>[];
     data: T[];
     total?: number;
     scrollY?: number;
     onRowSelected?: (row: T) => void;
     loadMore?: (startIndex: number, stopIndex: number) => void | Promise<void>;
-    hasNextPage: boolean;
-    loading: boolean;
-    renderHeaderLeft: () => React.ReactNode;
-    renderHeaderRight: () => React.ReactNode;
+    hasNextPage?: boolean;
+    loading?: boolean;
+    renderHeaderLeft?: () => React.ReactNode;
+    renderHeaderRight?: () => React.ReactNode;
+    sortable?: boolean;
+    onChange?: (sort: ISort<T>) => void;
+    defaultSort?: ISort<T>;
+    sortDirections?: Array<'ascend' | 'descend'>;
+    resizeColumn?: boolean;
 }

package/es/Table/react-table-config.d.ts

@@ -0,0 +1,122 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import {
+  UseColumnOrderInstanceProps,
+  UseColumnOrderState,
+  UseExpandedHooks,
+  UseExpandedInstanceProps,
+  UseExpandedOptions,
+  UseExpandedRowProps,
+  UseExpandedState,
+  UseFiltersColumnOptions,
+  UseFiltersColumnProps,
+  UseFiltersInstanceProps,
+  UseFiltersOptions,
+  UseFiltersState,
+  UseGlobalFiltersColumnOptions,
+  UseGlobalFiltersInstanceProps,
+  UseGlobalFiltersOptions,
+  UseGlobalFiltersState,
+  UseGroupByCellProps,
+  UseGroupByColumnOptions,
+  UseGroupByColumnProps,
+  UseGroupByHooks,
+  UseGroupByInstanceProps,
+  UseGroupByOptions,
+  UseGroupByRowProps,
+  UseGroupByState,
+  UsePaginationInstanceProps,
+  UsePaginationOptions,
+  UsePaginationState,
+  UseResizeColumnsColumnOptions,
+  UseResizeColumnsColumnProps,
+  UseResizeColumnsOptions,
+  UseResizeColumnsState,
+  UseRowSelectHooks,
+  UseRowSelectInstanceProps,
+  UseRowSelectOptions,
+  UseRowSelectRowProps,
+  UseRowSelectState,
+  UseRowStateCellProps,
+  UseRowStateInstanceProps,
+  UseRowStateOptions,
+  UseRowStateRowProps,
+  UseRowStateState,
+  UseSortByColumnOptions,
+  UseSortByColumnProps,
+  UseSortByHooks,
+  UseSortByInstanceProps,
+  UseSortByOptions,
+  UseSortByState
+} from 'react-table';
+
+declare module 'react-table' {
+  // take this file as-is, or comment out the sections that don't apply to your plugin configuration
+
+  export interface TableOptions<D extends Record<string, unknown>>
+    extends UseExpandedOptions<D>,
+    UseFiltersOptions<D>,
+    UseGlobalFiltersOptions<D>,
+    UseGroupByOptions<D>,
+    UsePaginationOptions<D>,
+    UseResizeColumnsOptions<D>,
+    UseRowSelectOptions<D>,
+    UseRowStateOptions<D>,
+    UseSortByOptions<D>,
+    // note that having Record here allows you to add anything to the options, this matches the spirit of the
+    // underlying js library, but might be cleaner if it's replaced by a more specific type that matches your
+    // feature set, this is a safe default.
+    Record<string, unknown> {}
+
+  export interface Hooks<D extends Record<string, unknown> = Record<string, unknown>>
+    extends UseExpandedHooks<D>,
+    UseGroupByHooks<D>,
+    UseRowSelectHooks<D>,
+    UseSortByHooks<D> {}
+
+  export interface TableInstance<D extends Record<string, unknown> = Record<string, unknown>>
+    extends UseColumnOrderInstanceProps<D>,
+    UseExpandedInstanceProps<D>,
+    UseFiltersInstanceProps<D>,
+    UseGlobalFiltersInstanceProps<D>,
+    UseGroupByInstanceProps<D>,
+    UsePaginationInstanceProps<D>,
+    UseRowSelectInstanceProps<D>,
+    UseRowStateInstanceProps<D>,
+    UseSortByInstanceProps<D> {}
+
+  export interface TableState<D extends Record<string, unknown> = Record<string, unknown>>
+    extends UseColumnOrderState<D>,
+    UseExpandedState<D>,
+    UseFiltersState<D>,
+    UseGlobalFiltersState<D>,
+    UseGroupByState<D>,
+    UsePaginationState<D>,
+    UseResizeColumnsState<D>,
+    UseRowSelectState<D>,
+    UseRowStateState<D>,
+    UseSortByState<D> {}
+
+  export interface ColumnInterface<D extends Record<string, unknown> = Record<string, unknown>>
+    extends UseFiltersColumnOptions<D>,
+    UseGlobalFiltersColumnOptions<D>,
+    UseGroupByColumnOptions<D>,
+    UseResizeColumnsColumnOptions<D>,
+    UseSortByColumnOptions<D> {}
+
+  export interface ColumnInstance<D extends Record<string, unknown> = Record<string, unknown>>
+    extends UseFiltersColumnProps<D>,
+    UseGroupByColumnProps<D>,
+    UseResizeColumnsColumnProps<D>,
+    UseSortByColumnProps<D> {}
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  export interface Cell<D extends Record<string, unknown> = Record<string, unknown>, V = unknown>
+    extends UseGroupByCellProps<D>,
+    UseRowStateCellProps<D> {}
+
+  export interface Row<D extends Record<string, unknown> = Record<string, unknown>>
+    extends UseExpandedRowProps<D>,
+    UseGroupByRowProps<D>,
+    UseRowSelectRowProps<D>,
+    UseRowStateRowProps<D> {}
+}