@hi-ui/table 4.9.0 → 4.9.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @hi-ui/table
 
+## 4.9.2
+
+### Patch Changes
+
+- [#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)
+
+## 4.9.1
+
+### Patch Changes
+
+- [#3083](https://github.com/XiaoMi/hiui/pull/3083) [`28dfa39`](https://github.com/XiaoMi/hiui/commit/28dfa390a9870432b597cc01107f25090651e689) Thanks [@zyprepare](https://github.com/zyprepare)! - fix(table): 修复空状态下设置边框左边框不显示问题 (#3082)
+
+- Updated dependencies [[`a8a4a7ecf`](https://github.com/XiaoMi/hiui/commit/a8a4a7ecf9fe056a9a16d03641b297bb01b17970)]:
+  - @hi-ui/drawer@4.3.1
+
 ## 4.9.0
 
 ### Minor Changes

package/lib/cjs/BaseTable.js

@@ -265,7 +265,7 @@ var BaseTable = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       bottom: stickyFooterBottom
     } : undefined
   }, typeAssertion.isFunction(footerRender) ? footerRender( /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, extraFooter)) : extraFooter);
-  var cls = classname.cx(prefixCls, className, hasBorder && prefixCls + "--bordered", (hasScrollToLeft || hasLeftFixedColumns) && prefixCls + "--bordered-left-none", striped && prefixCls + "--striped", size && prefixCls + "--size-" + size, virtual && prefixCls + "--virtual");
+  var cls = classname.cx(prefixCls, className, hasBorder && prefixCls + "--bordered", (hasScrollToLeft || hasLeftFixedColumns) && data.length > 0 && prefixCls + "--bordered-left-none", striped && prefixCls + "--striped", size && prefixCls + "--size-" + size, virtual && prefixCls + "--virtual");
   return /*#__PURE__*/React__default["default"].createElement("div", Object.assign({
     ref: ref,
     role: role,

package/lib/cjs/use-table.js

@@ -502,12 +502,22 @@ var useTable = function useTable(_a) {
     setActiveSorterType = _useState4[1];
   //* *************** 根据排序列处理数据 ************** *//
   var showData = React.useMemo(function () {
-    var _a;
     var _data = [].concat(transitionData);
     if (activeSorterColumn) {
-      var sorter = (_a = columns.filter(function (d) {
-        return d.dataKey === activeSorterColumn;
-      })[0]) === null || _a === void 0 ? void 0 : _a.sorter;
+      var sortedColumn = {};
+      var findColumn = function findColumn(columns) {
+        columns.forEach(function (item) {
+          if (item.dataKey === activeSorterColumn) {
+            sortedColumn = item;
+            return;
+          }
+          if (item.children) {
+            findColumn(item.children);
+          }
+        });
+      };
+      findColumn(columns);
+      var sorter = sortedColumn === null || sortedColumn === void 0 ? void 0 : sortedColumn.sorter;
       if (sorter) {
         activeSorterType === 'ascend' ? _data.sort(sorter) : _data.sort(sorter).reverse();
         // 平铺的树形结构排序

package/lib/esm/BaseTable.js

@@ -252,7 +252,7 @@ var BaseTable = /*#__PURE__*/forwardRef(function (_a, ref) {
       bottom: stickyFooterBottom
     } : undefined
   }, isFunction(footerRender) ? footerRender( /*#__PURE__*/React__default.createElement(React__default.Fragment, null, extraFooter)) : extraFooter);
-  var cls = cx(prefixCls, className, hasBorder && prefixCls + "--bordered", (hasScrollToLeft || hasLeftFixedColumns) && prefixCls + "--bordered-left-none", striped && prefixCls + "--striped", size && prefixCls + "--size-" + size, virtual && prefixCls + "--virtual");
+  var cls = cx(prefixCls, className, hasBorder && prefixCls + "--bordered", (hasScrollToLeft || hasLeftFixedColumns) && data.length > 0 && prefixCls + "--bordered-left-none", striped && prefixCls + "--striped", size && prefixCls + "--size-" + size, virtual && prefixCls + "--virtual");
   return /*#__PURE__*/React__default.createElement("div", Object.assign({
     ref: ref,
     role: role,

package/lib/esm/use-table.js

@@ -490,12 +490,22 @@ var useTable = function useTable(_a) {
     setActiveSorterType = _useState4[1];
   //* *************** 根据排序列处理数据 ************** *//
   var showData = useMemo(function () {
-    var _a;
     var _data = [].concat(transitionData);
     if (activeSorterColumn) {
-      var sorter = (_a = columns.filter(function (d) {
-        return d.dataKey === activeSorterColumn;
-      })[0]) === null || _a === void 0 ? void 0 : _a.sorter;
+      var sortedColumn = {};
+      var findColumn = function findColumn(columns) {
+        columns.forEach(function (item) {
+          if (item.dataKey === activeSorterColumn) {
+            sortedColumn = item;
+            return;
+          }
+          if (item.children) {
+            findColumn(item.children);
+          }
+        });
+      };
+      findColumn(columns);
+      var sorter = sortedColumn === null || sortedColumn === void 0 ? void 0 : sortedColumn.sorter;
       if (sorter) {
         activeSorterType === 'ascend' ? _data.sort(sorter) : _data.sort(sorter).reverse();
         // 平铺的树形结构排序

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/table",
-  "version": "4.9.0",
+  "version": "4.9.2",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",
@@ -48,7 +48,7 @@
     "@hi-ui/checkbox": "^4.0.10",
     "@hi-ui/classname": "^4.0.5",
     "@hi-ui/dom-utils": "^4.0.7",
-    "@hi-ui/drawer": "^4.1.4",
+    "@hi-ui/drawer": "^4.3.1",
     "@hi-ui/empty-state": "^4.1.1",
     "@hi-ui/env": "^4.0.7",
     "@hi-ui/func-utils": "^4.0.4",