@hi-ui/table 4.9.1 → 4.9.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/lib/cjs/use-table.js +14 -4
  3. package/lib/esm/use-table.js +14 -4
  4. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # @hi-ui/table
2
2
 
3
+ ## 4.9.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [#3086](https://github.com/XiaoMi/hiui/pull/3086) [`1596605`](https://github.com/XiaoMi/hiui/commit/159660554b4c26aa2d2bbc36d0c14f69584e6389) Thanks [@zyprepare](https://github.com/zyprepare)! - fix(table): 修复表头分组下设置列排序无效问题 (#3085)
8
+
3
9
  ## 4.9.1
4
10
 
5
11
  ### Patch Changes
package/lib/cjs/use-table.js CHANGED
@@ -502,12 +502,22 @@ var useTable = function useTable(_a) {
502
502
  setActiveSorterType = _useState4[1];
503
503
  //* *************** 根据排序列处理数据 ************** *//
504
504
  var showData = React.useMemo(function () {
505
- var _a;
506
505
  var _data = [].concat(transitionData);
507
506
  if (activeSorterColumn) {
508
- var sorter = (_a = columns.filter(function (d) {
509
- return d.dataKey === activeSorterColumn;
510
- })[0]) === null || _a === void 0 ? void 0 : _a.sorter;
507
+ var sortedColumn = {};
508
+ var findColumn = function findColumn(columns) {
509
+ columns.forEach(function (item) {
510
+ if (item.dataKey === activeSorterColumn) {
511
+ sortedColumn = item;
512
+ return;
513
+ }
514
+ if (item.children) {
515
+ findColumn(item.children);
516
+ }
517
+ });
518
+ };
519
+ findColumn(columns);
520
+ var sorter = sortedColumn === null || sortedColumn === void 0 ? void 0 : sortedColumn.sorter;
511
521
  if (sorter) {
512
522
  activeSorterType === 'ascend' ? _data.sort(sorter) : _data.sort(sorter).reverse();
513
523
  // 平铺的树形结构排序
package/lib/esm/use-table.js CHANGED
@@ -490,12 +490,22 @@ var useTable = function useTable(_a) {
490
490
  setActiveSorterType = _useState4[1];
491
491
  //* *************** 根据排序列处理数据 ************** *//
492
492
  var showData = useMemo(function () {
493
- var _a;
494
493
  var _data = [].concat(transitionData);
495
494
  if (activeSorterColumn) {
496
- var sorter = (_a = columns.filter(function (d) {
497
- return d.dataKey === activeSorterColumn;
498
- })[0]) === null || _a === void 0 ? void 0 : _a.sorter;
495
+ var sortedColumn = {};
496
+ var findColumn = function findColumn(columns) {
497
+ columns.forEach(function (item) {
498
+ if (item.dataKey === activeSorterColumn) {
499
+ sortedColumn = item;
500
+ return;
501
+ }
502
+ if (item.children) {
503
+ findColumn(item.children);
504
+ }
505
+ });
506
+ };
507
+ findColumn(columns);
508
+ var sorter = sortedColumn === null || sortedColumn === void 0 ? void 0 : sortedColumn.sorter;
499
509
  if (sorter) {
500
510
  activeSorterType === 'ascend' ? _data.sort(sorter) : _data.sort(sorter).reverse();
501
511
  // 平铺的树形结构排序
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hi-ui/table",
3
- "version": "4.9.1",
3
+ "version": "4.9.2",
4
4
  "description": "A sub-package for @hi-ui/hiui.",
5
5
  "keywords": [],
6
6
  "author": "HiUI <mi-hiui@xiaomi.com>",