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

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

@@ -1,86 +1,61 @@
 "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 _react = _interopRequireWildcard(require("react"));
-
 var _usePrefixCls = _interopRequireDefault(require("../../../_utils/hooks/usePrefixCls"));
-
 var _classnames2 = _interopRequireDefault(require("classnames"));
-
 var _utils = require("../../utils");
-
 var _excluded = ["style"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 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; }
-
 function TableBodyRowList(props) {
   var _props$ellipsis = props.ellipsis,
-      ellipsis = _props$ellipsis === void 0 ? true : _props$ellipsis,
-      data = props.data,
-      rows = props.rows,
-      prepareRow = props.prepareRow,
-      columnsTotalWidthRef = props.columnsTotalWidthRef,
-      _props$rowClassName = props.rowClassName,
-      rowClassName = _props$rowClassName === void 0 ? '' : _props$rowClassName,
-      onRowSelected = props.onRowSelected;
-
+    ellipsis = _props$ellipsis === void 0 ? true : _props$ellipsis,
+    data = props.data,
+    rows = props.rows,
+    prepareRow = props.prepareRow,
+    columnsTotalWidthRef = props.columnsTotalWidthRef,
+    _props$rowClassName = props.rowClassName,
+    rowClassName = _props$rowClassName === void 0 ? '' : _props$rowClassName,
+    onRowSelected = props.onRowSelected;
   var _useState = (0, _react.useState)(null),
-      _useState2 = _slicedToArray(_useState, 2),
-      selectedRowId = _useState2[0],
-      setSelectedRowId = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    selectedRowId = _useState2[0],
+    setSelectedRowId = _useState2[1];
   var prefixCls = (0, _usePrefixCls.default)('', 'ald-table');
   var onRowClick = (0, _react.useCallback)(function (row) {
     if (!onRowSelected) {
       return;
     }
-
     setSelectedRowId(row.id);
     onRowSelected(row.original);
   }, [onRowSelected, setSelectedRowId]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, 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.default.createElement("div", Object.assign({}, rowProps, {
+      rowStyle = _row$getRowProps.style,
+      rowProps = _objectWithoutProperties(_row$getRowProps, _excluded);
+    return /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, rowProps), {}, {
       style: _objectSpread(_objectSpread({}, rowStyle), {}, {
         width: columnsTotalWidthRef.current
       }),
@@ -91,10 +66,8 @@ function TableBodyRowList(props) {
       key: row.id
     }), row.cells.map(function (cell) {
       var _cell$getCellProps$st, _cell$getCellProps$st2;
-
       var currentRenderWidth = Number((_cell$getCellProps$st = cell.getCellProps().style) === null || _cell$getCellProps$st === void 0 ? void 0 : (_cell$getCellProps$st2 = _cell$getCellProps$st.width) === null || _cell$getCellProps$st2 === void 0 ? void 0 : _cell$getCellProps$st2.toString().replace('px', '')); // 表格内置计算的宽度 'px'
-
-      return /*#__PURE__*/_react.default.createElement("div", Object.assign({}, cell.getCellProps(), {
+      return /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, cell.getCellProps()), {}, {
         className: (0, _classnames2.default)("".concat(prefixCls, "-cell")),
         style: {
           width: (0, _utils.getValidWidthByNumber)(currentRenderWidth)
@@ -105,6 +78,5 @@ function TableBodyRowList(props) {
     }));
   }));
 }
-
 var _default = TableBodyRowList;
 exports.default = _default;

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

@@ -1,180 +1,143 @@
 "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;
-
 require("@aloudata/icons-react/styles/index.less");
-
 var _SortAscendingLine2 = _interopRequireDefault(require("@aloudata/icons-react/es/icons/SortAscendingLine"));
-
 var _SortDescendingLine2 = _interopRequireDefault(require("@aloudata/icons-react/es/icons/SortDescendingLine"));
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _usePrefixCls = _interopRequireDefault(require("../../../_utils/hooks/usePrefixCls"));
-
 var _classnames3 = _interopRequireDefault(require("classnames"));
-
 var _lodash = _interopRequireDefault(require("lodash"));
-
 var _utils = require("../../utils");
-
 var _message = _interopRequireDefault(require("../../../message"));
-
 var _excluded = ["style"];
-
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 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 ARRAY_FIRST_INDEX = 0;
-
 function TableHead(props) {
   var headerGroups = props.headerGroups,
-      canResizeColumn = props.canResizeColumn,
-      defaultSort = props.defaultSort,
-      _props$sortable = props.sortable,
-      sortable = _props$sortable === void 0 ? false : _props$sortable,
-      _props$columns = props.columns,
-      columns = _props$columns === void 0 ? [{
-    accessor: '',
-    sortOrder: 'descend'
-  }] : _props$columns,
-      allSortDirections = props.sortDirections,
-      setSortBy = props.setSortBy,
-      _props$onChange = props.onChange,
-      onChange = _props$onChange === void 0 ? function () {} : _props$onChange,
-      columnsWidthMapRef = props.columnsWidthMapRef,
-      columnsTotalWidthRef = props.columnsTotalWidthRef;
-  var prefixCls = (0, _usePrefixCls.default)('', 'ald-table'); // 第一列的情况 默认或者恢复是需要用到
-
+    canResizeColumn = props.canResizeColumn,
+    defaultSort = props.defaultSort,
+    _props$sortable = props.sortable,
+    sortable = _props$sortable === void 0 ? false : _props$sortable,
+    _props$columns = props.columns,
+    columns = _props$columns === void 0 ? [{
+      accessor: '',
+      sortOrder: 'descend'
+    }] : _props$columns,
+    allSortDirections = props.sortDirections,
+    setSortBy = props.setSortBy,
+    _props$onChange = props.onChange,
+    onChange = _props$onChange === void 0 ? function () {} : _props$onChange,
+    columnsWidthMapRef = props.columnsWidthMapRef,
+    columnsTotalWidthRef = props.columnsTotalWidthRef;
+  var prefixCls = (0, _usePrefixCls.default)('', 'ald-table');
+  // 第一列的情况 默认或者恢复是需要用到
   var defaultSortObject = {
     id: columns[ARRAY_FIRST_INDEX].accessor,
     desc: !!(columns[ARRAY_FIRST_INDEX].sortOrder && columns[ARRAY_FIRST_INDEX].sortOrder === 'descend')
-  }; // 如果支持排序
+  };
+  // 如果支持排序
   // 1. 有默认排序 则按照默认排序
   // 2. 如果没有默认排序，再判断第一列是否符合排序条件，若满足 => 则按第一列排序
-
   var getInitialSortDirection = function getInitialSortDirection() {
     if (defaultSort && defaultSort.id) {
       return defaultSort;
     }
-
     if (!defaultSortObject.id) {
       _message.default.error('开启了排序，但是没有给予默认排序列，并且第一列不支持排序');
     }
-
     return defaultSortObject;
   };
-
   var _useState = (0, _react.useState)(getInitialSortDirection()),
-      _useState2 = _slicedToArray(_useState, 2),
-      sortDirection = _useState2[0],
-      setSortDirection = _useState2[1]; // 排序的方向 倒叙{ id: 'xx', desc: true }、正序{ id: 'xx', desc: false }、无序 { id: '', desc: undefined }
+    _useState2 = _slicedToArray(_useState, 2),
+    sortDirection = _useState2[0],
+    setSortDirection = _useState2[1];
+  // 排序的方向 倒叙{ id: 'xx', desc: true }、正序{ id: 'xx', desc: false }、无序 { id: '', desc: undefined }
   // 获取排序方向以及排序的id
-
-
   var getSortBy = function getSortBy(id) {
     var sortDirections = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['ascend', 'descend'];
-    var // 如果传了sortDirections，则使用传入的，否则使用默认的
+    var
+    // 如果传了sortDirections，则使用传入的，否则使用默认的
     sortOrder = arguments.length > 2 ? arguments[2] : undefined;
     var res = {
       id: id,
-      desc: undefined
+      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 || descMap.get(directions[ARRAY_FIRST_INDEX]);
       }
-
       return res;
-    } // 如果是同一列
+    }
+    // 如果是同一列
     // 如果列给了默认的sortOrder则不在变化
-
-
     if (sortOrder === 'ascend' || sortOrder === 'descend') {
       res.desc = descMap.get(sortOrder);
       return res;
-    } // 在所有方向上 往后取一个
-
-
+    }
+    // 在所有方向上 往后取一个
     var lastSortDirection = sortDirection.desc ? 'descend' : 'ascend';
-
     var index = _lodash.default.findIndex(directions, function (item) {
       return item === lastSortDirection;
     });
-
     var nextIndex = index + 1;
-    res.desc = 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,
-        canSort = column.canSort,
-        sorter = column.sorter,
-        sortOrder = column.sortOrder,
-        sortDirections = column.sortDirections;
-    var toggleProps = column.getSortByToggleProps(); // 仅在Table设置sortable时,所有列的canSort为true,此时为前端排序
-
+      canSort = column.canSort,
+      sorter = column.sorter,
+      sortOrder = column.sortOrder,
+      sortDirections = column.sortDirections;
+    var toggleProps = column.getSortByToggleProps();
+    // 仅在Table设置sortable时,所有列的canSort为true,此时为前端排序
     if (canSort) {
       // client sort
       return _objectSpread(_objectSpread({}, column.getHeaderProps(_objectSpread({}, toggleProps))), {}, {
         onClick: function onClick(e) {
           e.stopPropagation();
-
           if (typeof toggleProps.onClick === 'function') {
             var sortBy = getSortBy(id, sortDirections, sortOrder);
             setSortBy(sortBy.desc === undefined ? [defaultSortObject] : [sortBy]); // 客户端排序时 需要重新设置排序
-
             setSortDirection(sortBy);
             onChange(sortBy);
           }
         }
       });
-    } // 当列设置sorter属性时，则为服务端排序
-
-
+    }
+    // 当列设置sorter属性时，则为服务端排序
     if (sorter) {
       // server sort
       return _objectSpread(_objectSpread({}, column.getHeaderProps({
@@ -190,19 +153,15 @@ function TableHead(props) {
         }
       });
     }
-
     return column.getHeaderProps();
   };
-
   var SortIcons = function SortIcons(_ref) {
     var id = _ref.id;
     var currentSortId = sortDirection.id,
-        desc = sortDirection.desc;
-
+      desc = sortDirection.desc;
     if (id !== currentSortId || !sortable) {
       return null;
     }
-
     return desc ? /*#__PURE__*/_react.default.createElement(_SortDescendingLine2.default, {
       className: "".concat(prefixCls, "-sortIcon"),
       fill: "currentColor",
@@ -212,14 +171,11 @@ function TableHead(props) {
       fill: "currentColor",
       size: 12
     });
-  }; // 在页面拖拽完成之后 更新表格整体宽度以及每个列对应的列宽map
-
-
+  };
+  // 在页面拖拽完成之后 更新表格整体宽度以及每个列对应的列宽map
   var adjustColumnsMapAfterDrag = function adjustColumnsMapAfterDrag(key, width) {
     var _columnsWidthMapRef$c, _columnsWidthMapRef$c2;
-
     var newMap = _lodash.default.cloneDeep(columnsWidthMapRef.current);
-
     var originWidth = (_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;
     var newWidth = (0, _utils.getValidWidthByNumber)(width);
     newMap.set(key, {
@@ -229,24 +185,18 @@ function TableHead(props) {
     columnsWidthMapRef.current = newMap;
     columnsTotalWidthRef.current = columnsTotalWidthRef.current - originWidth + newWidth;
   };
-
   var handleStyleAndReturn = function handleStyleAndReturn(column, index) {
     var _columnsWidthMapRef$c3, _getHeaderProps$style, _getHeaderProps$style2;
-
     var key = index.toString();
     var lastColumnsMapWidth = (_columnsWidthMapRef$c3 = columnsWidthMapRef.current.get(key)) === null || _columnsWidthMapRef$c3 === void 0 ? void 0 : _columnsWidthMapRef$c3.width; // 在拖动之前记录宽度map
-
     var currentRenderWidth = Number((_getHeaderProps$style = getHeaderProps(column).style) === null || _getHeaderProps$style === void 0 ? void 0 : (_getHeaderProps$style2 = _getHeaderProps$style.width) === null || _getHeaderProps$style2 === void 0 ? void 0 : _getHeaderProps$style2.toString().replace('px', '')); // 表格内置计算的宽度 'px'
-
     if (currentRenderWidth !== lastColumnsMapWidth) {
       adjustColumnsMapAfterDrag(key, currentRenderWidth);
     }
-
     return _objectSpread(_objectSpread({}, getHeaderProps(column).style), {}, {
       width: (0, _utils.getValidWidthByNumber)(currentRenderWidth)
     });
   };
-
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "".concat(prefixCls, "-thead"),
     style: {
@@ -254,10 +204,9 @@ function TableHead(props) {
     }
   }, headerGroups.map(function (headerGroup) {
     var _headerGroup$getHeade = headerGroup.getHeaderGroupProps(),
-        style = _headerGroup$getHeade.style,
-        headerGroupProps = _objectWithoutProperties(_headerGroup$getHeade, _excluded);
-
-    return /*#__PURE__*/_react.default.createElement("div", Object.assign({}, headerGroupProps, {
+      style = _headerGroup$getHeade.style,
+      headerGroupProps = _objectWithoutProperties(_headerGroup$getHeade, _excluded);
+    return /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, headerGroupProps), {}, {
       className: "".concat(prefixCls, "-row")
     }), headerGroup.headers.map(function (column, index) {
       var barProps = canResizeColumn ? column.getResizerProps() : {};
@@ -266,20 +215,19 @@ function TableHead(props) {
         className: (0, _classnames3.default)(_defineProperty({}, "".concat(prefixCls, "-cell-sorting"), column.id === sortDirection.id), "".concat(prefixCls, "-cell")),
         style: headCellStyle,
         key: column.id
-      }, /*#__PURE__*/_react.default.createElement("div", Object.assign({
+      }, /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({
         className: "".concat(prefixCls, "-cell-content")
-      }, getHeaderProps(column), {
+      }, getHeaderProps(column)), {}, {
         style: {
           width: '100%'
         }
       }), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, column.render('Header'), /*#__PURE__*/_react.default.createElement(SortIcons, {
         id: column.id
-      }))), /*#__PURE__*/_react.default.createElement("div", Object.assign({}, barProps, {
+      }))), /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, barProps), {}, {
         className: (0, _classnames3.default)(_defineProperty({}, "".concat(prefixCls, "-dragBar"), canResizeColumn), "".concat(prefixCls, "-bar"))
       })));
     }));
   }));
 }
-
 var _default = TableHead;
 exports.default = _default;

package/lib/Table/index.js

@@ -4,10 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _Table = _interopRequireDefault(require("./Table"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _default = _Table.default;
 exports.default = _default;

package/lib/Table/interface.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { IdType } from 'react-table';
-export declare type TSortOrder = 'ascend' | 'descend' | false;
+export type TSortOrder = 'ascend' | 'descend' | false;
 export interface ISort<T> {
     id: IdType<T>;
     desc?: boolean;

package/lib/Table/style/index.js

@@ -1,5 +1,4 @@
 "use strict";
 
 require("../../style");
-
 require("./index.less");

package/lib/Table/style/index.less

@@ -24,15 +24,19 @@
   }
 
   &-inner-wrap {
+    position: relative;
     width: 100%;
     height: 100%;
     overflow-x: overlay;
   }
 
   &-tableHeadScrollWrap {
+    position: sticky;
+    top: 0;
+    z-index: 1;
     display: flex;
     width: 100%;
-    overflow-x: hidden;
+    overflow: hidden;
   }
 
   &-cell {
@@ -67,6 +71,7 @@
     .ald-table-row {
       min-width: 9999px; // 防止拖动时的闪动
       height: @table-head-row-height;
+      background-color: @BG95;
     }
 
     .ald-table-cell {
@@ -74,7 +79,6 @@
       padding: 14px 24px;
       color: @NL50;
       line-height: 20px;
-      background-color: @BG95;
 
       .ald-table-cell-content {
         overflow: hidden;
@@ -146,8 +150,8 @@
     }
   }
 
-  &-tbody&-tbody-innerScroll {
-    overflow: hidden;
+  &-innerScroll {
+    overflow-y: overlay;
   }
 
   &-row-list-wrap {