@vtx/components 4.0.0-beta.8 → 4.0.0-beta.81

package/lib/vtx-datagrid/columnState.js

@@ -0,0 +1,100 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildColumnKeyMap = buildColumnKeyMap;
+exports.buildSortKeyColumns = buildSortKeyColumns;
+exports.getVisibleColumnKeysFromMap = getVisibleColumnKeysFromMap;
+exports.indexColumnKey = void 0;
+var _genColumnKey = require("../utils/genColumnKey");
+var _sortByGivenOrder = require("../utils/sortByGivenOrder");
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+var indexColumnKey = exports.indexColumnKey = '_serialNum';
+function buildColumnKeyMap() {
+  var tableColumn = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+    visibleColumnKeys = _ref.visibleColumnKeys,
+    defaultVisibleColumnKeys = _ref.defaultVisibleColumnKeys,
+    _ref$previousColumnsM = _ref.previousColumnsMap,
+    previousColumnsMap = _ref$previousColumnsM === void 0 ? {} : _ref$previousColumnsM,
+    _ref$indexColumn = _ref.indexColumn,
+    indexColumn = _ref$indexColumn === void 0 ? true : _ref$indexColumn;
+  var hasVisibleColumnKeys = Array.isArray(visibleColumnKeys);
+  var hasDefaultVisibleColumnKeys = Array.isArray(defaultVisibleColumnKeys);
+  return (tableColumn || []).reduce(function (columnKeyMap, _ref2, index) {
+    var _previousConfig$fixed, _previousConfig$width;
+    var key = _ref2.key,
+      dataIndex = _ref2.dataIndex,
+      fixed = _ref2.fixed,
+      disable = _ref2.disable,
+      width = _ref2.width;
+    var columnKey = (0, _genColumnKey.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
+    var previousConfig = previousColumnsMap[columnKey] || {};
+    var show = previousConfig.show;
+    if (indexColumn && indexColumnKey === columnKey) {
+      show = true;
+    } else if (hasVisibleColumnKeys) {
+      show = visibleColumnKeys.includes(columnKey);
+    } else if (show === undefined && hasDefaultVisibleColumnKeys) {
+      show = defaultVisibleColumnKeys.includes(columnKey);
+    } else if (show === undefined) {
+      show = true;
+    }
+    columnKeyMap[columnKey] = {
+      show: show,
+      fixed: (_previousConfig$fixed = previousConfig.fixed) !== null && _previousConfig$fixed !== void 0 ? _previousConfig$fixed : fixed,
+      disable: disable,
+      width: (_previousConfig$width = previousConfig.width) !== null && _previousConfig$width !== void 0 ? _previousConfig$width : width
+    };
+    if (previousConfig.order !== undefined) {
+      columnKeyMap[columnKey].order = previousConfig.order;
+    }
+    return columnKeyMap;
+  }, {});
+}
+function buildSortKeyColumns() {
+  var columnsMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var visibleColumnKeys = arguments.length > 1 ? arguments[1] : undefined;
+  var defaultVisibleColumnKeys = arguments.length > 2 ? arguments[2] : undefined;
+  var columnKeys = Object.keys(columnsMap);
+  var sortKeys = visibleColumnKeys || defaultVisibleColumnKeys || [];
+  if (sortKeys.length > 0) {
+    return (0, _sortByGivenOrder.sortByGivenOrder)(columnKeys, sortKeys);
+  }
+  return columnKeys;
+}
+function getVisibleColumnKeysFromMap() {
+  var columnsMap = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var sortKeyColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var allColumnKeys = Array.from(new Set([].concat(_toConsumableArray(sortKeyColumns), _toConsumableArray(Object.keys(columnsMap)))));
+  var sortIndexMap = new Map(sortKeyColumns.map(function (columnKey, index) {
+    return [columnKey, index];
+  }));
+  return allColumnKeys.filter(function (columnKey) {
+    var _columnsMap$columnKey;
+    return (_columnsMap$columnKey = columnsMap[columnKey]) === null || _columnsMap$columnKey === void 0 ? void 0 : _columnsMap$columnKey.show;
+  }).sort(function (leftKey, rightKey) {
+    var leftConfig = columnsMap[leftKey] || {};
+    var rightConfig = columnsMap[rightKey] || {};
+    var leftFixed = leftConfig.fixed,
+      leftOrder = leftConfig.order;
+    var rightFixed = rightConfig.fixed,
+      rightOrder = rightConfig.order;
+    if (leftFixed === 'left' && rightFixed !== 'left' || rightFixed === 'right' && leftFixed !== 'right') {
+      return -2;
+    }
+    if (rightFixed === 'left' && leftFixed !== 'left' || leftFixed === 'right' && rightFixed !== 'right') {
+      return 2;
+    }
+    if (leftOrder !== undefined || rightOrder !== undefined) {
+      return (leftOrder !== null && leftOrder !== void 0 ? leftOrder : 0) - (rightOrder !== null && rightOrder !== void 0 ? rightOrder : 0);
+    }
+    return (sortIndexMap.has(leftKey) ? sortIndexMap.get(leftKey) : Number.MAX_SAFE_INTEGER) - (sortIndexMap.has(rightKey) ? sortIndexMap.get(rightKey) : Number.MAX_SAFE_INTEGER);
+  });
+}

package/lib/vtx-datagrid/index.js

@@ -17,6 +17,7 @@ var _useSet3 = _interopRequireDefault(require("../utils/useSet"));
 var _Alert = _interopRequireDefault(require("./Alert"));
 var _ToolBar = _interopRequireDefault(require("./ToolBar"));
 var _Provide = require("./Store/Provide");
+var _mergeComponents = require("./mergeComponents");
 var _index = require("./style/index");
 var _reactAntdColumnResize = require("react-antd-column-resize");
 var _vtxProvider = require("../vtx-provider");
@@ -42,8 +43,8 @@ var isMac = navigator.userAgent.indexOf('Mac OS') !== -1;
 var indexColumnKey = exports.indexColumnKey = '_serialNum';
 var DEFAULT_HEIGHTS = exports.DEFAULT_HEIGHTS = {
   HEAD_FOOT: 115,
-  ALERT: 49,
-  TOOLBAR: 56
+  ALERT: 48,
+  TOOLBAR: 64
 };
 function VtxTable(props) {
   var _rest$dataSource, _rest$rowSelection, _rest$rowSelection3, _rest$rowSelection4;
@@ -62,17 +63,19 @@ function VtxTable(props) {
     isDragRef = _useContext2.isDragRef,
     rootDomRef = _useContext2.rootDomRef,
     sortKeyColumns = _useContext2.sortKeyColumns,
-    TextEnum = _useContext2.TextEnum;
+    TextEnum = _useContext2.TextEnum,
+    tableSize = _useContext2.tableSize;
   var _useSet = (0, _useSet3.default)({
       // 表格id
       datagridId: "vtx-datagrid-".concat(new Date().getTime()),
-      scrollY: 0
+      scrollY: undefined
     }),
     _useSet2 = _slicedToArray(_useSet, 2),
     _useSet2$ = _useSet2[0],
     datagridId = _useSet2$.datagridId,
     scrollY = _useSet2$.scrollY,
     setState = _useSet2[1];
+  var scrollYRef = (0, _react.useRef)(undefined);
   // 列设置提示高度
   var alertHeight = (0, _react.useRef)(0);
   // 工具栏高度
@@ -117,25 +120,65 @@ function VtxTable(props) {
 
   // 高度计算
   var _useThrottleFn = (0, _ahooks.useThrottleFn)(function () {
-      var _rootDomRef$current;
+      var _rootDomRef$current, _bodyDiv$getElementsB;
       if (!rootDomRef.current) {
         return null;
       }
-      var bodyHeight = ((_rootDomRef$current = rootDomRef.current) === null || _rootDomRef$current === void 0 ? void 0 : _rootDomRef$current.clientHeight) - headFootHeight - toolbarHeight.current - alertHeight.current;
       var divs = rootDomRef.current.getElementsByTagName('div');
+      var pagination = Array.prototype.filter.call(rootDomRef.current.getElementsByTagName('ul'), function (dom) {
+        return dom.className.includes('ant-pagination');
+      })[0];
+      var tableHeader = Array.prototype.filter.call(rootDomRef.current.getElementsByTagName('thead'), function (dom) {
+        return dom.className.includes('ant-table-thead');
+      })[0];
+      var _headFootHeight = headFootHeight;
+      if (tableHeader) {
+        _headFootHeight = ((pagination === null || pagination === void 0 ? void 0 : pagination.clientHeight) || 0) + 32 + (tableHeader === null || tableHeader === void 0 ? void 0 : tableHeader.clientHeight);
+      }
+      var bodyHeight = ((_rootDomRef$current = rootDomRef.current) === null || _rootDomRef$current === void 0 ? void 0 : _rootDomRef$current.clientHeight) - _headFootHeight - toolbarHeight.current - alertHeight.current;
+      if (!bodyHeight || bodyHeight <= 0) {
+        return;
+      }
       var bodyDiv = Array.prototype.filter.call(divs, function (dom) {
-        return dom.className.includes('ant-table-body') || dom.className.includes('ant-table-content');
+        return dom.className.includes('ant-table-body') || dom.className.includes('ant-table-content') || dom.className.includes('ant-table-tbody');
       })[0];
+      var tablePlaceholder = Array.prototype.filter.call(rootDomRef.current.getElementsByTagName('tr'), function (dom) {
+        return dom.className.includes('ant-table-placeholder');
+      })[0];
+      if (!bodyDiv) {
+        return;
+      }
+      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) || 0;
+      var minBodyHeight = Math.max(bodyHeight - (rest.scrollY || 0), 0);
       if (bodyDiv) {
-        bodyDiv.style.minHeight = "".concat(bodyHeight - (rest.scrollY || 0), "px");
+        bodyDiv.style.minHeight = "".concat(minBodyHeight, "px");
+      }
+      if (tablePlaceholder) {
+        var placeholderHeight = Math.max(bodyHeight - (rest.scrollY || 0) - 48 - 12, 0);
+        tablePlaceholder.style.height = "".concat(placeholderHeight, "px");
+        var tableCell = Array.prototype.filter.call(tablePlaceholder.getElementsByTagName('td'), function (dom) {
+          return dom.className.includes('ant-table-cell');
+        })[0];
+        if (tableCell) {
+          tableCell.style.height = "".concat(placeholderHeight, "px");
+        }
+      }
+      // antd6.x 的bug  如果table的高度 没有body 高 则没有滚动条
+
+      var nextScrollY = tableHeight > bodyHeight ? bodyHeight : undefined;
+      if (scrollYRef.current !== nextScrollY) {
+        scrollYRef.current = nextScrollY;
+        setState({
+          scrollY: nextScrollY
+        });
       }
-      setState({
-        scrollY: bodyHeight
-      });
     }, {
       wait: 350
     }),
     calculateHeight = _useThrottleFn.run;
+  (0, _react.useEffect)(function () {
+    scrollYRef.current = scrollY;
+  }, [scrollY]);
   (0, _react.useEffect)(function () {
     var resizeObserver = new ResizeObserver(function () {
       calculateHeight();
@@ -150,7 +193,14 @@ function VtxTable(props) {
         resizeObserver.disconnect();
       }
     };
-  }, [autoFit]);
+  }, [autoFit, tableSize]);
+
+  // fix: 最后一页，横向滚动条上移问题
+  (0, _react.useEffect)(function () {
+    if (scrollY > 0) {
+      calculateHeight();
+    }
+  }, [scrollY]);
   (0, _react.useLayoutEffect)(function () {
     if (autoFit) {
       calculateHeight();
@@ -191,9 +241,6 @@ function VtxTable(props) {
       });
     };
     var _tableColumn = loopFilter(counter.tableColumn);
-    if (!columnsMap['_serialNum']) {
-      return [];
-    }
     return (0, _utils.sortByKeyArrayExtract)(_tableColumn, sortKeyColumns, columnsMap, 'key');
   }, [columnsMap, counter.tableColumn, sortKeyColumns]);
 
@@ -231,9 +278,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;
@@ -247,15 +297,44 @@ function VtxTable(props) {
   var _useAntdColumnResize = (0, _reactAntdColumnResize.useAntdColumnResize)(function () {
       return {
         columns: columns,
-        minWidth: 20
+        minWidth: 10
       };
     }, [columns]),
     resizableColumns = _useAntdColumnResize.resizableColumns,
     resizeComponents = _useAntdColumnResize.components,
     tableWidth = _useAntdColumnResize.tableWidth,
     resetColumns = _useAntdColumnResize.resetColumns;
+
+  // const _columns = useMemo(() => {
+  //     let result = [];
+  //     if (!showTable) {
+  //         result = []
+  //     } else if (isDragRef) {
+  //         result = resizableColumns
+  //     } else {
+  //         result = columns
+  //     }
+  //     let flag = false;
+  //     result?.map((v) => {
+  //         if (columnsMap[v.key].width !== v.width) {
+  //             flag = true;
+  //             columnsMap[v.key] = {
+  //                 ...columnsMap[v.key],
+  //                 width: v.width
+  //             };
+  //         }
+  //     })
+  //     if (flag) {
+  //         counter.setColumnsMap(
+  //             columnsMap
+  //         )
+  //     }
+  //     return result;
+
+  // }, [isDragRef, resizableColumns, showTable, columns, columnsMap])
+
+  // 1. 先计算列配置
   var _columns = (0, _react.useMemo)(function () {
-    var _result;
     var result = [];
     if (!showTable) {
       result = [];
@@ -264,24 +343,30 @@ function VtxTable(props) {
     } else {
       result = columns;
     }
+    return result;
+  }, [isDragRef, resizableColumns, showTable, columns]);
+
+  // 2. 在 effect 中同步列宽到 columnsMap
+  (0, _react.useEffect)(function () {
+    if (!showTable || !_columns.length) return;
     var flag = false;
-    (_result = result) === null || _result === void 0 || _result.map(function (v) {
-      if (columnsMap[v.key].width !== v.width) {
+    var newColumnsMap = _objectSpread({}, columnsMap); // 创建副本避免直接修改
+
+    _columns.forEach(function (v) {
+      var _columnsMap$v$key;
+      if (((_columnsMap$v$key = columnsMap[v.key]) === null || _columnsMap$v$key === void 0 ? void 0 : _columnsMap$v$key.width) !== v.width) {
         flag = true;
-        columnsMap[v.key].width = v.width;
+        newColumnsMap[v.key] = _objectSpread(_objectSpread({}, newColumnsMap[v.key]), {}, {
+          width: v.width
+        });
       }
     });
     if (flag) {
-      counter.setColumnsMap(columnsMap);
+      counter.setColumnsMap(newColumnsMap);
     }
-    return result;
-  }, [isDragRef, resizableColumns, showTable, columns, columnsMap]);
+  }, [_columns, columnsMap, counter, showTable]);
   var _components = (0, _react.useMemo)(function () {
-    if (isDragRef) {
-      return resizeComponents;
-    } else {
-      return components;
-    }
+    return (0, _mergeComponents.mergeComponentsForResize)(components, resizeComponents, isDragRef);
   }, [isDragRef, resizeComponents, components]);
 
   // 工具栏
@@ -303,20 +388,24 @@ function VtxTable(props) {
   }) : null;
   return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     id: datagridId,
-    className: (0, _classnames2.default)(prefixCls, className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-fit"), autoFit), "".concat(prefixCls, "-noFit"), !autoFit), "".concat(prefixCls, "-nodata"), !(dataSource !== null && dataSource !== void 0 && dataSource.length)), "".concat(prefixCls, "-userAgent-mac"), isMac), "".concat(prefixCls, "-striped"), tableStyles.includes('striped')), "".concat(prefixCls, "-no-border"), !tableStyles.includes('border')), "".concat(prefixCls, "-header-background"), tableStyles.includes('header-background')), hashId),
+    className: (0, _classnames2.default)(prefixCls, className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-fit"), autoFit), "".concat(prefixCls, "-noFit"), !autoFit), "".concat(prefixCls, "-nodata"), !(dataSource !== null && dataSource !== void 0 && dataSource.length)), "".concat(prefixCls, "-userAgent-mac"), isMac), "".concat(prefixCls, "-striped"), tableStyles.includes('striped')), "".concat(prefixCls, "-no-border"), !tableStyles.includes('border')), "".concat(prefixCls, "-no-data"), (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) === 0), "".concat(prefixCls, "-header-background"), tableStyles.includes('header-background')), "".concat(prefixCls, "-no-header-background"), !tableStyles.includes('header-background')), hashId),
     ref: rootDomRef,
     style: style,
     children: [toolbarRender, alertRender, /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Table, _objectSpread(_objectSpread({
       size: counter.tableSize,
       bordered: true
+      // virtual
     }, rest), {}, {
       dataSource: dataSource,
       scroll: _objectSpread({
         x: 'max-content'
       }, scroll),
       pagination: getPagination(rest.pagination),
-      style: {
-        height: "calc(100% - ".concat(toolbarHeight.current + alertHeight.current, "px)")
+      xs: true,
+      styles: {
+        root: {
+          height: "calc(100% - ".concat(toolbarHeight.current + alertHeight.current, "px)")
+        }
       },
       locale: _objectSpread({
         emptyText: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Empty, {
@@ -325,6 +414,9 @@ function VtxTable(props) {
       }, rest.locale),
       components: _components,
       columns: _columns
+      // tableLayout={'auto'}
+      ,
+      tableLayout: "fixed"
     }))]
   }));
 }

package/lib/vtx-datagrid/mergeComponents.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mergeComponentsForResize = mergeComponentsForResize;
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function mergeComponentsForResize(components, resizeComponents, isDragRef) {
+  if (!isDragRef) {
+    return components;
+  }
+  return _objectSpread(_objectSpread(_objectSpread({}, resizeComponents || {}), components || {}), {}, {
+    header: _objectSpread(_objectSpread({}, (components === null || components === void 0 ? void 0 : components.header) || {}), (resizeComponents === null || resizeComponents === void 0 ? void 0 : resizeComponents.header) || {}),
+    body: _objectSpread(_objectSpread({}, (resizeComponents === null || resizeComponents === void 0 ? void 0 : resizeComponents.body) || {}), (components === null || components === void 0 ? void 0 : components.body) || {})
+  });
+}

package/lib/vtx-datagrid/renderColumnButtons.js

@@ -10,8 +10,15 @@ var _antd = require("antd");
 var _vtxIcon = _interopRequireDefault(require("../vtx-icon"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
-var _excluded = ["confirm"];
+var _excluded = ["confirm"],
+  _excluded2 = ["confirm"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -19,12 +26,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var renderColumnButtons = function renderColumnButtons(_ref) {
   var _renderButtons;
   var renderButtons = _ref.renderButtons,
@@ -51,14 +52,32 @@ var renderColumnButtons = function renderColumnButtons(_ref) {
     /* eslint-disable */
     moreRender = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Dropdown, {
       menu: {
-        items: (moreActions === null || moreActions === void 0 ? void 0 : moreActions.map(function (item, i) {
+        items: (moreActions === null || moreActions === void 0 ? void 0 : moreActions.map(function (item, index) {
+          var name = item.name,
+            popconfirm = item.popconfirm;
+          if (popconfirm) {
+            var confirm = popconfirm.confirm,
+              rest = _objectWithoutProperties(popconfirm, _excluded);
+            return {
+              key: index,
+              label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popconfirm, _objectSpread(_objectSpread({
+                trigger: ['hover'],
+                onConfirm: confirm ? function () {
+                  return confirm(record, index);
+                } : undefined
+              }, rest), {}, {
+                children: name
+              }))
+            };
+          }
           return {
-            key: i,
+            key: index,
             label: item.name
           };
         })) || [],
         onClick: function onClick(e) {
-          moreActions[e.key].onClick(record, index);
+          var _moreActions$e$key, _moreActions$e$key$on;
+          (_moreActions$e$key = moreActions[e.key]) === null || _moreActions$e$key === void 0 || (_moreActions$e$key$on = _moreActions$e$key.onClick) === null || _moreActions$e$key$on === void 0 || _moreActions$e$key$on.call(_moreActions$e$key, record, index);
         }
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("a", {
@@ -88,7 +107,7 @@ var renderColumnButtons = function renderColumnButtons(_ref) {
     }, name);
     if (popconfirm) {
       var confirm = popconfirm.confirm,
-        rest = _objectWithoutProperties(popconfirm, _excluded);
+        rest = _objectWithoutProperties(popconfirm, _excluded2);
       btnNode = /*#__PURE__*/(0, _react.createElement)(_antd.Popconfirm, _objectSpread(_objectSpread({}, rest), {}, {
         onConfirm: confirm ? function () {
           return confirm(record, index);

package/lib/vtx-datagrid/style/index.js

@@ -14,37 +14,85 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 var genVtxStyle = function genVtxStyle(token) {
   var componentCls = token.componentCls,
     antCls = token.antCls;
-  return _defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
+  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty({
     position: 'relative',
-    overflow: 'hidden'
-  }, "".concat(antCls, "-table-wrapper"), _defineProperty(_defineProperty({}, '.ant-table', _defineProperty(_defineProperty(_defineProperty({}, '.ant-table-header', _defineProperty({}, '.ant-table-thead', {
+    // overflow: 'hidden',
+    display: 'flex',
+    flexDirection: 'column'
+  }, "".concat(antCls, "-table-cell-ellipsis"), {
+    whiteSpace: 'normal'
+  }), "".concat(antCls, "-table-wrapper"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "table", {
+    // minWidth: "calc(100% - 2px) !important"
+  }), '.ant-spin, .ant-spin-nested-loading', _defineProperty({
+    height: '100%'
+  }, '.ant-spin-container', _defineProperty({
+    height: '100%',
+    display: 'flex',
+    flexDirection: 'column'
+  }, '.ant-table', _defineProperty({
+    // height: '100%',
+    flex: 1
+  }, '.ant-table-container', _defineProperty(_defineProperty({
+    height: '100%',
+    borderInlineStart: 'none'
+  }, '.ant-table-body', {
+    scrollbarWidth: 'thin'
+  }), '.ant-table-content', _defineProperty({
+    height: '100%',
+    scrollbarWidth: 'thin'
+  }, 'table', {
+    // height: '100%',
+    minWidth: 'calc(100% - 1px) !important'
+  })))))), '.ant-table', _defineProperty(_defineProperty(_defineProperty({}, '.ant-table-header', _defineProperty({}, '.ant-table-thead', {
     '>tr>th': {
-      background: token.colorBgContainer
+      background: token.colorBgContainer,
+      '&:first-child': {
+        borderInlineStart: 'var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)'
+      }
     }
   })), '.ant-table-cell', {
-    minWidth: 20
-  }), '.ant-table-body', _defineProperty({}, '.ant-table-tbody', {
+    // minWidth: 10,
+  }), '.ant-table-tbody', {
+    '>tr>td': {
+      '&:first-child': {
+        borderInlineStart: 'var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)'
+      }
+    },
     '>tr.ant-table-placeholder': {
       position: 'absolute',
-      top: '25%',
+      top: 'auto',
+      bottom: 'auto',
       right: 0,
       left: 0,
       backgroundColor: 'transparent',
       borderTop: 'none',
+      // borderInlineEnd: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
+      // borderBottom: "var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)",
       '>td.ant-table-cell': {
-        display: 'flex',
-        alignItems: 'center',
-        justifyContent: 'center',
+        padding: 0,
         width: '100%',
         height: '100%',
-        border: 'none'
+        border: 'none',
+        '>.ant-table-expanded-row-fixed': {
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+          height: '100%',
+          width: '100%',
+          '&::after': {
+            border: 'none'
+          }
+        }
       }
     }
-  }))), '.ant-pagination', _defineProperty({}, '.ant-pagination-item', {
+  })), '.ant-pagination', _defineProperty({
+    margin: 'var(--ant-margin) 0 0 0'
+  }, '.ant-pagination-item', {
     borderRadius: token.borderRadiusSM
-  }))), "&-fit", {
-    height: '100%'
-  }), "&-noFit", {}), "&-no-border", _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty(_defineProperty({
+  })))), "".concat(componentCls, "-fit"), {
+    height: '100%',
+    minHeight: 200
+  }), "".concat(componentCls, "-noFit"), {}), "".concat(componentCls, "-no-border"), _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty(_defineProperty({
     borderColor: 'transparent'
   }, '.ant-table-thead', {
     '>tr>th': {
@@ -53,10 +101,14 @@ var genVtxStyle = function genVtxStyle(token) {
   }), '.ant-table-body', {
     '>table >tbody>tr>td': {
       borderInlineColor: 'transparent !important'
+    },
+    '>table >tbody>tr.ant-table-placeholder': {
+      borderInlineColor: 'transparent !important',
+      borderBottomColor: 'transparent !important'
     }
-  }))))), "&.vtx-datagrid-striped", _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty({}, '.ant-table-body', {
+  }))))), "".concat(componentCls, "-striped"), _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty(_defineProperty({}, '.ant-table-body', {
     '>table >tbody>tr:nth-child(odd)>td': {
-      backgroundColor: token.colorBgLayout,
+      backgroundColor: token.colorBgLayoutTable,
       '&.ant-table-cell-row-hover': {
         backgroundColor: token.colorFillAlterSolid
       }
@@ -70,11 +122,41 @@ var genVtxStyle = function genVtxStyle(token) {
         backgroundColor: token.controlItemBgActiveHover
       }
     }
-  }))))), "&.vtx-datagrid-header-background", _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, '.ant-table', _defineProperty({}, '.ant-table-header', _defineProperty({}, '.ant-table-thead', {
+  }), '.ant-table-tbody', {
+    '>tr:nth-child(odd)>td': {
+      backgroundColor: token.colorBgLayoutTable,
+      '&.ant-table-cell-row-hover': {
+        backgroundColor: token.colorFillAlterSolid
+      }
+    },
+    '>tr:nth-child(odd)>td.ant-table-column-sort': {
+      backgroundColor: token.colorFillAlterSolid
+    },
+    '>tr.ant-table-row-selected:nth-child(odd)>td': {
+      backgroundColor: token.controlItemBgActive,
+      '&.ant-table-cell-row-hover': {
+        backgroundColor: token.controlItemBgActiveHover
+      }
+    }
+  }))))), "".concat(componentCls, "-header-background"), _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, '.ant-table', _defineProperty({}, '.ant-table-header', _defineProperty({}, '.ant-table-thead', {
     '>tr>th': {
-      background: token.colorBgLayout
+      background: token.colorBgLayoutTable
+    }
+  }))))), "".concat(componentCls, "-no-header-background"), _defineProperty({}, "".concat(antCls, "-table-wrapper "), _defineProperty({}, '.ant-table-thead', {
+    '>tr>th': {
+      background: token.colorBgContainer
     }
-  }))))));
+  }))), "".concat(componentCls, "-no-data"), _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, '.ant-spin', _defineProperty({}, '.ant-spin-container', _defineProperty({}, '.ant-table', _defineProperty({}, '.ant-table-container', _defineProperty({
+    borderInlineStart: 'var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)'
+  }, '.ant-table-content', _defineProperty({
+    borderRight: 'var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)',
+    borderBottom: 'var(--ant-line-width) var(--ant-line-type) var(--ant-table-border-color)'
+  }, 'table', {})))))))), "".concat(componentCls, "-no-data").concat(componentCls, "-no-border"), _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, '.ant-spin', _defineProperty({}, '.ant-spin-container', _defineProperty({}, '.ant-table', _defineProperty({}, '.ant-table-container', _defineProperty({
+    borderInlineStart: 'none'
+  }, '.ant-table-content', {
+    borderRight: 'none',
+    borderBottom: 'none'
+  })))))));
 };
 function useStyle(prefix) {
   return (0, _vtxProvider.useStyle)(prefix, function (token) {