@hi-ui/table 4.0.0-beta.9 → 4.0.2

package/lib/cjs/TableRow.js

@@ -2,7 +2,7 @@
  * @hi-ui/table
  * https://github.com/XiaoMi/hiui/tree/master/packages/ui/table#readme
  *
- * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
+ * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -48,11 +48,12 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var _role = 'table';
 
 var _prefix = classname.getPrefixCls(_role);
+
+var EMBED_ON_ROW_PROPS = {};
 /**
  * TODO: What is TableRow
  */
 
-
 var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _ref$prefixCls = _ref.prefixCls,
       prefixCls = _ref$prefixCls === void 0 ? _prefix : _ref$prefixCls,
@@ -63,13 +64,14 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       isAvgRow = _ref.isAvgRow;
 
   var _useTableContext = context.useTableContext(),
+      striped = _useTableContext.striped,
+      showRowHighlight = _useTableContext.showRowHighlight,
       onHighlightedRowChange = _useTableContext.onHighlightedRowChange,
       isHighlightedRow = _useTableContext.isHighlightedRow,
       flattedColumnsWithoutChildren = _useTableContext.flattedColumnsWithoutChildren,
       isErrorRow = _useTableContext.isErrorRow,
       columns = _useTableContext.columns,
       embedExpandable = _useTableContext.embedExpandable,
-      hoverRow = _useTableContext.hoverRow,
       draggable = _useTableContext.draggable,
       onDragStartContext = _useTableContext.onDragStart,
       onDragLeaveContext = _useTableContext.onDragLeave,
@@ -81,16 +83,16 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var rowData = rowDataProp.raw,
       rowId = rowDataProp.id; // ** ************** 拖拽管理 *************** *//
 
-  var _React$useState = React__default['default'].useState(false),
+  var _React$useState = React__default["default"].useState(false),
       dragging = _React$useState[0],
       setDragging = _React$useState[1];
 
-  var _React$useState2 = React__default['default'].useState(),
+  var _React$useState2 = React__default["default"].useState(),
       dragDirection = _React$useState2[0],
       setDragDirection = _React$useState2[1];
 
   var onDragStartContextLatest = useLatest.useLatestCallback(onDragStartContext);
-  var onDragStart = React__default['default'].useCallback(function (evt) {
+  var onDragStart = React__default["default"].useCallback(function (evt) {
     if (!draggable) return;
     evt.stopPropagation();
     var clientY = evt.clientY;
@@ -107,7 +109,7 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       dragNode: rowData
     });
   }, [draggable, dragRowRef, onDragStartContextLatest, rowData, rowId]);
-  var onDragOver = React__default['default'].useCallback(function (evt) {
+  var onDragOver = React__default["default"].useCallback(function (evt) {
     if (!draggable) return;
     evt.preventDefault();
     evt.stopPropagation();
@@ -125,7 +127,7 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     }
   }, [draggable, dragRowRef, rowId]);
   var onDragLeaveContextLatest = useLatest.useLatestCallback(onDragLeaveContext);
-  var onDragLeave = React__default['default'].useCallback(function (evt) {
+  var onDragLeave = React__default["default"].useCallback(function (evt) {
     if (!draggable) return;
     evt.preventDefault();
     evt.stopPropagation();
@@ -133,7 +135,7 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     onDragLeaveContextLatest(evt);
   }, [draggable, onDragLeaveContextLatest]);
   var onDragEndContextLatest = useLatest.useLatestCallback(onDragEndContext);
-  var onDragEnd = React__default['default'].useCallback(function (evt) {
+  var onDragEnd = React__default["default"].useCallback(function (evt) {
     if (!draggable) return;
     evt.preventDefault();
     evt.stopPropagation();
@@ -145,7 +147,7 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   }, [draggable, dragRowRef, onDragEndContextLatest]);
   var onDropContextLatest = useLatest.useLatestCallback(onDropContext); // 放置目标元素时触发事件
 
-  var onDrop = React__default['default'].useCallback(function (evt) {
+  var onDrop = React__default["default"].useCallback(function (evt) {
     if (!draggable) return;
     if (!dragRowRef.current) return;
     var dragId = dragRowRef.current.dragId;
@@ -167,14 +169,13 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   }, [draggable, dragRowRef, onDropContextLatest, dragDirection, rowId]); // ** ************** 行状态管理 *************** *//
 
   var highlighted = isHighlightedRow(rowId);
-  var hovered = hoverRow === rowId;
   var hasError = isErrorRow(rowId);
-  var cls = classname.cx(prefixCls + "-row", hasError && prefixCls + "-row--error", hovered && prefixCls + "-row--hovered", highlighted && prefixCls + "-row--highlight", draggable && prefixCls + "-row--draggable", draggable && dragging && prefixCls + "-row--dragging", draggable && dragDirection && prefixCls + "-row--drag-" + dragDirection, isSumRow && prefixCls + "-row--total", isAvgRow && prefixCls + "-row--avg");
+  var cls = classname.cx(prefixCls + "-row", showRowHighlight && prefixCls + "-row--hover", striped && (rowIndex & 1) === 1 && prefixCls + "-row--striped", hasError && prefixCls + "-row--error", highlighted && prefixCls + "-row--highlight", draggable && prefixCls + "-row--draggable", draggable && dragging && prefixCls + "-row--dragging", draggable && dragDirection && prefixCls + "-row--drag-" + dragDirection, isSumRow && prefixCls + "-row--total", isAvgRow && prefixCls + "-row--avg");
   var firstColumn = flattedColumnsWithoutChildren.find(function (item) {
     return item.dataKey !== Table.SELECTION_DATA_KEY && item.dataKey !== BaseTable.EMBED_DATA_KEY;
   });
-  var rowExtraProps = typeAssertion.isFunction(onRow) ? onRow() : {};
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("tr", Object.assign({
+  var rowExtraProps = typeAssertion.isFunction(onRow) ? onRow(isSumRow || isAvgRow ? null : rowData, rowIndex) : EMBED_ON_ROW_PROPS;
+  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("tr", Object.assign({
     ref: ref,
     className: cls,
     key: "row"
@@ -184,7 +185,7 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
         rowExtraProps.onDoubleClick(evt);
       }
 
-      onHighlightedRowChange(rowData, !highlighted);
+      onHighlightedRowChange(rowDataProp, !highlighted);
     },
     draggable: domUtils.setAttrAria(draggable),
     onDragStart: onDragStart,
@@ -193,7 +194,7 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     onDragLeave: onDragLeave,
     onDrop: onDrop
   }), flattedColumnsWithoutChildren.map(function (column, idx) {
-    return /*#__PURE__*/React__default['default'].createElement(TableCell.TableCell, {
+    return /*#__PURE__*/React__default["default"].createElement(TableCell.TableCell, {
       key: idx,
       column: column,
       isSwitcherCol: firstColumn ? firstColumn.id === column.id : false,
@@ -201,7 +202,7 @@ var TableRow = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       rowIndex: rowIndex,
       expandedTree: expandedTree
     });
-  })), embedExpandable ? /*#__PURE__*/React__default['default'].createElement(TableEmbedRow.TableEmbedRow, {
+  })), embedExpandable ? /*#__PURE__*/React__default["default"].createElement(TableEmbedRow.TableEmbedRow, {
     colSpan: columns.length,
     rowData: rowDataProp,
     rowIndex: rowIndex
@@ -213,4 +214,3 @@ if (env.__DEV__) {
 }
 
 exports.TableRow = TableRow;
-//# sourceMappingURL=TableRow.js.map

package/lib/cjs/TableSettingMenu.js

@@ -2,7 +2,7 @@
  * @hi-ui/table
  * https://github.com/XiaoMi/hiui/tree/master/packages/ui/table#readme
  *
- * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
+ * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -33,11 +33,11 @@ var useToggle = require('@hi-ui/use-toggle');
 
 var useLatest = require('@hi-ui/use-latest');
 
-var localeContext = require('@hi-ui/locale-context');
+var core = require('@hi-ui/core');
 
-var index$1 = require('./utils/func-utils/lib/esm/index.js');
+var funcUtils = require('@hi-ui/func-utils');
 
-var index = require('./hooks/use-drag-sorter/lib/esm/index.js');
+var useDragSorter = require('@hi-ui/use-drag-sorter');
 
 var drawer = require('@hi-ui/drawer');
 
@@ -65,31 +65,31 @@ var TableSettingMenu = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _ref$prefixCls = _ref.prefixCls,
       prefixCls = _ref$prefixCls === void 0 ? _prefix : _ref$prefixCls,
       sortedCols = _ref.sortedCols,
-      setSortCols = _ref.setSortCols,
+      setSortColKeys = _ref.setSortColKeys,
       cacheSortedCols = _ref.cacheSortedCols,
       setCacheSortedCols = _ref.setCacheSortedCols,
       hiddenColKeys = _ref.hiddenColKeys,
       setHiddenColKeys = _ref.setHiddenColKeys,
       cacheHiddenColKeys = _ref.cacheHiddenColKeys,
       setCacheHiddenColKeys = _ref.setCacheHiddenColKeys;
-  var i18n = localeContext.useLocaleContext();
-  var dropProps = index.useDrop({
+  var i18n = core.useLocaleContext();
+  var dropProps = useDragSorter.useDrop({
     draggable: true,
     idFieldName: 'dataKey',
     onSwap: function onSwap(dragItem, dropItem, direction, info) {
-      return tslib.__awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+      return tslib.__awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
+        return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 setCacheSortedCols(function (prev) {
-                  var nextCacheSortColKeys = [].concat(prev);
+                  var nextCacheSortCols = [].concat(prev);
 
-                  var _nextCacheSortColKeys = nextCacheSortColKeys.splice(info.dragIndex, 1),
-                      removed = _nextCacheSortColKeys[0];
+                  var _nextCacheSortCols$sp = nextCacheSortCols.splice(info.dragIndex, 1),
+                      removed = _nextCacheSortCols$sp[0];
 
-                  nextCacheSortColKeys.splice(info.dropIndex, 0, removed);
-                  return nextCacheSortColKeys;
+                  nextCacheSortCols.splice(info.dropIndex, 0, removed);
+                  return nextCacheSortCols;
                 });
                 return _context.abrupt("return", true);
 
@@ -124,38 +124,41 @@ var TableSettingMenu = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var onConfirm = function onConfirm() {
     // 触发 table 更新列显隐及排序
     setHiddenColKeys(cacheHiddenColKeys);
-    setSortCols(cacheSortedCols);
+    setSortColKeys(cacheSortedCols.map(function (col) {
+      return col.dataKey;
+    }));
     menuVisibleAction.off();
   };
 
   var cls = classname.cx(prefixCls);
-  return /*#__PURE__*/React__default['default'].createElement("div", {
+  return /*#__PURE__*/React__default["default"].createElement("div", {
     ref: ref,
     className: cls
-  }, /*#__PURE__*/React__default['default'].createElement(iconButton.IconButton, {
-    icon: /*#__PURE__*/React__default['default'].createElement(icons.SettingOutlined, null),
+  }, /*#__PURE__*/React__default["default"].createElement(iconButton.IconButton, {
+    icon: /*#__PURE__*/React__default["default"].createElement(icons.EllipsisVerticalOutlined, null),
     onClick: menuVisibleAction.not
-  }), /*#__PURE__*/React__default['default'].createElement(drawer.Drawer, {
+  }), /*#__PURE__*/React__default["default"].createElement(drawer.Drawer, {
     className: prefixCls + "__drawer",
     title: i18n.get('table.fieldExplorer'),
     visible: menuVisible,
     onClose: menuVisibleAction.off,
-    footer: /*#__PURE__*/React__default['default'].createElement("div", {
+    width: 304,
+    footer: /*#__PURE__*/React__default["default"].createElement("div", {
       className: prefixCls + "__btn-group"
-    }, /*#__PURE__*/React__default['default'].createElement(button.Button, {
+    }, /*#__PURE__*/React__default["default"].createElement(button.Button, {
       key: 0,
       className: prefixCls + "__btn-cancel",
       onClick: resetLatest
-    }, i18n.get('table.reset')), /*#__PURE__*/React__default['default'].createElement(button.Button, {
+    }, i18n.get('table.reset')), /*#__PURE__*/React__default["default"].createElement(button.Button, {
       key: 1,
       className: prefixCls + "__btn-confirm",
       onClick: onConfirm,
       type: "primary"
     }, i18n.get('table.confirm')))
-  }, /*#__PURE__*/React__default['default'].createElement("div", {
+  }, /*#__PURE__*/React__default["default"].createElement("div", {
     className: prefixCls + "__content"
   }, cacheSortedCols.map(function (col, index) {
-    return /*#__PURE__*/React__default['default'].createElement(TableSettingMenuItem, {
+    return /*#__PURE__*/React__default["default"].createElement(TableSettingMenuItem, {
       key: col.dataKey,
       prefixCls: prefixCls,
       column: col,
@@ -177,13 +180,13 @@ function TableSettingMenuItem(_ref2) {
       cacheHiddenColKeys = _ref2.cacheHiddenColKeys,
       setCacheHiddenColKeys = _ref2.setCacheHiddenColKeys,
       dropProps = _ref2.dropProps,
-      index$2 = _ref2.index;
+      index = _ref2.index;
   var dataKey = column.dataKey,
       title = column.title;
 
-  var _useDrag = index.useDrag(Object.assign(Object.assign({}, dropProps), {
+  var _useDrag = useDragSorter.useDrag(Object.assign(Object.assign({}, dropProps), {
     item: column,
-    index: index$2,
+    index: index,
     idFieldName: 'dataKey',
     dataTransferKey: 'table-setting-data'
   })),
@@ -192,16 +195,11 @@ function TableSettingMenuItem(_ref2) {
       getDragTriggerProps = _useDrag.getDragTriggerProps,
       getDropTriggerProps = _useDrag.getDropTriggerProps;
 
-  return /*#__PURE__*/React__default['default'].createElement("div", Object.assign({
+  return /*#__PURE__*/React__default["default"].createElement("div", Object.assign({
     className: classname.cx(prefixCls + "-item", dragging && prefixCls + "-item--dragging", direction && prefixCls + "-item--direction-" + direction)
-  }, getDragTriggerProps(), getDropTriggerProps()), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, getDragTriggerProps(), getDropTriggerProps()), /*#__PURE__*/React__default["default"].createElement("div", {
     className: prefixCls + "-item__wrap"
-  }, /*#__PURE__*/React__default['default'].createElement("div", {
-    style: {
-      display: 'flex',
-      alignItems: 'center'
-    }
-  }, /*#__PURE__*/React__default['default'].createElement(Checkbox.Checkbox, {
+  }, /*#__PURE__*/React__default["default"].createElement(Checkbox.Checkbox, {
     checked: !cacheHiddenColKeys.includes(dataKey),
     onChange: function onChange(evt) {
       var shouldChecked = evt.target.checked;
@@ -210,13 +208,7 @@ function TableSettingMenuItem(_ref2) {
       }) : cacheHiddenColKeys.concat(dataKey);
       setCacheHiddenColKeys(nextCacheHiddenColKeys);
     }
-  }), /*#__PURE__*/React__default['default'].createElement("span", {
-    style: {
-      display: 'inline-block',
-      marginLeft: 9
-    }
-  }, index$1.runIfFunc(title))), /*#__PURE__*/React__default['default'].createElement(icons.MenuOutlined, null)));
+  }, /*#__PURE__*/React__default["default"].createElement("span", null, funcUtils.runIfFunc(title))), /*#__PURE__*/React__default["default"].createElement(icons.MoveOutlined, null)));
 }
 
 exports.TableSettingMenu = TableSettingMenu;
-//# sourceMappingURL=TableSettingMenu.js.map

package/lib/cjs/context.js

@@ -2,7 +2,7 @@
  * @hi-ui/table
  * https://github.com/XiaoMi/hiui/tree/master/packages/ui/table#readme
  *
- * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
+ * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -30,4 +30,3 @@ var useTableContext = function useTableContext() {
 
 exports.TableProvider = TableProvider;
 exports.useTableContext = useTableContext;
-//# sourceMappingURL=context.js.map

package/lib/cjs/hooks/use-async-switch.js

@@ -2,7 +2,7 @@
  * @hi-ui/table
  * https://github.com/XiaoMi/hiui/tree/master/packages/ui/table#readme
  *
- * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
+ * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -39,9 +39,9 @@ var useAsyncSwitch = function useAsyncSwitch(setCascaderData, onExpand, onLoadCh
   var onLoadChildrenLatest = useLatest.useLatestCallback(onLoadChildren); // 加载节点
 
   var loadChildren = React.useCallback(function (node) {
-    return tslib.__awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+    return tslib.__awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee() {
       var childrenNodes;
-      return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+      return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
@@ -79,9 +79,9 @@ var useAsyncSwitch = function useAsyncSwitch(setCascaderData, onExpand, onLoadCh
       onlyExpand = false;
     }
 
-    return tslib.__awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
+    return tslib.__awaiter(void 0, void 0, void 0, /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee2() {
       var id, children, isLeaf;
-      return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
+      return _regeneratorRuntime__default["default"].wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
@@ -142,4 +142,3 @@ var useAsyncSwitch = function useAsyncSwitch(setCascaderData, onExpand, onLoadCh
 };
 
 exports.useAsyncSwitch = useAsyncSwitch;
-//# sourceMappingURL=use-async-switch.js.map

package/lib/cjs/hooks/use-check.js

@@ -2,7 +2,7 @@
  * @hi-ui/table
  * https://github.com/XiaoMi/hiui/tree/master/packages/ui/table#readme
  *
- * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
+ * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -35,7 +35,7 @@ var useTableCheck = function useTableCheck(_ref) {
   var rowSelection = _ref.rowSelection,
       flattedData = _ref.flattedData,
       fieldKey = _ref.fieldKey;
-  var checkRowIsDisabledCheckbox = React__default['default'].useCallback(function (rowItem) {
+  var checkRowIsDisabledCheckbox = React__default["default"].useCallback(function (rowItem) {
     var checkboxConfig = rowSelection && rowSelection.getCheckboxConfig && rowSelection.getCheckboxConfig(rowItem);
     return checkboxConfig && checkboxConfig.disabled || false;
   }, [rowSelection]);
@@ -54,21 +54,28 @@ var useTableCheck = function useTableCheck(_ref) {
       isCheckedRowKey = _useCheck[1]; // 判断是否全选
 
 
-  var _React$useMemo = React__default['default'].useMemo(function () {
+  var _React$useMemo = React__default["default"].useMemo(function () {
     if (rowSelection) {
       if (flattedData.length === 0 || checkedRowKeys.length === 0) {
         return [false, false];
       }
 
-      var _checkedAll = flattedData.filter(function (item) {
+      var idsCanBeChecked = flattedData.filter(function (item) {
         return !checkRowIsDisabledCheckbox(item.raw);
-      }) // TODO: 数组项完全匹配工具函数
-      . // TODO: 数组项完全匹配工具函数
-      every(function (item) {
-        return isCheckedRowKey(item.id);
+      }).map(function (item) {
+        return item.id;
+      }); // TODO: 数组项完全匹配工具函数
+      // TODO: 数组项完全匹配工具函数
+
+      var _checkedAll = idsCanBeChecked.every(function (id) {
+        return isCheckedRowKey(id);
+      });
+
+      var _semiChecked = _checkedAll ? false : checkedRowKeys.length > 0 && idsCanBeChecked.some(function (id) {
+        return isCheckedRowKey(id);
       });
 
-      return [_checkedAll, _checkedAll ? false : checkedRowKeys.length > 0];
+      return [_checkedAll, _semiChecked];
     }
 
     return [false, false];
@@ -76,19 +83,35 @@ var useTableCheck = function useTableCheck(_ref) {
       checkedAll = _React$useMemo[0],
       semiChecked = _React$useMemo[1];
 
-  var tryCheckAllRow = React__default['default'].useCallback(function () {
-    if (checkedAll) {
-      trySetCheckedRowKeys([], [], false);
-      return;
-    }
-
+  var tryCheckAllRow = React__default["default"].useCallback(function () {
     var targetItems = flattedData.filter(function (item) {
       return !checkRowIsDisabledCheckbox(item.raw);
     });
     var checkedRowKeys = targetItems.map(function (item) {
       return item.id;
     });
-    trySetCheckedRowKeys(checkedRowKeys, targetItems, true);
+    var targetRowItems = targetItems.map(function (item) {
+      return item.raw;
+    });
+    var checkedRowKeysSet = new Set(checkedRowKeys);
+
+    if (checkedAll) {
+      // 移除当前页所有行 ids
+      trySetCheckedRowKeys(function (prev) {
+        return prev.filter(function (id) {
+          return !checkedRowKeysSet.has(id);
+        });
+      }, targetRowItems, false);
+      return;
+    }
+
+    trySetCheckedRowKeys( // 添加当前页所有行 ids
+    function (prev) {
+      prev.forEach(function (id) {
+        return checkedRowKeysSet.add(id);
+      });
+      return Array.from(checkedRowKeysSet);
+    }, targetRowItems, true);
   }, [trySetCheckedRowKeys, flattedData, checkRowIsDisabledCheckbox, checkedAll]);
   return {
     tryCheckAllRow: tryCheckAllRow,
@@ -103,4 +126,3 @@ var useTableCheck = function useTableCheck(_ref) {
 };
 
 exports.useTableCheck = useTableCheck;
-//# sourceMappingURL=use-check.js.map

package/lib/cjs/hooks/use-col-hidden.js

@@ -2,7 +2,7 @@
  * @hi-ui/table
  * https://github.com/XiaoMi/hiui/tree/master/packages/ui/table#readme
  *
- * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
+ * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -73,4 +73,3 @@ var useColHidden = function useColHidden(_ref) {
 };
 
 exports.useColHidden = useColHidden;
-//# sourceMappingURL=use-col-hidden.js.map

package/lib/cjs/hooks/use-col-sorter.js

@@ -2,7 +2,7 @@
  * @hi-ui/table
  * https://github.com/XiaoMi/hiui/tree/master/packages/ui/table#readme
  *
- * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
+ * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -17,6 +17,10 @@ var React = require('react');
 
 var useUpdateEffect = require('@hi-ui/use-update-effect');
 
+var useUncontrolledState = require('@hi-ui/use-uncontrolled-state');
+
+var useLatest = require('@hi-ui/use-latest');
+
 var index = require('../utils/index.js');
 
 var DEFAULT_COLUMNS = [];
@@ -27,38 +31,59 @@ var DEFAULT_COLUMNS = [];
 var useColSorter = function useColSorter(_ref) {
   var uniqueId = _ref.uniqueId,
       _ref$columns = _ref.columns,
-      columns = _ref$columns === void 0 ? DEFAULT_COLUMNS : _ref$columns;
+      columns = _ref$columns === void 0 ? DEFAULT_COLUMNS : _ref$columns,
+      sortedColKeysProp = _ref.sortedColKeys,
+      onSortedColKeysChange = _ref.onSortedColKeysChange;
   var cacheKey = uniqueId ? uniqueId + "_sortCols" : '';
 
-  var _useState = React.useState(function () {
+  var _useUncontrolledState = useUncontrolledState.useUncontrolledState(function () {
     return index.parseLocalArray({
       key: cacheKey,
-      defaultValue: columns
+      defaultValue: columns.map(function (column) {
+        return column.dataKey;
+      })
     });
-  }),
-      sortedCols = _useState[0],
-      setSortCols = _useState[1];
+  }, sortedColKeysProp, onSortedColKeysChange),
+      sortedColKeys = _useUncontrolledState[0],
+      setSortColKeys = _useUncontrolledState[1];
 
+  useUpdateEffect.useUpdateEffect(function () {
+    // 当column发生改变的时候，同步 setting 的 sortedCols 设置
+    setSortColKeys(columns.map(function (column) {
+      return column.dataKey;
+    }));
+  }, [columns]);
+  var columnsLatestRef = useLatest.useLatestRef(columns);
+  var sortedCols = React.useMemo(function () {
+    var columnsMap = columnsLatestRef.current.reduce(function (prev, cur) {
+      prev[cur.dataKey] = cur;
+      return prev;
+    }, {});
+    return sortedColKeys.map(function (colKey) {
+      return columnsMap[colKey];
+    }).filter(Boolean);
+  }, [sortedColKeys, columnsLatestRef]);
   React.useEffect(function () {
     if (!cacheKey) return;
-    window.localStorage.setItem(cacheKey, JSON.stringify(sortedCols));
-  }, [cacheKey, sortedCols]); // 用于维护列操作时排序临时状态（（未确认保存时））
+    window.localStorage.setItem(cacheKey, JSON.stringify(sortedColKeys));
+  }, [cacheKey, sortedColKeys]); // 用于维护列操作时排序临时状态（（未确认保存时））
 
-  var _useState2 = React.useState(sortedCols),
-      cacheSortedCols = _useState2[0],
-      setCacheSortedCols = _useState2[1];
+  var _useState = React.useState(sortedCols),
+      _cacheSortedCols = _useState[0],
+      setCacheSortedCols = _useState[1]; // 保证排序的 column，是有效的可展示的列
 
-  useUpdateEffect.useUpdateEffect(function () {
-    // 当column发生改变的时候，同步 setting 的 sortedCols 设置
-    setSortCols(columns);
-  }, [columns]);
+
+  var cacheSortedCols = React.useMemo(function () {
+    return _cacheSortedCols.filter(function (col) {
+      return col && typeof col.dataKey === 'string' && col.dataKey !== '';
+    });
+  }, [_cacheSortedCols]);
   return {
     sortedCols: sortedCols,
-    setSortCols: setSortCols,
+    setSortColKeys: setSortColKeys,
     cacheSortedCols: cacheSortedCols,
     setCacheSortedCols: setCacheSortedCols
   };
 };
 
 exports.useColSorter = useColSorter;
-//# sourceMappingURL=use-col-sorter.js.map

package/lib/cjs/hooks/use-col-width.js

@@ -2,7 +2,7 @@
  * @hi-ui/table
  * https://github.com/XiaoMi/hiui/tree/master/packages/ui/table#readme
  *
- * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
+ * Copyright (c) HiUI <mi-hiui@xiaomi.com>.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -33,7 +33,7 @@ var useColWidth = function useColWidth(_ref) {
   var columns = _ref.columns;
   var measureRowElementRef = React.useRef(null);
 
-  var _React$useState = React__default['default'].useState(function () {
+  var _React$useState = React__default["default"].useState(function () {
     return index.getGroupItemWidth(columns);
   }),
       colWidths = _React$useState[0],
@@ -46,7 +46,7 @@ var useColWidth = function useColWidth(_ref) {
    * 根据实际内容区（table 的第一行）渲染，再次精确收集并设置每列宽度
    */
 
-  React__default['default'].useEffect(function () {
+  React__default["default"].useEffect(function () {
     var measureRowElement = measureRowElementRef.current;
 
     if (measureRowElement) {
@@ -70,7 +70,7 @@ var useColWidth = function useColWidth(_ref) {
     return function () {};
   }, []);
 
-  var _React$useState2 = React__default['default'].useState(null),
+  var _React$useState2 = React__default["default"].useState(null),
       headerTableElement = _React$useState2[0],
       setHeaderTableElement = _React$useState2[1];
   /**
@@ -78,7 +78,7 @@ var useColWidth = function useColWidth(_ref) {
    */
 
 
-  var minColWidth = React__default['default'].useMemo(function () {
+  var minColWidth = React__default["default"].useMemo(function () {
     if (headerTableElement && headerTableElement.childNodes && headerTableElement.childNodes[1].childNodes[0]) {
       var _minColWidth = Array.from(headerTableElement.childNodes[1].childNodes[0].childNodes).map(function (th) {
         // @ts-ignore
@@ -95,7 +95,7 @@ var useColWidth = function useColWidth(_ref) {
    * 列宽拖拽 resize，只处理拖拽线两边的列宽度
    */
 
-  var onColumnResizable = React__default['default'].useCallback(function (_, _ref2, index) {
+  var onColumnResizable = React__default["default"].useCallback(function (_, _ref2, index) {
     var size = _ref2.size;
     var minWidth = minColWidth[index] + 31;
     var anotherMinWidth = minColWidth[index + 1] + 31;
@@ -114,7 +114,7 @@ var useColWidth = function useColWidth(_ref) {
       return nextColWidths;
     });
   }, [minColWidth]);
-  var getColgroupProps = React__default['default'].useCallback(function (column, index) {
+  var getColgroupProps = React__default["default"].useCallback(function (column, index) {
     var width = colWidths[index] || undefined;
     return {
       style: {
@@ -135,4 +135,3 @@ var useColWidth = function useColWidth(_ref) {
 };
 
 exports.useColWidth = useColWidth;
-//# sourceMappingURL=use-col-width.js.map