ds-web-all 1.0.1-beta.89 → 1.0.1-beta.90

package/lib/components/table/index.js

@@ -455,25 +455,6 @@ function CFTable(_ref2) {
     _useState10 = _slicedToArray(_useState9, 2),
     resizeScrollX = _useState10[0],
     setResizeScrollX = _useState10[1];
-  var _setColumnWidthMap = function _setColumnWidthMap(val, isResize) {
-    var newVal = typeof val === 'function' ? val(columnWidthMapRef.current) : val;
-    setColumnWidthMap(newVal);
-    columnWidthMapRef.current = newVal;
-    if (isResize) {
-      var sum = rowSelectWidth;
-      var _loopForEach = function loopForEach(arr) {
-        arr.forEach(function (col) {
-          if (col.children && col.children.length > 0) {
-            _loopForEach(col.children);
-          } else {
-            sum += newVal[col.name] || 0;
-          }
-        });
-      };
-      _loopForEach(columns);
-      setResizeScrollX(sum);
-    }
-  };
   var rowSelectWidth = (0, _react.useMemo)(function () {
     return newRowSelection ? typeof rowSelection.columnWidth === 'string' ? rowSelection.columnWidth.replace('px', '') : rowSelection.columnWidth || 32 : 0;
   }, [newRowSelection]);
@@ -489,6 +470,24 @@ function CFTable(_ref2) {
     };
     return _loopMap(columns);
   }, [columns]);
+  var simpleColumnsStr = (0, _react.useMemo)(function () {
+    return JSON.stringify(simpleColumns);
+  }, [simpleColumns]);
+  (0, _react.useEffect)(function () {
+    columnWidthMapRef.current = columnWidthMap;
+    var sum = rowSelectWidth;
+    var _loopForEach = function loopForEach(arr) {
+      arr.forEach(function (col) {
+        if (col.children && col.children.length > 0) {
+          _loopForEach(col.children);
+        } else {
+          sum += columnWidthMap[col.name] || 0;
+        }
+      });
+    };
+    _loopForEach(columns);
+    setResizeScrollX(sum);
+  }, [columnWidthMap, rowSelectWidth]);
   (0, _react.useEffect)(function () {
     columnConfigWidthMapOld.current = _objectSpread({}, columnConfigWidthMap.current);
     var newData = _objectSpread(_objectSpread({}, columnConfigWidthMap.current), columnWidthMapRef.current);
@@ -524,22 +523,36 @@ function CFTable(_ref2) {
       if (tableWidth < mergeScroll.x) {
         tableWidth = mergeScroll.x;
       }
-      if (widthTotal < tableWidth - rowSelectWidth && nullNum > 0) {
-        var nullCellNum = (tableWidth - rowSelectWidth - widthTotalNull) / nullNum;
-        var _loopForEach3 = function loopForEach1(arr) {
-          arr.forEach(function (col) {
-            if (col.children && col.children.length > 0) {
-              _loopForEach3(col.children);
-            } else if (!columnConfigWidthMap.current[col.name]) {
-              newData[col.name] = nullCellNum;
-            }
-          });
-        };
-        _loopForEach3(simpleColumns);
+      if (widthTotal < tableWidth - rowSelectWidth) {
+        if (nullNum > 0) {
+          var nullCellNum = (tableWidth - rowSelectWidth - widthTotalNull) / nullNum;
+          var _loopForEach3 = function loopForEach1(arr) {
+            arr.forEach(function (col) {
+              if (col.children && col.children.length > 0) {
+                _loopForEach3(col.children);
+              } else if (!columnConfigWidthMap.current[col.name]) {
+                newData[col.name] = nullCellNum;
+              }
+            });
+          };
+          _loopForEach3(simpleColumns);
+        } else {
+          var ratio = widthTotal > 0 ? (tableWidth - rowSelectWidth) / widthTotal : 1;
+          var _loopForEach4 = function loopForEach1(arr) {
+            arr.forEach(function (col) {
+              if (col.children && col.children.length > 0) {
+                _loopForEach4(col.children);
+              } else {
+                newData[col.name] = (newData[col.name] || 80) * ratio;
+              }
+            });
+          };
+          _loopForEach4(simpleColumns);
+        }
       }
     }
-    _setColumnWidthMap(newData);
-  }, [JSON.stringify(simpleColumns)]);
+    setColumnWidthMap(newData);
+  }, [simpleColumnsStr]);
   var showColumns = (0, _react.useMemo)(function () {
     var _loopMap2 = function loopMap(arr) {
       return arr.map(function (el) {
@@ -603,9 +616,9 @@ function CFTable(_ref2) {
     var _onColResizeUp = function onColResizeUp(e) {
       document.body.style.userSelect = '';
       setColResizeStyle(null);
-      _setColumnWidthMap(function (old) {
+      setColumnWidthMap(function (old) {
         return _objectSpread(_objectSpread({}, old), {}, _defineProperty({}, nameKey, minMaxNum(e.clientX - ((parentBcr === null || parentBcr === void 0 ? void 0 : parentBcr.left) || 0), minResize, maxResize)));
-      }, true);
+      });
       window.removeEventListener('mousemove', onColResizeMove);
       window.removeEventListener('mouseup', _onColResizeUp);
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "ds-web-all",
-  "version": "1.0.1-beta.89",
+  "version": "1.0.1-beta.90",
   "scripts": {
     "start": "cross-env BUILD_ENV=dev && dumi dev",
     "docs:build": "cross-env BUILD_ENV=production && dumi build",