@hi-ui/table 4.0.0-beta.22 → 4.0.0-beta.23

package/README.md

@@ -151,14 +151,16 @@
 
 ## CHANGELOG
 
-| 参数                 | 变更类型   | 变更内容                                    | 解决的问题                                  |
-| -------------------- | ---------- | ------------------------------------------- | ------------------------------------------- |
-| selectFilters        | deprecated | 取消内嵌 Select                             | -                                           | 使用 filterDropdown 能替代满足场景 |
-| onLoadChildren       | feature    | 必须返回数据 -> 返回 undefined 不做任何处理 | -                                           | 强化功能：支持自定义控制更新 |
-| expandedEmbedRowKeys | feature    | -                                           | 字段：expandRowKeys -> expandedEmbedRowKeys | 强化功能：支持内嵌面板独立控制 |
-| onEmbedExpand        | feature    | 字段：onExpand -> onEmbedExpand             | 强化功能：支持内嵌面板独立控制              |
-| stickyFooter         | feature    | boolean                                     | 强化功能：支持底部吸底                      |
-| defaultFixedToColumn | feature    | 1. 定义：非受控；2. 类型：对象              | 强化功能持久化                              |
-| fixedToColumn        | feature    | 1. 定义：受控；2. 类型：对象                | 强化功能持久化                              |
-| onFixedToColumn      | feature    | 1. 定义：冻结列回调；2. 类型：对象          | 强化功能持久化                              |
-| showRowHighlight     | feature    | -                                           | 强化功能持久化                              |
+| 参数                  | 变更类型   | 变更内容                                    | 解决的问题                                  |
+| --------------------- | ---------- | ------------------------------------------- | ------------------------------------------- |
+| selectFilters         | deprecated | 取消内嵌 Select                             | -                                           | 使用 filterDropdown 能替代满足场景 |
+| onLoadChildren        | feature    | 必须返回数据 -> 返回 undefined 不做任何处理 | -                                           | 强化功能：支持自定义控制更新 |
+| expandedEmbedRowKeys  | feature    | -                                           | 字段：expandRowKeys -> expandedEmbedRowKeys | 强化功能：支持内嵌面板独立控制 |
+| onEmbedExpand         | feature    | 字段：onExpand -> onEmbedExpand             | 强化功能：支持内嵌面板独立控制              |
+| stickyFooter          | feature    | boolean                                     | 强化功能：支持底部吸底                      |
+| defaultFixedToColumn  | feature    | 1. 定义：非受控；2. 类型：对象              | 强化功能持久化                              |
+| fixedToColumn         | feature    | 1. 定义：受控；2. 类型：对象                | 强化功能持久化                              |
+| onFixedToColumn       | feature    | 1. 定义：冻结列回调；2. 类型：对象          | 强化功能持久化                              |
+| showRowHighlight      | feature    | -                                           | 强化功能持久化                              |
+| sortedColKeys         | feature    | 列排序受控                                  | 强化功能持久化                              |
+| onSortedColKeysChange | feature    | 列排序设置回调                              | 强化功能持久化                              |

package/lib/cjs/Table.js

@@ -84,8 +84,6 @@ var DEFAULT_PAGINATION = {
 
 var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   // ************************ 预置标准模式 ************************ //
-  var _b;
-
   var _a$prefixCls = _a.prefixCls,
       prefixCls = _a$prefixCls === void 0 ? _prefix : _a$prefixCls,
       _a$standard = _a.standard,
@@ -98,6 +96,8 @@ var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       columnsProp = _a.columns,
       hiddenColKeysProp = _a.hiddenColKeys,
       onHiddenColKeysChange = _a.onHiddenColKeysChange,
+      sortedColKeysProp = _a.sortedColKeys,
+      onSortedColKeysChange = _a.onSortedColKeysChange,
       rowSelection = _a.rowSelection,
       _a$fieldKey = _a.fieldKey,
       fieldKey = _a$fieldKey === void 0 ? 'key' : _a$fieldKey,
@@ -105,21 +105,37 @@ var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       stickyFooter = _a$stickyFooter === void 0 ? false : _a$stickyFooter,
       _a$data = _a.data,
       data = _a$data === void 0 ? DEFAULT_DATA : _a$data,
-      rest = tslib.__rest(_a, ["prefixCls", "standard", "loading", "dataSource", "pagination", "uniqueId", "columns", "hiddenColKeys", "onHiddenColKeysChange", "rowSelection", "fieldKey", "stickyFooter", "data"]);
+      rest = tslib.__rest(_a, ["prefixCls", "standard", "loading", "dataSource", "pagination", "uniqueId", "columns", "hiddenColKeys", "onHiddenColKeysChange", "sortedColKeys", "onSortedColKeysChange", "rowSelection", "fieldKey", "stickyFooter", "data"]);
+
+  var tableProps = reactUtils.withDefaultProps(rest, standard ? STANDARD_PRESET : undefined);
+
+  var _tableProps$setting = tableProps.setting,
+      setting = _tableProps$setting === void 0 ? false : _tableProps$setting,
+      baseTableProps = tslib.__rest(tableProps // ************************ 高级功能 ************************ //
 
-  var baseTableProps = reactUtils.withDefaultProps(rest, standard ? STANDARD_PRESET : undefined);
-  var setting = (_b = baseTableProps.setting) !== null && _b !== void 0 ? _b : false; // ************************ 高级功能 ************************ //
+  /**
+   * 列排序
+   */
+  , // ************************ 高级功能 ************************ //
 
   /**
    * 列排序
    */
+  ["setting"]); // ************************ 高级功能 ************************ //
+
+  /**
+   * 列排序
+   */
+
 
   var _useColSorter = useColSorter.useColSorter({
     uniqueId: uniqueId,
-    columns: columnsProp
+    columns: columnsProp,
+    sortedColKeys: sortedColKeysProp,
+    onSortedColKeysChange: onSortedColKeysChange
   }),
       sortedCols = _useColSorter.sortedCols,
-      setSortCols = _useColSorter.setSortCols,
+      setSortColKeys = _useColSorter.setSortColKeys,
       cacheSortedCols = _useColSorter.cacheSortedCols,
       setCacheSortedCols = _useColSorter.setCacheSortedCols;
   /**
@@ -287,7 +303,7 @@ var Table = /*#__PURE__*/React.forwardRef(function (_a, ref) {
         prefixCls: prefixCls + "-setting",
         // sort
         sortedCols: sortedCols,
-        setSortCols: setSortCols,
+        setSortColKeys: setSortColKeys,
         cacheSortedCols: cacheSortedCols,
         setCacheSortedCols: setCacheSortedCols,
         // hidden

package/lib/cjs/Table.js.map

@@ -1 +1 @@
-{"version":3,"file":"Table.js","sources":["../../src/Table.tsx"],"sourcesContent":[null],"names":["_prefix","getPrefixCls","STANDARD_PRESET","striped","bordered","sticky","setting","showColMenu","SELECTION_DATA_KEY","uuid","DEFAULT_DATA","DEFAULT_PAGINATION","placement","autoHide","Table","forwardRef","_a","ref","prefixCls","standard","loading","dataSource","paginationProp","pagination","uniqueId","columnsProp","columns","hiddenColKeysProp","hiddenColKeys","onHiddenColKeysChange","rowSelection","fieldKey","stickyFooter","data","rest","baseTableProps","withDefaultProps","undefined","useColSorter","sortedCols","setSortCols","cacheSortedCols","setCacheSortedCols","useColHidden","visibleCols","setHiddenColKeys","cacheHiddenColKeys","setCacheHiddenColKeys","useTablePagination","mergedData","currentPage","trySetCurrentPage","hiddenPagination","pageSize","length","getRowKeyField","useCallback","item","val","invariant","isNullish","flattedData","useMemo","clonedData","cloneTree","flattenTree","node","id","raw","checkboxColWidth","React","useTableCheck","checkedAll","semiChecked","tryCheckAllRow","isCheckedRowKey","onCheckedRowKeysChange","checkRowIsDisabledCheckbox","getSelectionColumn","renderCell","_","rowItem","rowIndex","rowKey","checked","disabledCheckbox","Checkbox","disabled","onChange","evt","target","renderSelectionCell","dataKey","render","renderTitleCell","indeterminate","renderSelectionTitleCell","checkAllOptions","selectionColumn","width","className","title","mergedColumns","TableWrapper","Loading","Fragment","BaseTable","extra","header","TableSettingMenu","footer","Pagination","cx","current","__DEV__","displayName"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,IAAMA,OAAO,GAAGC,sBAAAA,CAAa,OAAbA,CAAhB;;AAEA,IAAMC,eAAe,GAAG;AACtBC,EAAAA,OAAO,EAAE,IADa;AAEtBC,EAAAA,QAAQ,EAAE,IAFY;AAGtBC,EAAAA,MAAM,EAAE,IAHc;AAItBC,EAAAA,OAAO,EAAE,IAJa;AAKtBC,EAAAA,WAAW,EAAE;AALS,CAAxB;IAQaC,kBAAkB,2BAAyBC,UAAAA;AACxD,IAAMC,YAAY,GAAG,EAArB;AAEA,IAAMC,kBAAkB,GAAG;AACzBC,EAAAA,SAAS,EAAE,OADc;AAEzBC,EAAAA,QAAQ,EAAE;AAFe,CAA3B;AAKA;;;;IAGaC,KAAK,gBAAGC,gBAAAA,CACnB,UACEC,EADF,EAiBEC,GAjBF;;;;wBAEIC;MAAAA,sCAAYlB;uBACZmB;MAAAA,oCAAW;sBACXC;MAAAA,kCAAU;MACVC,gBAAAA;MACYC,oBAAZC;MACAC,cAAAA;MACSC,iBAATC;MACeC,uBAAfC;MACAC,2BAAAA;MACAC,kBAAAA;uBACAC;MAAAA,oCAAW;2BACXC;MAAAA,4CAAe;mBACfC;MAAAA,4BAAOvB;MACJwB,wBAdL,YAAA,YAAA,WAAA,cAAA,cAAA,YAAA,WAAA,iBAAA,yBAAA,gBAAA,YAAA,gBAAA,QAAA;;MAoBMC,cAAc,GAAGC,2BAAAA,CAAiBF,IAAjBE,EAAuBjB,QAAQ,GAAGjB,eAAH,GAAqBmC,SAApDD;MACjB9B,OAAO,GAAG,MAAA6B,cAAc,CAAC7B,OAAf,UAAA,iBAAA,KAAA,GAA0B;;;;;;sBAO+BgC,yBAAAA,CAAa;AACpFd,IAAAA,QAAQ,EAARA,QADoF;AAEpFE,IAAAA,OAAO,EAAED;AAF2E,GAAba;MAAjEC,UAAR,iBAAQA;MAAYC,WAApB,iBAAoBA;MAAaC,eAAjC,iBAAiCA;MAAiBC,kBAAlD,iBAAkDA;;;;;;sBAc9CC,yBAAAA,CAAa;AACfnB,IAAAA,QAAQ,EAARA,QADe;;AAGfE,IAAAA,OAAO,EAAEa,UAHM;AAIfX,IAAAA,aAAa,EAAED,iBAJA;AAKfE,IAAAA,qBAAqB,EAArBA;AALe,GAAbc;MALFC,WADF,iBACEA;MACAhB,aAFF,iBAEEA;MACAiB,gBAHF,iBAGEA;MACAC,kBAJF,iBAIEA;MACAC,qBALF,iBAKEA;;MASIxB,UAAU,GAAGa,2BAAAA,CAAiBd,cAAjBc,EAAiCzB,kBAAjCyB;;;;;4BAKoCY,gCAAAA,CAAmB;AACxEzB,IAAAA,UAAU,EAAVA,UADwE;AAExEU,IAAAA,IAAI,EAAJA,IAFwE;AAGxEZ,IAAAA,UAAU,EAAVA;AAHwE,GAAnB2B;MAA/CC,UAAR,uBAAQA;MAAYC,WAApB,uBAAoBA;MAAaC,iBAAjC,uBAAiCA;;;MAO3BC,gBAAgB,GACpB,CAAC9B,cAAD,IACCC,UAAU,CAACV,QAAXU,IACC2B,WAAW,KAAK,CADjB3B,IAEC,OAAOA,UAAU,CAAC8B,QAAlB,KAA+B,QAFhC9B,IAGCU,IAAI,CAACqB,MAALrB,IAAeV,UAAU,CAAC8B;;MAGxBE,cAAc,GAAGC,iBAAAA,CACrB,UAACC,IAAD;QACQC,GAAG,GAAGD,IAAI,CAAC1B,QAAD;AAEhB4B,IAAAA,aAAAA,CACE,CAACC,uBAAAA,CAAUF,GAAVE,CADHD,EAEE,iEAFFA,EAGE5B,QAHF4B;WAMOD;AAVuB,GAAXF,EAYrB,CAACzB,QAAD,CAZqByB;;;;;MAkBjBK,WAAW,GAAGC,aAAAA,CAAQ;;QAEpBC,UAAU,GAAGC,mBAAAA,CAAUf,UAAVe;WACZC,qBAAAA,CAAYF,UAAZE,EAAwB,UAACC,IAAD;;6CAEjBA;AAAMC,QAAAA,EAAE,EAAEZ,cAAc,CAACW,IAAI,CAACE,GAAN;;AAFpB,KAAXH;AAHkB,GAAPH,EAOjB,CAACb,UAAD,EAAaM,cAAb,CAPiBO;;;MAYdO,gBAAgB,GAAGC,yBAAAA,CAAMR,OAANQ,CAAc;WAC9BxC,YAAY,IAAI,OAAOA,YAAY,CAACuC,gBAApB,KAAyC,QAAzDvC,GACHA,YAAY,CAACuC,gBADVvC,GAEH;AAHmB,GAAAwC,EAItB,CAACxC,YAAD,CAJsBwC;;uBAcrBC,sBAAAA,CAAc;AAAEzC,IAAAA,YAAY,EAAZA,YAAF;AAAgB+B,IAAAA,WAAW,EAAXA,WAAhB;AAA6B9B,IAAAA,QAAQ,EAARA;AAA7B,GAAdwC;MANFC,UADF,kBACEA;MACAC,WAFF,kBAEEA;MACAC,cAHF,kBAGEA;MACAC,eAJF,kBAIEA;MACAC,sBALF,kBAKEA;MACAC,0BANF,kBAMEA;;;MAIIC,kBAAkB,GAAGR,yBAAAA,CAAMd,WAANc,CACzB,UAACxC,YAAD;QACQiD,UAAU,GAAG,SAAbA,UAAa,CAACC,CAAD,EAASC,OAAT,EAAuBC,QAAvB;UACXC,MAAM,GAAG5B,cAAc,CAAC0B,OAAD;UACvBG,OAAO,GAAGT,eAAe,CAACQ,MAAD;UACzBE,gBAAgB,GAAGR,0BAA0B,CAACI,OAAD;aAE5C;AACLf,QAAAA,IAAI,eACFI,yBAAAA,cAAAA,CAACgB,4BAADhB;AACEc,UAAAA,OAAO,EAAET,eAAe,CAACQ,MAAD;AACxBI,UAAAA,QAAQ,EAAEF;AACVG,UAAAA,QAAQ,EAAE,iBAAA,CAACC,GAAD;AACRb,YAAAA,sBAAsB,CAACK,OAAD,EAAUQ,GAAG,CAACC,MAAJD,CAAWL,OAArB,CAAtBR;;SAJJN,CAFG;AAULc,QAAAA,OAAO,EAAPA;AAVK;AALT;;;QAoBMO,mBAAmB,GAAG,SAAtBA,mBAAsB,CAC1BX,CAD0B,EAE1BC,OAF0B,EAG1BC,QAH0B,EAI1BU,OAJ0B;wBAMAb,UAAU,CAACC,CAAD,EAAIC,OAAJ;UAA5Bf,IAAR,eAAQA;UAAMkB,OAAd,eAAcA;;;;UAIVtD,YAAY,CAAC+D,QAAQ;;;eAGhB/D,YAAY,CAAC+D,MAAb/D,CAAoBoC,IAApBpC,kCAA+BmD;AAASG,UAAAA,OAAO,EAAPA;UAAxCtD,EAAmDoD,QAAnDpD,EAA6D8D,OAA7D9D;;;aAGFoC;AAhBT;;QAmBM4B,eAAe,GAAG,SAAlBA,eAAkB;aACf;AACL5B,QAAAA,IAAI,eACFI,yBAAAA,cAAAA,CAACgB,4BAADhB;AACEc,UAAAA,OAAO,EAAEZ;AACTuB,UAAAA,aAAa,EAAEtB;AACfe,UAAAA,QAAQ,EAAEd;SAHZJ,CAFG;AAQLc,QAAAA,OAAO,EAAEZ,UARJ;AASLC,QAAAA,WAAW,EAAEA;AATR;AADT;;QAcMuB,wBAAwB,GAAG,SAA3BA,wBAA2B;6BACdF,eAAe;UAAxB5B,IAAR,oBAAQA;;UAEJpC,YAAY,CAACmE,eAAbnE,IAAgCA,YAAY,CAACmE,eAAbnE,CAA6B+D,QAAQ;eAChE/D,YAAY,CAACmE,eAAbnE,CAA6B+D,MAA7B/D,CAAoCoC,IAApCpC;;;aAGFoC;AAPT;;QAUMgC,eAAe,GAAoB;AACvCN,MAAAA,OAAO,EAAEpF,kBAD8B;AAEvC2F,MAAAA,KAAK,EAAE9B,gBAFgC;AAGvC+B,MAAAA,SAAS,EAAKlF,SAAL,oBAH8B;AAIvCmF,MAAAA,KAAK,EAAEL,wBAJgC;;AAMvCH,MAAAA,MAAM,EAAEF;AAN+B;WAQlCO;AAzEgB,GAAA5B,EA2EzB,CACEf,cADF,EAEEiB,UAFF,EAGEC,WAHF,EAIEC,cAJF,EAKEL,gBALF,EAMEM,eANF,EAOEC,sBAPF,EAQEC,0BARF,EASE3D,SATF,CA3EyBoD;MAwFrBgC,aAAa,GAAGhC,yBAAAA,CAAMR,OAANQ,CAAc;QAC9BxC,cAAc;UACVoE,eAAe,GAAGpB,kBAAkB,CAAChD,YAAD;cAClCoE,wBAAoBtD;;;WAGvBA;AANa,GAAA0B,EAOnB,CAACxC,YAAD,EAAegD,kBAAf,EAAmClC,WAAnC,CAPmB0B;;MAWhBiC,YAAY,GAAGnF,OAAO,GAAGoF,2BAAH,GAAaC;sBAGvCnC,yBAAAA,cAAAA,CAACiC,YAADjC,MAAAA,eACEA,yBAAAA,cAAAA,CAACoC,mBAADpC;AACErD,IAAAA,GAAG,EAAEA;KACDkB;AACJH,IAAAA,YAAY,EAAEA;AACdd,IAAAA,SAAS,EAAEA;AACXQ,IAAAA,OAAO,EAAE4E;AACTrE,IAAAA,IAAI,EAAEgB;AACNlB,IAAAA,QAAQ,EAAEA;AACV4E,IAAAA,KAAK,EAAE;AACLC,MAAAA,MAAM,EAAEtG,OAAO,gBACbgE,yBAAAA,cAAAA,CAACuC,iCAADvC;AACEpD,QAAAA,SAAS,EAAKA,SAAL;;AAETqB,QAAAA,UAAU,EAAEA;AACZC,QAAAA,WAAW,EAAEA;AACbC,QAAAA,eAAe,EAAEA;AACjBC,QAAAA,kBAAkB,EAAEA;;AAEpBd,QAAAA,aAAa,EAAEA;AACfiB,QAAAA,gBAAgB,EAAEA;AAClBC,QAAAA,kBAAkB,EAAEA;AACpBC,QAAAA,qBAAqB,EAAEA;OAXzBuB,CADa,GAcX,IAfC;AAgBLwC,MAAAA,MAAM,EAAE1D,gBAAgB,GAAG,IAAH,gBACtBkB,yBAAAA,cAAAA,CAACyC,8BAADzC;AACE8B,QAAAA,SAAS,EAAEY,YAAAA,CACN9F,SADQ,gBAAF8F,EAETzF,UAAU,CAACX,SAAXW,IACKL,SADL,4BACKA,GAAmCK,UAAU,CAACX,SAH1CoG;SAKPzF;AACJ0F,QAAAA,OAAO,EAAE/D;AACTsC,QAAAA,QAAQ,EAAErC;QARZmB;AAjBG;IARTA,CADFA;AA7NyB,CAAVvD;;AA4SrB,IAAImG,WAAJ,EAAa;AACXpG,EAAAA,KAAK,CAACqG,WAANrG,GAAoB,OAApBA;;;;"}
+{"version":3,"file":"Table.js","sources":["../../src/Table.tsx"],"sourcesContent":[null],"names":["_prefix","getPrefixCls","STANDARD_PRESET","striped","bordered","sticky","setting","showColMenu","SELECTION_DATA_KEY","uuid","DEFAULT_DATA","DEFAULT_PAGINATION","placement","autoHide","Table","forwardRef","_a","ref","prefixCls","standard","loading","dataSource","paginationProp","pagination","uniqueId","columnsProp","columns","hiddenColKeysProp","hiddenColKeys","onHiddenColKeysChange","sortedColKeysProp","sortedColKeys","onSortedColKeysChange","rowSelection","fieldKey","stickyFooter","data","rest","tableProps","withDefaultProps","undefined","baseTableProps","useColSorter","sortedCols","setSortColKeys","cacheSortedCols","setCacheSortedCols","useColHidden","visibleCols","setHiddenColKeys","cacheHiddenColKeys","setCacheHiddenColKeys","useTablePagination","mergedData","currentPage","trySetCurrentPage","hiddenPagination","pageSize","length","getRowKeyField","useCallback","item","val","invariant","isNullish","flattedData","useMemo","clonedData","cloneTree","flattenTree","node","id","raw","checkboxColWidth","React","useTableCheck","checkedAll","semiChecked","tryCheckAllRow","isCheckedRowKey","onCheckedRowKeysChange","checkRowIsDisabledCheckbox","getSelectionColumn","renderCell","_","rowItem","rowIndex","rowKey","checked","disabledCheckbox","Checkbox","disabled","onChange","evt","target","renderSelectionCell","dataKey","render","renderTitleCell","indeterminate","renderSelectionTitleCell","checkAllOptions","selectionColumn","width","className","title","mergedColumns","TableWrapper","Loading","Fragment","BaseTable","extra","header","TableSettingMenu","footer","Pagination","cx","current","__DEV__","displayName"],"mappings":"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"}

package/lib/cjs/TableAdvancedFilter.js

@@ -48,7 +48,9 @@ var Popper__default = /*#__PURE__*/_interopDefaultLegacy(Popper);
 var renderFilter = function renderFilter(_ref) {
   var prefixCls = _ref.prefixCls,
       column = _ref.column,
-      showColMenu = _ref.showColMenu;
+      showColMenu = _ref.showColMenu,
+      onOpen = _ref.onOpen,
+      onClose = _ref.onClose;
   var _column$raw = column.raw,
       sorter = _column$raw.sorter,
       filterIcon = _column$raw.filterIcon,
@@ -56,7 +58,9 @@ var renderFilter = function renderFilter(_ref) {
   return [showColMenu && /*#__PURE__*/React__default['default'].createElement(TableColumnMenu.TableColumnMenu, {
     prefixCls: prefixCls + "-dropdown",
     key: "0",
-    column: column
+    column: column,
+    onOpen: onOpen,
+    onClose: onClose
   }), sorter && !showColMenu && /*#__PURE__*/React__default['default'].createElement(SorterMenu, {
     prefixCls: prefixCls + "-sorter",
     key: "1",
@@ -67,7 +71,9 @@ var renderFilter = function renderFilter(_ref) {
   }, selectFilters)), filterIcon && /*#__PURE__*/React__default['default'].createElement(FilterDropdown, {
     prefixCls: prefixCls + "-custom",
     key: "3",
-    column: column
+    column: column,
+    onOpen: onOpen,
+    onClose: onClose
   })].filter(Boolean);
 };
 
@@ -113,7 +119,9 @@ var SorterMenu = function SorterMenu(_ref2) {
 
 var FilterDropdown = function FilterDropdown(_ref3) {
   var prefixCls = _ref3.prefixCls,
-      column = _ref3.column;
+      column = _ref3.column,
+      _onOpen = _ref3.onOpen,
+      _onClose = _ref3.onClose;
   var _column$raw2 = column.raw,
       filterIcon = _column$raw2.filterIcon,
       filterDropdown = _column$raw2.filterDropdown,
@@ -123,10 +131,12 @@ var FilterDropdown = function FilterDropdown(_ref3) {
 
   var _useUncontrolledToggl = useToggle.useUncontrolledToggle({
     onOpen: function onOpen() {
-      return onFilterDropdownVisibleChange === null || onFilterDropdownVisibleChange === void 0 ? void 0 : onFilterDropdownVisibleChange(true, column);
+      _onOpen === null || _onOpen === void 0 ? void 0 : _onOpen();
+      onFilterDropdownVisibleChange === null || onFilterDropdownVisibleChange === void 0 ? void 0 : onFilterDropdownVisibleChange(true, column);
     },
     onClose: function onClose() {
-      return onFilterDropdownVisibleChange === null || onFilterDropdownVisibleChange === void 0 ? void 0 : onFilterDropdownVisibleChange(false, column);
+      _onClose === null || _onClose === void 0 ? void 0 : _onClose();
+      onFilterDropdownVisibleChange === null || onFilterDropdownVisibleChange === void 0 ? void 0 : onFilterDropdownVisibleChange(false, column);
     }
   }),
       menuVisible = _useUncontrolledToggl[0],

package/lib/cjs/TableAdvancedFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableAdvancedFilter.js","sources":["../../src/TableAdvancedFilter.tsx"],"sourcesContent":[null],"names":["renderFilter","prefixCls","column","showColMenu","raw","sorter","filterIcon","selectFilters","React","TableColumnMenu","key","SorterMenu","Select","FilterDropdown","filter","Boolean","columnKey","dataKey","useTableContext","activeSorterColumn","activeSorterType","setActiveSorterColumn","setActiveSorterType","className","cx","onClick","e","CaretUpFilled","CaretDownFilled","filterDropdown","filterDropdownWidth","onFilterDropdownVisibleChange","filterDropdownClassName","useUncontrolledToggle","onOpen","onClose","menuVisible","menuVisibleAction","useState","menuTrigger","setMenuTrigger","ref","not","Popper","visible","attachEl","off","zIndex","style","width","isFunction","columnData","setFilterDropdownVisible","set"],"mappings":"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"}
+{"version":3,"file":"TableAdvancedFilter.js","sources":["../../src/TableAdvancedFilter.tsx"],"sourcesContent":[null],"names":["renderFilter","prefixCls","column","showColMenu","onOpen","onClose","raw","sorter","filterIcon","selectFilters","React","TableColumnMenu","key","SorterMenu","Select","FilterDropdown","filter","Boolean","columnKey","dataKey","useTableContext","activeSorterColumn","activeSorterType","setActiveSorterColumn","setActiveSorterType","className","cx","onClick","e","CaretUpFilled","CaretDownFilled","filterDropdown","filterDropdownWidth","onFilterDropdownVisibleChange","filterDropdownClassName","useUncontrolledToggle","menuVisible","menuVisibleAction","useState","menuTrigger","setMenuTrigger","ref","not","Popper","visible","attachEl","off","zIndex","style","width","isFunction","columnData","setFilterDropdownVisible","set"],"mappings":"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"}

package/lib/cjs/TableColumnMenu.js

@@ -52,7 +52,9 @@ var _prefix = classname.getPrefixCls('table-column-menu');
 var TableColumnMenu = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _ref$prefixCls = _ref.prefixCls,
       prefixCls = _ref$prefixCls === void 0 ? _prefix : _ref$prefixCls,
-      column = _ref.column;
+      column = _ref.column,
+      onOpen = _ref.onOpen,
+      onClose = _ref.onClose;
   var i18n = localeContext.useLocaleContext();
 
   var _useTableContext = context.useTableContext(),
@@ -69,9 +71,12 @@ var TableColumnMenu = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       columnRaw = column.raw;
   var canSort = !!columnRaw.sorter;
 
-  var _useToggle = useToggle.useToggle(),
-      menuVisible = _useToggle[0],
-      menuVisibleAction = _useToggle[1];
+  var _useUncontrolledToggl = useToggle.useUncontrolledToggle({
+    onOpen: onOpen,
+    onClose: onClose
+  }),
+      menuVisible = _useUncontrolledToggl[0],
+      menuVisibleAction = _useUncontrolledToggl[1];
 
   var _React$useState = React__default['default'].useState(null),
       menuTrigger = _React$useState[0],

package/lib/cjs/TableColumnMenu.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableColumnMenu.js","sources":["../../src/TableColumnMenu.tsx"],"sourcesContent":[null],"names":["_prefix","getPrefixCls","TableColumnMenu","forwardRef","ref","prefixCls","column","i18n","useLocaleContext","useTableContext","activeSorterType","activeSorterColumn","setActiveSorterType","setActiveSorterColumn","leftFreezeColumn","setLeftFreezeColumn","isHighlightedCol","onHighlightedColChange","dataKey","id","columnRaw","raw","canSort","sorter","useToggle","menuVisible","menuVisibleAction","React","useState","menuTrigger","setMenuTrigger","IconButton","className","onClick","not","icon","DownOutlined","Popper","visible","attachEl","onClose","off","zIndex","TableColumnMenuItem","active","content","get","SortAscendingOutlined","onSwitch","shouldActive","SortDescendingOutlined","ColumnHeightOutlined","LockOutlined","__DEV__","displayName","cx"],"mappings":"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"}
+{"version":3,"file":"TableColumnMenu.js","sources":["../../src/TableColumnMenu.tsx"],"sourcesContent":[null],"names":["_prefix","getPrefixCls","TableColumnMenu","forwardRef","ref","prefixCls","column","onOpen","onClose","i18n","useLocaleContext","useTableContext","activeSorterType","activeSorterColumn","setActiveSorterType","setActiveSorterColumn","leftFreezeColumn","setLeftFreezeColumn","isHighlightedCol","onHighlightedColChange","dataKey","id","columnRaw","raw","canSort","sorter","useUncontrolledToggle","menuVisible","menuVisibleAction","React","useState","menuTrigger","setMenuTrigger","IconButton","className","onClick","not","icon","DownOutlined","Popper","visible","attachEl","off","zIndex","TableColumnMenuItem","active","content","get","SortAscendingOutlined","onSwitch","shouldActive","SortDescendingOutlined","ColumnHeightOutlined","LockOutlined","__DEV__","displayName","cx"],"mappings":"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"}

package/lib/cjs/TableHeader.js

@@ -29,6 +29,8 @@ var context = require('./context.js');
 
 var TableAdvancedFilter = require('./TableAdvancedFilter.js');
 
+var useCheckState = require('@hi-ui/use-check-state');
+
 function _interopDefaultLegacy(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
@@ -63,6 +65,7 @@ var TableHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       getTableHeaderProps = _useTableContext.getTableHeaderProps,
       showColMenu = _useTableContext.showColMenu;
 
+  var activeColumnKeysAction = useCheckState.useCheckState();
   var cls = classname.cx(prefixCls, className);
   return /*#__PURE__*/React__default['default'].createElement("div", Object.assign({
     className: cls,
@@ -92,7 +95,7 @@ var TableHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       var cell = /*#__PURE__*/React__default['default'].createElement("th", Object.assign({
         key: dataKey
       }, getStickyColProps(col), {
-        className: classname.cx(prefixCls + "-cell", raw.className, isHighlightedCol(dataKey) && prefixCls + "-th__col--highlight", isHoveredHighlightCol(dataKey) && prefixCls + "__col--hovered-highlight"),
+        className: classname.cx(prefixCls + "-cell", raw.className, isHighlightedCol(dataKey) && prefixCls + "-th__col--highlight", isHoveredHighlightCol(dataKey) && prefixCls + "__col--hovered-highlight", activeColumnKeysAction.has(dataKey) && prefixCls + "__col--active"),
         // @ts-ignore
         colSpan: col.colSpan,
         // @ts-ignore
@@ -101,7 +104,13 @@ var TableHeader = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
         prefixCls: prefixCls + "-filter",
         columnKey: dataKey,
         showColMenu: showColMenu,
-        column: col
+        column: col,
+        onOpen: function onOpen() {
+          return activeColumnKeysAction.add(dataKey);
+        },
+        onClose: function onClose() {
+          return activeColumnKeysAction.remove(dataKey);
+        }
       }));
       return resizable && colIndex !== colWidths.length - 1 ? /*#__PURE__*/React__default['default'].createElement(reactResizable.Resizable, {
         key: colIndex,

package/lib/cjs/TableHeader.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableHeader.js","sources":["../../src/TableHeader.tsx"],"sourcesContent":[null],"names":["_prefix","getPrefixCls","TableHeader","forwardRef","ref","prefixCls","className","useTableContext","groupedColumns","resizable","colWidths","isHoveredHighlightCol","isHighlightedCol","getColgroupProps","onColumnResizable","getStickyColProps","onTableBodyScrollMock","scrollHeaderElementRef","leafColumns","getTableHeaderProps","showColMenu","cls","cx","React","style","width","position","map","col","idx","key","onWheel","cols","colsIndex","colIndex","dataKey","title","raw","titleContent","isFunction","cell","colSpan","rowSpan","renderFilter","columnKey","column","length","Resizable","draggableOpts","enableUserSelectHack","handle","height","onResize","evt","options","__DEV__","displayName"],"mappings":"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"}
+{"version":3,"file":"TableHeader.js","sources":["../../src/TableHeader.tsx"],"sourcesContent":[null],"names":["_prefix","getPrefixCls","TableHeader","forwardRef","ref","prefixCls","className","useTableContext","groupedColumns","resizable","colWidths","isHoveredHighlightCol","isHighlightedCol","getColgroupProps","onColumnResizable","getStickyColProps","onTableBodyScrollMock","scrollHeaderElementRef","leafColumns","getTableHeaderProps","showColMenu","activeColumnKeysAction","useCheckState","cls","cx","React","style","width","position","map","col","idx","key","onWheel","cols","colsIndex","colIndex","dataKey","title","raw","titleContent","isFunction","cell","has","colSpan","rowSpan","renderFilter","columnKey","column","onOpen","add","onClose","remove","length","Resizable","draggableOpts","enableUserSelectHack","handle","height","onResize","evt","options","__DEV__","displayName"],"mappings":"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"}

package/lib/cjs/TableSettingMenu.js

@@ -65,7 +65,7 @@ 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,
@@ -83,13 +83,13 @@ var TableSettingMenu = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
             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,7 +124,9 @@ 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();
   };
 
@@ -133,7 +135,7 @@ var TableSettingMenu = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     ref: ref,
     className: cls
   }, /*#__PURE__*/React__default['default'].createElement(iconButton.IconButton, {
-    icon: /*#__PURE__*/React__default['default'].createElement(icons.SettingOutlined, null),
+    icon: /*#__PURE__*/React__default['default'].createElement(icons.EllipsisVerticalOutlined, null),
     onClick: menuVisibleAction.not
   }), /*#__PURE__*/React__default['default'].createElement(drawer.Drawer, {
     className: prefixCls + "__drawer",
@@ -197,11 +199,6 @@ function TableSettingMenuItem(_ref2) {
     className: classname.cx(prefixCls + "-item", dragging && prefixCls + "-item--dragging", direction && prefixCls + "-item--direction-" + direction)
   }, 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, {
     checked: !cacheHiddenColKeys.includes(dataKey),
     onChange: function onChange(evt) {
@@ -211,12 +208,7 @@ function TableSettingMenuItem(_ref2) {
       }) : cacheHiddenColKeys.concat(dataKey);
       setCacheHiddenColKeys(nextCacheHiddenColKeys);
     }
-  }), /*#__PURE__*/React__default['default'].createElement("span", {
-    style: {
-      display: 'inline-block',
-      marginLeft: 9
-    }
-  }, funcUtils.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;

package/lib/cjs/TableSettingMenu.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableSettingMenu.js","sources":["../../src/TableSettingMenu.tsx"],"sourcesContent":[null],"names":["_prefix","getPrefixCls","TableSettingMenu","forwardRef","ref","prefixCls","sortedCols","setSortCols","cacheSortedCols","setCacheSortedCols","hiddenColKeys","setHiddenColKeys","cacheHiddenColKeys","setCacheHiddenColKeys","i18n","useLocaleContext","dropProps","useDrop","draggable","idFieldName","onSwap","dragItem","dropItem","direction","info","prev","nextCacheSortColKeys","splice","dragIndex","removed","dropIndex","useToggle","menuVisible","menuVisibleAction","resetLatest","useLatestCallback","prevShowPopperRef","useRef","useEffect","current","onConfirm","off","cls","cx","React","className","IconButton","icon","SettingOutlined","onClick","not","Drawer","title","get","visible","onClose","width","footer","Button","key","type","map","col","index","TableSettingMenuItem","dataKey","column","__DEV__","displayName","useDrag","item","dataTransferKey","dragging","getDragTriggerProps","getDropTriggerProps","style","display","alignItems","Checkbox","checked","includes","onChange","evt","shouldChecked","target","nextCacheHiddenColKeys","filter","concat","marginLeft","runIfFunc","MenuOutlined"],"mappings":"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"}
+{"version":3,"file":"TableSettingMenu.js","sources":["../../src/TableSettingMenu.tsx"],"sourcesContent":[null],"names":["_prefix","getPrefixCls","TableSettingMenu","forwardRef","ref","prefixCls","sortedCols","setSortColKeys","cacheSortedCols","setCacheSortedCols","hiddenColKeys","setHiddenColKeys","cacheHiddenColKeys","setCacheHiddenColKeys","i18n","useLocaleContext","dropProps","useDrop","draggable","idFieldName","onSwap","dragItem","dropItem","direction","info","prev","nextCacheSortCols","splice","dragIndex","removed","dropIndex","useToggle","menuVisible","menuVisibleAction","resetLatest","useLatestCallback","prevShowPopperRef","useRef","useEffect","current","onConfirm","map","col","dataKey","off","cls","cx","React","className","IconButton","icon","EllipsisVerticalOutlined","onClick","not","Drawer","title","get","visible","onClose","width","footer","Button","key","type","index","TableSettingMenuItem","column","__DEV__","displayName","useDrag","item","dataTransferKey","dragging","getDragTriggerProps","getDropTriggerProps","Checkbox","checked","includes","onChange","evt","shouldChecked","target","nextCacheHiddenColKeys","filter","concat","runIfFunc","MoveOutlined"],"mappings":"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"}

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

@@ -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,34 +31,50 @@ 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];
 
-  useUpdateEffect.useUpdateEffect(function () {
-    // 当column发生改变的时候，同步 setting 的 sortedCols 设置
-    setSortCols(columns);
-  }, [columns]);
   return {
     sortedCols: sortedCols,
-    setSortCols: setSortCols,
+    setSortColKeys: setSortColKeys,
     cacheSortedCols: cacheSortedCols,
     setCacheSortedCols: setCacheSortedCols
   };

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

@@ -1 +1 @@
-{"version":3,"file":"use-col-sorter.js","sources":["../../../src/hooks/use-col-sorter.ts"],"sourcesContent":[null],"names":["DEFAULT_COLUMNS","useColSorter","uniqueId","columns","cacheKey","useState","parseLocalArray","key","defaultValue","sortedCols","setSortCols","useEffect","window","localStorage","setItem","JSON","stringify","cacheSortedCols","setCacheSortedCols","useUpdateEffect"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAMA,IAAMA,eAAe,GAAG,EAAxB;AAEA;;;;IAGaC,YAAY,GAAG,SAAfA,YAAe,KAAA;MAAGC,gBAAAA;0BAAUC;MAAAA,oCAAUH;MAC3CI,QAAQ,GAAGF,QAAQ,GAAMA,QAAN,cAAA,GAA4B;;kBAEnBG,cAAAA,CAA4B;WACrDC,qBAAAA,CAAgB;AACrBC,MAAAA,GAAG,EAAEH,QADgB;AAErBI,MAAAA,YAAY,EAAEL;AAFO,KAAhBG;AADiC,GAARD;MAA3BI,UAAP;MAAmBC,WAAnB;;AAOAC,EAAAA,eAAAA,CAAU;QACJ,CAACP,UAAU;AACfQ,IAAAA,MAAM,CAACC,YAAPD,CAAoBE,OAApBF,CAA4BR,QAA5BQ,EAAsCG,IAAI,CAACC,SAALD,CAAeN,UAAfM,CAAtCH;AAFO,GAATD,EAGG,CAACP,QAAD,EAAWK,UAAX,CAHHE;;mBAM8CN,cAAAA,CAASI,UAATJ;MAAvCY,eAAP;MAAwBC,kBAAxB;;AAEAC,EAAAA,+BAAAA,CAAgB;;AAEdT,IAAAA,WAAW,CAACP,OAAD,CAAXO;AAFa,GAAfS,EAGG,CAAChB,OAAD,CAHHgB;SAKO;AACLV,IAAAA,UAAU,EAAVA,UADK;AAELC,IAAAA,WAAW,EAAXA,WAFK;AAGLO,IAAAA,eAAe,EAAfA,eAHK;AAILC,IAAAA,kBAAkB,EAAlBA;AAJK;;;"}
+{"version":3,"file":"use-col-sorter.js","sources":["../../../src/hooks/use-col-sorter.ts"],"sourcesContent":[null],"names":["DEFAULT_COLUMNS","useColSorter","uniqueId","columns","sortedColKeysProp","sortedColKeys","onSortedColKeysChange","cacheKey","useUncontrolledState","parseLocalArray","key","defaultValue","map","column","dataKey","setSortColKeys","useUpdateEffect","columnsLatestRef","useLatestRef","sortedCols","useMemo","columnsMap","current","reduce","prev","cur","colKey","filter","Boolean","useEffect","window","localStorage","setItem","JSON","stringify","useState","cacheSortedCols","setCacheSortedCols"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAOA,IAAMA,eAAe,GAAG,EAAxB;AAEA;;;;IAGaC,YAAY,GAAG,SAAfA,YAAe,KAAA;MAC1BC,gBAAAA;0BACAC;MAAAA,oCAAUH;MACKI,yBAAfC;MACAC,6BAAAA;MAEMC,QAAQ,GAAGL,QAAQ,GAAMA,QAAN,cAAA,GAA4B;;8BAEbM,yCAAAA,CACtC;WACSC,qBAAAA,CAAgB;AACrBC,MAAAA,GAAG,EAAEH,QADgB;AAErBI,MAAAA,YAAY,EAAER,OAAO,CAACS,GAART,CAAY,UAACU,MAAD;eAAYA,MAAM,CAACC;AAA/B,OAAAX;AAFO,KAAhBM;AAFiD,GAApBD,EAOtCJ,iBAPsCI,EAQtCF,qBARsCE;MAAjCH,aAAP;MAAsBU,cAAtB;;AAWAC,EAAAA,+BAAAA,CAAgB;;AAEdD,IAAAA,cAAc,CAACZ,OAAO,CAACS,GAART,CAAY,UAACU,MAAD;aAAYA,MAAM,CAACC;AAA/B,KAAAX,CAAD,CAAdY;AAFa,GAAfC,EAGG,CAACb,OAAD,CAHHa;MAKMC,gBAAgB,GAAGC,sBAAAA,CAAaf,OAAbe;MAEnBC,UAAU,GAAGC,aAAAA,CAAQ;QACnBC,UAAU,GAAGJ,gBAAgB,CAACK,OAAjBL,CAAyBM,MAAzBN,CAAgC,UAACO,IAAD,EAAOC,GAAP;AACjDD,MAAAA,IAAI,CAACC,GAAG,CAACX,OAAL,CAAJU,GAAqBC,GAArBD;aACOA;AAFU,KAAAP,EAGhB,EAHgBA;WAKZZ,aAAa,CAACO,GAAdP,CAAkB,UAACqB,MAAD;aAAYL,UAAU,CAACK,MAAD;AAAxC,KAAArB,EAAkDsB,MAAlDtB,CAAyDuB,OAAzDvB;AANiB,GAAPe,EAOhB,CAACf,aAAD,EAAgBY,gBAAhB,CAPgBG;AASnBS,EAAAA,eAAAA,CAAU;QACJ,CAACtB,UAAU;AACfuB,IAAAA,MAAM,CAACC,YAAPD,CAAoBE,OAApBF,CAA4BvB,QAA5BuB,EAAsCG,IAAI,CAACC,SAALD,CAAe5B,aAAf4B,CAAtCH;AAFO,GAATD,EAGG,CAACtB,QAAD,EAAWF,aAAX,CAHHwB;;kBAM8CM,cAAAA,CAAShB,UAATgB;MAAvCC,eAAP;MAAwBC,kBAAxB;;SAEO;AACLlB,IAAAA,UAAU,EAAVA,UADK;AAELJ,IAAAA,cAAc,EAAdA,cAFK;AAGLqB,IAAAA,eAAe,EAAfA,eAHK;AAILC,IAAAA,kBAAkB,EAAlBA;AAJK;;;"}

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

@@ -54,6 +54,12 @@ var useColumns = function useColumns(_ref) {
         align: (_a = raw.align) !== null && _a !== void 0 ? _a : 'left',
         render: raw.render
       });
+    }); // 记录下标位置，方便冻结列操作计算时快速获取更新
+    // 记录下标位置，方便冻结列操作计算时快速获取更新
+
+    flattedColumns.forEach(function (column, index) {
+      // @ts-ignore
+      column.index = index;
     });
     return [flattedColumns, maxDepth];
   }, [columns]),

package/lib/cjs/hooks/use-colgroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-colgroup.js","sources":["../../../src/hooks/use-colgroup.ts"],"sourcesContent":[null],"names":["useColumns","columns","React","useMemo","clonedColumns","cloneTree","maxDepth","flattedColumns","flattenTree","node","depth","raw","id","dataKey","width","title","align","render","maxColumnDepth","flattedColumnsWithoutChildren","filter","col","isArrayNonEmpty","children","preset","nextColumns","concat","forEach","column","isLeaf","rowSpan","colSpan","getLeafChildren","length","leafColumns","groupedColumns","groupByTreeDepth","mergedColumns"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAWaA,UAAU,GAAG,SAAbA,UAAa,KAAA;MAAGC,eAAAA;;uBAEcC,yBAAAA,CAAMC,OAAND,CAAc;QAC/CE,aAAa,GAAGC,mBAAAA,CAAUJ,OAAVI;QAClBC,QAAQ,GAAG;;;QAGTC,cAAc,GAAGC,qBAAAA,CAAYJ,aAAZI,EAA2B,UAACC,IAAD;;;UAC5CA,IAAI,CAACC,KAALD,GAAaH,UAAU;AACzBA,QAAAA,QAAQ,GAAGG,IAAI,CAACC,KAAhBJ;;;UAGIK,GAAG,GAAGF,IAAI,CAACE;6CAGZF;AACHG,QAAAA,EAAE,EAAED,GAAG,CAACE;AACRC,QAAAA,KAAK,EAAEH,GAAG,CAACG;;AAEXD,QAAAA,OAAO,EAAEF,GAAG,CAACE;AACbE,QAAAA,KAAK,EAAEJ,GAAG,CAACI;AACXC,QAAAA,KAAK,EAAE,MAAAL,GAAG,CAACK,KAAJ,UAAA,iBAAA,KAAA,GAAa;AACpBC,QAAAA,MAAM,EAAEN,GAAG,CAACM;;AAfkB,KAAXT;WAmBhB,CAACD,cAAD,EAAiBD,QAAjB;AAxBgC,GAAAJ,EAyBtC,CAACD,OAAD,CAzBsCC;MAAlCK,cAAP;MAAuBW,cAAvB;;;MA4BMC,6BAA6B,GAAGjB,yBAAAA,CAAMC,OAAND,CAAc;WAC3CK,cAAc,CAACa,MAAfb,CAAsB,UAACc,GAAD;aAAS,CAACC,6BAAAA,CAAgBD,GAAG,CAACE,QAApBD;AAAhC,KAAAf;AAD6B,GAAAL,EAEnC,CAACK,cAAD,CAFmCL;;wBAIeA,yBAAAA,CAAMC,OAAND,CAAc;QAC3DsB,MAAM,GAAiC;QAEvCC,WAAW,GAAGD,MAAM,CAACE,MAAPF;;AAGlBjB,IAAAA,cAHkBiB;;;;;;;AASpBjB,IAAAA,cAAc,CAACoB,OAAfpB,CAAuB,UAACqB,MAAD;UACjBC,gBAAAA,CAAOD,MAAPC,GAAgB;AAClBD,QAAAA,MAAM,CAACE,OAAPF,GAAiBV,cAAc,GAAGU,MAAM,CAAClB,KAAxBQ,GAAgC,CAAjDU;AACAA,QAAAA,MAAM,CAACG,OAAPH,GAAiB,CAAjBA;AAFF,aAGO;AACLA,QAAAA,MAAM,CAACE,OAAPF,GAAiB,CAAjBA;AACAA,QAAAA,MAAM,CAACG,OAAPH,GAAiBI,yBAAAA,CAAgBJ,MAAhBI,EAAwBC,MAAzCL;;AANJ,KAAArB;QAUM2B,WAAW,GAAG3B,cAAc,CAACa,MAAfb,CAAsB,UAACc,GAAD;aAASQ,gBAAAA,CAAOR,GAAPQ;AAA/B,KAAAtB;QACd4B,cAAc,GAAGC,0BAAAA,CAAiBX,WAAjBW;WAEhB,CAACX,WAAD,EAAcU,cAAd,EAA8BD,WAA9B;AAzB4C,GAAAhC,EA0BlD,CAACK,cAAD,EAAiBW,cAAjB,CA1BkDhB;MAA9CmC,aAAP;MAAsBF,cAAtB;MAAsCD,WAAtC;;SA4BO;;AAEL3B,IAAAA,cAAc,EAAdA,cAFK;AAGL8B,IAAAA,aAAa,EAAbA,aAHK;AAILF,IAAAA,cAAc,EAAdA,cAJK;AAKLD,IAAAA,WAAW,EAAXA,WALK;AAMLf,IAAAA,6BAA6B,EAA7BA;AANK;;;"}
+{"version":3,"file":"use-colgroup.js","sources":["../../../src/hooks/use-colgroup.ts"],"sourcesContent":[null],"names":["useColumns","columns","React","useMemo","clonedColumns","cloneTree","maxDepth","flattedColumns","flattenTree","node","depth","raw","id","dataKey","width","title","align","render","forEach","column","index","maxColumnDepth","flattedColumnsWithoutChildren","filter","col","isArrayNonEmpty","children","preset","nextColumns","concat","isLeaf","rowSpan","colSpan","getLeafChildren","length","leafColumns","groupedColumns","groupByTreeDepth","mergedColumns"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAWaA,UAAU,GAAG,SAAbA,UAAa,KAAA;MAAGC,eAAAA;;uBAEcC,yBAAAA,CAAMC,OAAND,CAAc;QAC/CE,aAAa,GAAGC,mBAAAA,CAAUJ,OAAVI;QAClBC,QAAQ,GAAG;;;QAGTC,cAAc,GAAGC,qBAAAA,CAAYJ,aAAZI,EAA2B,UAACC,IAAD;;;UAC5CA,IAAI,CAACC,KAALD,GAAaH,UAAU;AACzBA,QAAAA,QAAQ,GAAGG,IAAI,CAACC,KAAhBJ;;;UAGIK,GAAG,GAAGF,IAAI,CAACE;6CAGZF;AACHG,QAAAA,EAAE,EAAED,GAAG,CAACE;AACRC,QAAAA,KAAK,EAAEH,GAAG,CAACG;;AAEXD,QAAAA,OAAO,EAAEF,GAAG,CAACE;AACbE,QAAAA,KAAK,EAAEJ,GAAG,CAACI;AACXC,QAAAA,KAAK,EAAE,MAAAL,GAAG,CAACK,KAAJ,UAAA,iBAAA,KAAA,GAAa;AACpBC,QAAAA,MAAM,EAAEN,GAAG,CAACM;;AAfkB,KAAXT;;;AAoBvBD,IAAAA,cAAc,CAACW,OAAfX,CAAuB,UAACY,MAAD,EAASC,KAAT;;AAErBD,MAAAA,MAAM,CAACC,KAAPD,GAAeC,KAAfD;AAFF,KAAAZ;WAKO,CAACA,cAAD,EAAiBD,QAAjB;AA9BgC,GAAAJ,EA+BtC,CAACD,OAAD,CA/BsCC;MAAlCK,cAAP;MAAuBc,cAAvB;;;MAkCMC,6BAA6B,GAAGpB,yBAAAA,CAAMC,OAAND,CAAc;WAC3CK,cAAc,CAACgB,MAAfhB,CAAsB,UAACiB,GAAD;aAAS,CAACC,6BAAAA,CAAgBD,GAAG,CAACE,QAApBD;AAAhC,KAAAlB;AAD6B,GAAAL,EAEnC,CAACK,cAAD,CAFmCL;;wBAIeA,yBAAAA,CAAMC,OAAND,CAAc;QAC3DyB,MAAM,GAAiC;QAEvCC,WAAW,GAAGD,MAAM,CAACE,MAAPF;;AAGlBpB,IAAAA,cAHkBoB;;;;;;;AASpBpB,IAAAA,cAAc,CAACW,OAAfX,CAAuB,UAACY,MAAD;UACjBW,gBAAAA,CAAOX,MAAPW,GAAgB;AAClBX,QAAAA,MAAM,CAACY,OAAPZ,GAAiBE,cAAc,GAAGF,MAAM,CAACT,KAAxBW,GAAgC,CAAjDF;AACAA,QAAAA,MAAM,CAACa,OAAPb,GAAiB,CAAjBA;AAFF,aAGO;AACLA,QAAAA,MAAM,CAACY,OAAPZ,GAAiB,CAAjBA;AACAA,QAAAA,MAAM,CAACa,OAAPb,GAAiBc,yBAAAA,CAAgBd,MAAhBc,EAAwBC,MAAzCf;;AANJ,KAAAZ;QAUM4B,WAAW,GAAG5B,cAAc,CAACgB,MAAfhB,CAAsB,UAACiB,GAAD;aAASM,gBAAAA,CAAON,GAAPM;AAA/B,KAAAvB;QACd6B,cAAc,GAAGC,0BAAAA,CAAiBT,WAAjBS;WAEhB,CAACT,WAAD,EAAcQ,cAAd,EAA8BD,WAA9B;AAzB4C,GAAAjC,EA0BlD,CAACK,cAAD,EAAiBc,cAAjB,CA1BkDnB;MAA9CoC,aAAP;MAAsBF,cAAtB;MAAsCD,WAAtC;;SA4BO;;AAEL5B,IAAAA,cAAc,EAAdA,cAFK;AAGL+B,IAAAA,aAAa,EAAbA,aAHK;AAILF,IAAAA,cAAc,EAAdA,cAJK;AAKLD,IAAAA,WAAW,EAAXA,WALK;AAMLb,IAAAA,6BAA6B,EAA7BA;AANK;;;"}