@aloudata/aloudata-design 0.2.0-beta.16 → 0.2.0-beta.19

package/lib/Table/index.js

@@ -21,6 +21,8 @@ var _reactInfiniteScrollComponent = _interopRequireDefault(require("react-infini
 
 var _Empty = _interopRequireDefault(require("../Empty"));
 
+var _rcResizeObserver = _interopRequireDefault(require("rc-resize-observer"));
+
 var _reactTable = require("react-table");
 
 var _excluded = ["style"],
@@ -79,7 +81,10 @@ function Table(_ref, ref) {
       _ref$onChange = _ref.onChange,
       onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
       _ref$innerScroll = _ref.innerScroll,
-      innerScroll = _ref$innerScroll === void 0 ? false : _ref$innerScroll;
+      innerScroll = _ref$innerScroll === void 0 ? false : _ref$innerScroll,
+      _ref$scrollThreshold = _ref.scrollThreshold,
+      scrollThreshold = _ref$scrollThreshold === void 0 ? '150px' : _ref$scrollThreshold,
+      rowKey = _ref.rowKey;
 
   var _React$useState = _react.default.useState(null),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -95,11 +100,18 @@ function Table(_ref, ref) {
       setTableClientWidth = _useState2[1];
 
   var RANDOM_ID = "INNER_SCROLL_ID_".concat(Math.random());
+
+  var _useState3 = (0, _react.useState)(DEFAULT_ROW_WIDTH),
+      _useState4 = _slicedToArray(_useState3, 2),
+      width = _useState4[0],
+      setWidth = _useState4[1]; // 如果页面整体宽度变化则重新计算
+
+
   (0, _react.useEffect)(function () {
     if (tableRef.current) {
       setTableClientWidth(tableRef.current.clientWidth);
     }
-  }, []);
+  }, [width]);
   var initialColumnsWidthMap = (0, _react.useMemo)(function () {
     var map = new Map();
 
@@ -147,7 +159,12 @@ function Table(_ref, ref) {
         }
       });
     });
-  }, [columns, sortable, initialColumnsWidthMap]);
+  }, [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) {
@@ -155,10 +172,7 @@ function Table(_ref, ref) {
     }
 
     if (sortable) {
-      return {
-        id: newColumns[ARRAY_FIRST_INDEX].accessor,
-        desc: false
-      };
+      return defaultSortObject;
     }
 
     return {
@@ -193,6 +207,9 @@ function Table(_ref, ref) {
     data: data,
     disableMultiSort: true,
     disableSortBy: !sortable,
+    getRowId: typeof rowKey === 'string' ? function () {
+      return rowKey;
+    } : rowKey,
     initialState: {
       sortBy: getInitSortBy()
     }
@@ -225,41 +242,65 @@ function Table(_ref, ref) {
     }, "\u5171\u8BA1", total || len, "\u6761"), /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _classnames7.default)("".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 = _lodash.default.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
@@ -268,19 +309,16 @@ function Table(_ref, 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
@@ -290,14 +328,8 @@ function Table(_ref, 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);
         }
@@ -394,11 +426,17 @@ function Table(_ref, ref) {
       next: loadMore,
       hasMore: !!hasNextPage,
       loader: LoadingNode,
-      scrollableTarget: RANDOM_ID
+      scrollableTarget: RANDOM_ID,
+      scrollThreshold: scrollThreshold
     }, renderRowList()) : renderRowList());
   };
 
-  return /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(_rcResizeObserver.default, {
+    onResize: function onResize(_ref4) {
+      var domWidth = _ref4.width;
+      setWidth(domWidth);
+    }
+  }, /*#__PURE__*/_react.default.createElement("div", {
     className: prefixCls,
     ref: tableRef
   }, showHeader && renderHeader(data.length), /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, getTableProps()), {}, {
@@ -439,7 +477,7 @@ function Table(_ref, ref) {
     style: {
       width: totalColumnsWidth
     }
-  }), renderTableBody())));
+  }), renderTableBody()))));
 }
 
 var _default = /*#__PURE__*/_react.default.forwardRef(Table);

package/lib/Table/interface.d.ts

@@ -8,7 +8,7 @@ export interface ISort<T> {
 export interface IColumn<T extends object> {
     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);
@@ -34,4 +34,6 @@ export interface ITableProps<T extends object> {
     showHeader?: boolean;
     innerScroll?: boolean;
     ref?: React.RefObject<unknown>;
+    scrollThreshold?: string | number;
+    rowKey?: string | ((row: T) => string);
 }

package/lib/Table/style/index.less

@@ -26,14 +26,13 @@
   &-cell {
     flex-grow: 1;
     height: unset;
-    min-height: @table-row-height;
     color: @NL0;
-    line-height: @table-row-height;
+    line-height: 16px;
     text-align: left;
     border-bottom: 1px solid @NL95;
     word-break: break-all;
-    display: flex;
-    padding: 0 12px;
+    display: flex !important; // 目前都让表格先居左、居中处理，所以这里需要强制设置为flex
+    padding: 11.5px 12px;
     align-items: center;
 
     &-content {
@@ -126,7 +125,6 @@
     align-items: center;
     justify-content: space-between;
     margin-bottom: 24px;
-    padding: 0 10px;
 
     &-left {
       color: @NL0;

package/lib/Tabs/index.js

@@ -50,7 +50,8 @@ function Tabs(props) {
     }),
     tabBarGutter: 24,
     className: (0, _classnames.default)('ald-tabs', className, {
-      'ald-adapt-height': adaptHeight
+      'ald-adapt-height': adaptHeight,
+      'ald-tabs-default': size !== 'large'
     })
   }, tabsProps));
 }

package/lib/Tabs/style/index.less

@@ -1,6 +1,6 @@
 @import '../../style/index.less';
 
-.ald-tabs {
+.ant-tabs.ald-tabs {
   &.ant-tabs {
     color: @NL30;
   }
@@ -30,6 +30,13 @@
     }
   }
 
+  &.ald-tabs-default {
+    .ant-tabs-tab {
+      font-size: 14px;
+      line-height: 20px;
+    }
+  }
+
   .ant-tabs-nav-more {
     margin: 0 !important;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloudata/aloudata-design",
-  "version": "0.2.0-beta.16",
+  "version": "0.2.0-beta.19",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -55,6 +55,7 @@
     "lodash": "^4.17.21",
     "rc-menu": "^9.3.2",
     "rc-overflow": "^1.2.3",
+    "rc-resize-observer": "^1.2.0",
     "rc-trigger": "^5.2.10",
     "rc-virtual-list": "^3.4.2",
     "react-infinite-scroll-component": "^6.1.0",