@hi-ui/table 5.0.0-canary.8 → 5.0.0-canary.9

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @hi-ui/table
 
+## 5.0.0-canary.9
+
+### Patch Changes
+
+- fix(table): 修复 resizable 模式下列宽计算问题 (5.0)
+- Updated dependencies [bf65028e6]
+  - @hi-ui/button@5.0.0-canary.7
+  - @hi-ui/popper@5.0.0-canary.4
+
 ## 5.0.0-canary.8
 
 ### Minor Changes

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

@@ -41,7 +41,7 @@ var useColWidth = function useColWidth(_ref) {
       var exceedWidth = 0;
       var _realColumnsWidth = Array.from(measureRowElement.childNodes).map(function (node, index$1) {
         var _a;
-        var realWidth = node.getBoundingClientRect().width || 0;
+        var realWidth = node.getBoundingClientRect().width || 60;
         var _ref2 = (_a = columns[index$1]) !== null && _a !== void 0 ? _a : {},
           fixed = _ref2.fixed;
         var width = index.getGroupItemWidth(columns).colWidths[index$1];
@@ -157,16 +157,14 @@ var useColWidth = function useColWidth(_ref) {
         var resizableHandlerWidth = 4;
         var calcMinColWidths = Array.from(headerTableElement.childNodes).map(function (th, index$1) {
           var minColWidth = index.getGroupItemWidth(columns).minColWidths[index$1];
-          if (minColWidth && minColWidth > 0) {
-            return minColWidth;
-          }
           var thPaddingLeft = parseFloat(window.getComputedStyle(th).getPropertyValue('padding-left'));
           var childNodes = Array.from(th.childNodes);
-          return childNodes.map(function (child) {
+          var childNodesWidth = childNodes.map(function (child) {
             return child.offsetWidth;
           }).reduce(function (prev, next) {
             return prev + next;
           }, 0) + thPaddingLeft * 2 + resizableHandlerWidth;
+          return childNodesWidth > minColWidth ? minColWidth : childNodesWidth;
         });
         setMinColWidths(calcMinColWidths);
       });

package/lib/cjs/utils/index.js

@@ -79,7 +79,7 @@ var getGroupItemWidth = function getGroupItemWidth(columns) {
       }
       // 如果没有设置列宽度，css 宽度默认是 `auto`，这里对于非数字 width 均设置为 0
       var colWidth = typeAssertion.isNumeric(width) ? Number(width) : 0;
-      var minColWidth = typeAssertion.isNumeric(minWidth) ? Number(minWidth) : 0;
+      var minColWidth = typeAssertion.isNumeric(minWidth) ? Number(minWidth) : colWidth || 60;
       colWidths.push(colWidth < minColWidth ? minColWidth : colWidth);
       minColWidths.push(minColWidth);
     });

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

@@ -29,7 +29,7 @@ var useColWidth = function useColWidth(_ref) {
       var exceedWidth = 0;
       var _realColumnsWidth = Array.from(measureRowElement.childNodes).map(function (node, index) {
         var _a;
-        var realWidth = node.getBoundingClientRect().width || 0;
+        var realWidth = node.getBoundingClientRect().width || 60;
         var _ref2 = (_a = columns[index]) !== null && _a !== void 0 ? _a : {},
           fixed = _ref2.fixed;
         var width = getGroupItemWidth(columns).colWidths[index];
@@ -145,16 +145,14 @@ var useColWidth = function useColWidth(_ref) {
         var resizableHandlerWidth = 4;
         var calcMinColWidths = Array.from(headerTableElement.childNodes).map(function (th, index) {
           var minColWidth = getGroupItemWidth(columns).minColWidths[index];
-          if (minColWidth && minColWidth > 0) {
-            return minColWidth;
-          }
           var thPaddingLeft = parseFloat(window.getComputedStyle(th).getPropertyValue('padding-left'));
           var childNodes = Array.from(th.childNodes);
-          return childNodes.map(function (child) {
+          var childNodesWidth = childNodes.map(function (child) {
             return child.offsetWidth;
           }).reduce(function (prev, next) {
             return prev + next;
           }, 0) + thPaddingLeft * 2 + resizableHandlerWidth;
+          return childNodesWidth > minColWidth ? minColWidth : childNodesWidth;
         });
         setMinColWidths(calcMinColWidths);
       });

package/lib/esm/utils/index.js

@@ -74,7 +74,7 @@ var getGroupItemWidth = function getGroupItemWidth(columns) {
       }
       // 如果没有设置列宽度，css 宽度默认是 `auto`，这里对于非数字 width 均设置为 0
       var colWidth = isNumeric(width) ? Number(width) : 0;
-      var minColWidth = isNumeric(minWidth) ? Number(minWidth) : 0;
+      var minColWidth = isNumeric(minWidth) ? Number(minWidth) : colWidth || 60;
       colWidths.push(colWidth < minColWidth ? minColWidth : colWidth);
       minColWidths.push(minColWidth);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/table",
-  "version": "5.0.0-canary.8",
+  "version": "5.0.0-canary.9",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@hi-ui/array-utils": "^5.0.0-canary.2",
-    "@hi-ui/button": "^5.0.0-canary.6",
+    "@hi-ui/button": "^5.0.0-canary.7",
     "@hi-ui/checkbox": "^5.0.0-canary.2",
     "@hi-ui/classname": "^5.0.0-canary.2",
     "@hi-ui/dom-utils": "^5.0.0-canary.2",
@@ -58,7 +58,7 @@
     "@hi-ui/loading": "^5.0.0-canary.2",
     "@hi-ui/object-utils": "^5.0.0-canary.2",
     "@hi-ui/pagination": "^5.0.0-canary.4",
-    "@hi-ui/popper": "^5.0.0-canary.3",
+    "@hi-ui/popper": "^5.0.0-canary.4",
     "@hi-ui/react-utils": "^5.0.0-canary.2",
     "@hi-ui/scrollbar": "^5.0.0-canary.3",
     "@hi-ui/select": "^5.0.0-canary.7",