@vtx/components 4.0.0-beta.24 → 4.0.0-beta.25

package/es/vtx-datagrid/index.js

@@ -107,7 +107,7 @@ function VtxTable(props) {
 
   // 高度计算
   var _useThrottleFn = useThrottleFn(function () {
-      var _rootDomRef$current;
+      var _rootDomRef$current, _bodyDiv$getElementsB;
       if (!rootDomRef.current) {
         return null;
       }
@@ -121,8 +121,8 @@ function VtxTable(props) {
       })[0];
       if (bodyDiv) {
         bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
-        bodyDiv.style.overflowY = 'auto';
       }
+      var tableHeight = (_bodyDiv$getElementsB = bodyDiv.getElementsByTagName('table')) === null || _bodyDiv$getElementsB === void 0 || (_bodyDiv$getElementsB = _bodyDiv$getElementsB[0]) === null || _bodyDiv$getElementsB === void 0 ? void 0 : _bodyDiv$getElementsB.clientHeight;
       if (tablePlaceholder) {
         tablePlaceholder.style.height = "".concat(bodyHeight - (rest.scrollY || 0) - 12, "px");
         var tableCell = Array.prototype.filter.call(tablePlaceholder.getElementsByTagName('td'), function (dom) {
@@ -130,8 +130,10 @@ function VtxTable(props) {
         })[0];
         tableCell.style.height = "".concat(bodyHeight - (rest.scrollY || 0) - 12, "px");
       }
+      // antd6.x 的bug  如果table的高度 没有body 高 则没有滚动条
+
       setState({
-        scrollY: bodyHeight
+        scrollY: tableHeight > bodyHeight ? bodyHeight : undefined
       });
     }, {
       wait: 350
@@ -229,9 +231,12 @@ function VtxTable(props) {
       result = _objectSpread(_objectSpread({}, result), {}, {
         y: scrollY - (rest.scrollY || 0)
       });
+      if (scrollY == undefined) {
+        result.y = undefined;
+      }
     }
     return result;
-  }, [rest.scroll, rest.scrollY, autoFit]);
+  }, [rest.scroll, rest.scrollY, scrollY, autoFit]);
   var hasAlert = useMemo(function () {
     var _rest$rowSelection2;
     return (((_rest$rowSelection2 = rest.rowSelection) === null || _rest$rowSelection2 === void 0 ? void 0 : _rest$rowSelection2.selectedRowKeys) || []).length > 0;
@@ -346,6 +351,7 @@ function VtxTable(props) {
     children: [toolbarRender, alertRender, /*#__PURE__*/_jsx(Table, _objectSpread(_objectSpread({
       size: counter.tableSize,
       bordered: true
+      // virtual
     }, rest), {}, {
       dataSource: dataSource,
       scroll: _objectSpread({
@@ -361,7 +367,8 @@ function VtxTable(props) {
         })
       }, rest.locale),
       components: _components,
-      columns: _columns
+      columns: _columns,
+      tableLayout: 'auto'
     }))]
   }));
 }

package/lib/vtx-datagrid/index.js

@@ -117,7 +117,7 @@ function VtxTable(props) {
 
   // 高度计算
   var _useThrottleFn = (0, _ahooks.useThrottleFn)(function () {
-      var _rootDomRef$current;
+      var _rootDomRef$current, _bodyDiv$getElementsB;
       if (!rootDomRef.current) {
         return null;
       }
@@ -131,8 +131,8 @@ function VtxTable(props) {
       })[0];
       if (bodyDiv) {
         bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
-        bodyDiv.style.overflowY = 'auto';
       }
+      var tableHeight = (_bodyDiv$getElementsB = bodyDiv.getElementsByTagName('table')) === null || _bodyDiv$getElementsB === void 0 || (_bodyDiv$getElementsB = _bodyDiv$getElementsB[0]) === null || _bodyDiv$getElementsB === void 0 ? void 0 : _bodyDiv$getElementsB.clientHeight;
       if (tablePlaceholder) {
         tablePlaceholder.style.height = "".concat(bodyHeight - (rest.scrollY || 0) - 12, "px");
         var tableCell = Array.prototype.filter.call(tablePlaceholder.getElementsByTagName('td'), function (dom) {
@@ -140,8 +140,10 @@ function VtxTable(props) {
         })[0];
         tableCell.style.height = "".concat(bodyHeight - (rest.scrollY || 0) - 12, "px");
       }
+      // antd6.x 的bug  如果table的高度 没有body 高 则没有滚动条
+
       setState({
-        scrollY: bodyHeight
+        scrollY: tableHeight > bodyHeight ? bodyHeight : undefined
       });
     }, {
       wait: 350
@@ -239,9 +241,12 @@ function VtxTable(props) {
       result = _objectSpread(_objectSpread({}, result), {}, {
         y: scrollY - (rest.scrollY || 0)
       });
+      if (scrollY == undefined) {
+        result.y = undefined;
+      }
     }
     return result;
-  }, [rest.scroll, rest.scrollY, autoFit]);
+  }, [rest.scroll, rest.scrollY, scrollY, autoFit]);
   var hasAlert = (0, _react.useMemo)(function () {
     var _rest$rowSelection2;
     return (((_rest$rowSelection2 = rest.rowSelection) === null || _rest$rowSelection2 === void 0 ? void 0 : _rest$rowSelection2.selectedRowKeys) || []).length > 0;
@@ -356,6 +361,7 @@ function VtxTable(props) {
     children: [toolbarRender, alertRender, /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Table, _objectSpread(_objectSpread({
       size: counter.tableSize,
       bordered: true
+      // virtual
     }, rest), {}, {
       dataSource: dataSource,
       scroll: _objectSpread({
@@ -371,7 +377,8 @@ function VtxTable(props) {
         })
       }, rest.locale),
       components: _components,
-      columns: _columns
+      columns: _columns,
+      tableLayout: 'auto'
     }))]
   }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/components",
-  "version": "4.0.0-beta.24",
+  "version": "4.0.0-beta.25",
   "description": "React components for Vortex",
   "keywords": [
     "react",
@@ -155,7 +155,7 @@
     "@vitest/coverage-istanbul": "^3.2.4",
     "@vitest/ui": "^3.2.4",
     "animated-scroll-to": "^2.3.2",
-    "antd": "^6.0.0",
+    "antd": "^6.3.1",
     "chalk": "^4.1.2",
     "copy-to-clipboard": "^3.3.3",
     "cross-env": "^7.0.3",