@vtx/components 4.0.0-beta.34 → 4.0.0-beta.36

package/es/vtx-tree-select/index.js

@@ -142,24 +142,27 @@ var VtxTreeSelect = function VtxTreeSelect(_ref) {
         },
         children: intl.getMessage('treeSelect.clearSelectedItems', '清空已选项')
       })]
-    }), selectedNodes.length > 0 ? selectedNodes.map(function (item) {
-      var _item$fieldNames$labe;
-      return /*#__PURE__*/_jsx(Tag, {
-        closable: !disabled,
-        onClose: function onClose(e) {
-          e.stopPropagation();
-          clearKey(item[fieldNames.value]);
-        },
-        styles: {
-          root: {
-            marginBottom: 5,
-            marginRight: 5
-          }
-        },
-        children: ((_item$fieldNames$labe = item[fieldNames.label]) === null || _item$fieldNames$labe === void 0 ? void 0 : _item$fieldNames$labe.length) > 20 ? "".concat(item[fieldNames.label].slice(0, 20), "...") : item[fieldNames.label]
-      }, "tab-".concat(item[fieldNames.value]));
-    }) : /*#__PURE__*/_jsx(Empty, {
-      image: Empty.PRESENTED_IMAGE_SIMPLE
+    }), /*#__PURE__*/_jsx("div", {
+      className: classnames("".concat(prefixCls, "-all-list"), hashId),
+      children: selectedNodes.length > 0 ? selectedNodes.map(function (item) {
+        var _item$fieldNames$labe;
+        return /*#__PURE__*/_jsx(Tag, {
+          closable: !disabled,
+          onClose: function onClose(e) {
+            e.stopPropagation();
+            clearKey(item[fieldNames.value]);
+          },
+          styles: {
+            root: {
+              marginBottom: 5,
+              marginRight: 5
+            }
+          },
+          children: ((_item$fieldNames$labe = item[fieldNames.label]) === null || _item$fieldNames$labe === void 0 ? void 0 : _item$fieldNames$labe.length) > 20 ? "".concat(item[fieldNames.label].slice(0, 20), "...") : item[fieldNames.label]
+        }, "tab-".concat(item[fieldNames.value]));
+      }) : /*#__PURE__*/_jsx(Empty, {
+        image: Empty.PRESENTED_IMAGE_SIMPLE
+      })
     })]
   });
   var onChangeTreeSelect = function onChangeTreeSelect(value, label, extra) {

package/es/vtx-tree-select/style/index.js

@@ -8,7 +8,7 @@ import { useStyle as useAntdStyle } from "../../vtx-provider";
 var genVtxTreeSelectStyle = function genVtxTreeSelectStyle(token) {
   var componentCls = token.componentCls;
   console.log('token.controlHeight', token.controlHeight);
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-popover', {
+  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, '&-popover', {
     minWidth: '200px',
     height: '300px',
     overflow: 'auto',
@@ -48,6 +48,9 @@ var genVtxTreeSelectStyle = function genVtxTreeSelectStyle(token) {
     }, '&:hover', {
       color: '#40a9ff'
     })
+  }), "".concat(componentCls, "-all-list"), {
+    maxHeight: 300,
+    overflowY: "auto"
   }), "".concat(componentCls, "-outer"), {
     position: 'relative',
     display: 'inline-flex',

package/lib/vtx-datagrid/Store/Provide.js

@@ -1,5 +1,6 @@
 "use strict";
 
+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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,30 +16,75 @@ var _renderColumnButtons = _interopRequireDefault(require("../renderColumnButton
 var _utils2 = require("@vtx/utils");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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 _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 _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 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-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); }
 var indexColumnKey = exports.indexColumnKey = '_serialNum';
+function useMergedState1(defaultValue, option) {
+  var _ref = option || {},
+    controlledValue = _ref.value,
+    onChange = _ref.onChange,
+    id = _ref.id;
+
+  // 1. 初始化内部非受控状态
+  var _useState = (0, _react.useState)(defaultValue),
+    _useState2 = _slicedToArray(_useState, 2),
+    innerValue = _useState2[0],
+    setInnerValue = _useState2[1];
+  // 记录上一次的值，用于 onChange 回调传参
+  var prevValueRef = (0, _react.useRef)(controlledValue !== null && controlledValue !== void 0 ? controlledValue : innerValue);
+  // 2. 受控模式下，同步更新 prevValueRef
+  (0, _react.useEffect)(function () {
+    if (controlledValue !== undefined) {
+      prevValueRef.current = controlledValue;
+    }
+  }, [controlledValue]);
+  // 3. 统一的取值逻辑：优先用受控值，否则用内部值
+  var mergedValue = controlledValue !== undefined ? controlledValue : innerValue;
+  // 4. 统一的更新方法
+  var setValue = (0, _react.useCallback)(function (value) {
+    var prevValue = mergedValue;
+    // 处理函数式更新（和 useState 保持一致）
+    var nextValue = typeof value === 'function' ? value(prevValue) : value;
+
+    // 受控模式：调用 onChange，不更新内部 state
+    if (controlledValue !== undefined) {
+      onChange === null || onChange === void 0 || onChange(nextValue, prevValue);
+    }
+    // 非受控模式：更新内部 state，同时触发 onChange
+    else {
+      setInnerValue(nextValue);
+      onChange === null || onChange === void 0 || onChange(nextValue, prevValue);
+    }
+    // 更新上一次值的缓存
+    prevValueRef.current = nextValue;
+  }, [controlledValue, mergedValue, onChange]);
+  // 5. 重置方法：恢复到初始默认值
+  var reset = (0, _react.useCallback)(function () {
+    var resetValue = typeof defaultValue === 'function' ? defaultValue() : defaultValue;
+    setValue(resetValue);
+  }, [defaultValue, setValue]);
+  return [mergedValue, setValue, reset];
+}
 function useContainer() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var _ref = (0, _utils2.getVtxToken)() || {},
-    _ref$userId = _ref.userId,
-    userId = _ref$userId === void 0 ? '' : _ref$userId,
-    _ref$tenantId = _ref.tenantId,
-    tenantId = _ref$tenantId === void 0 ? '' : _ref$tenantId;
+  var _ref2 = (0, _utils2.getVtxToken)() || {},
+    _ref2$userId = _ref2.userId,
+    userId = _ref2$userId === void 0 ? '' : _ref2$userId,
+    _ref2$tenantId = _ref2.tenantId,
+    tenantId = _ref2$tenantId === void 0 ? '' : _ref2$tenantId;
   var intl = (0, _vtxProvider.useIntl)();
   var _props$indexColumn = props.indexColumn,
     indexColumn = _props$indexColumn === void 0 ? true : _props$indexColumn,
@@ -94,22 +140,22 @@ function useContainer() {
   var columnsMapRef = (0, _react.useRef)({});
   // 是否可拖拽， 除非columns 至少需要一项不设置 width 让其自适应。
   var isDragRef = (0, _react.useRef)(false);
-  var _useState = (0, _react.useState)({}),
-    _useState2 = _slicedToArray(_useState, 2),
-    columnsMap = _useState2[0],
-    setColumnsMap = _useState2[1];
-  var _useState3 = (0, _react.useState)(false),
+  var _useState3 = (0, _react.useState)({}),
     _useState4 = _slicedToArray(_useState3, 2),
-    showTable = _useState4[0],
-    setShowTable = _useState4[1];
-  var _useState5 = (0, _react.useState)(''),
+    columnsMap = _useState4[0],
+    setColumnsMap = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    keyWords = _useState6[0],
-    _setKeyWords = _useState6[1];
-  var _useState7 = (0, _react.useState)({}),
+    showTable = _useState6[0],
+    setShowTable = _useState6[1];
+  var _useState7 = (0, _react.useState)(''),
     _useState8 = _slicedToArray(_useState7, 2),
-    tableConfig = _useState8[0],
-    setTableConfig = _useState8[1];
+    keyWords = _useState8[0],
+    _setKeyWords = _useState8[1];
+  var _useState9 = (0, _react.useState)({}),
+    _useState10 = _slicedToArray(_useState9, 2),
+    tableConfig = _useState10[0],
+    setTableConfig = _useState10[1];
   var _useMergedState = (0, _util.useMergedState)(function () {
       return props.size || props.defaultSize || 'middle';
     }, {
@@ -120,7 +166,7 @@ function useContainer() {
     tableSize = _useMergedState2[0],
     setTableSize = _useMergedState2[1];
   var _useMergedState3 = (0, _util.useMergedState)(function () {
-      return props.tableStyles || ['striped', 'header-background', 'border'];
+      return props.tableStyles || props.defaultTableStyles || ['striped', 'header-background', 'border'];
     }, {
       value: props.tableStyles,
       onChange: props.onChangeTableStyles
@@ -129,7 +175,7 @@ function useContainer() {
     tableStyles = _useMergedState4[0],
     setTableStyles = _useMergedState4[1];
   var _useMergedState5 = (0, _util.useMergedState)(function () {
-      return props.visibleColumnKeys || undefined;
+      return props.visibleColumnKeys || props.defaultVisibleColumnKeys || undefined;
     }, {
       value: props.visibleColumnKeys,
       onChange: props.onVisibleColumnsChange
@@ -138,7 +184,7 @@ function useContainer() {
     visibleColumnKeys = _useMergedState6[0],
     setVisibleColumnKeys = _useMergedState6[1];
   var _useMergedState7 = (0, _util.useMergedState)(function () {
-      return props.uniqueKey || undefined;
+      return props.uniqueKey || props.defaultUniqueKey || undefined;
     }, {
       value: props.uniqueKey,
       onChange: props.onChangesUniqueKey
@@ -177,13 +223,18 @@ function useContainer() {
         key: newColumn.key || newColumn.dataIndex,
         disable: disabledColumnKeys === null || disabledColumnKeys === void 0 ? void 0 : disabledColumnKeys.includes(column.dataIndex || column.key),
         render: (0, _utils.isFunction)(column.renderButtons) ? function (text, record, index) {
-          return (0, _renderColumnButtons.default)({
-            renderButtons: column.renderButtons,
-            visible: column.renderButtonsVisibleNum,
-            text: text,
-            record: record,
-            index: index,
-            TextEnum: TextEnum
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            style: {
+              whiteSpace: 'nowrap'
+            },
+            children: (0, _renderColumnButtons.default)({
+              renderButtons: column.renderButtons,
+              visible: column.renderButtonsVisibleNum,
+              text: text,
+              record: record,
+              index: index,
+              TextEnum: TextEnum
+            })
           });
         } : 'render' in column ? column.render : function (text) {
           return ['', null, undefined].includes(text) ? '-' : text;
@@ -201,28 +252,28 @@ function useContainer() {
       sortKeyColumns.current = tableConfig.sortKeyColumns;
       return tableConfig.columnsMap;
     } else if (Array.isArray(props.defaultVisibleColumnKeys)) {
-      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref2, index) {
-        var _ref3;
-        var key = _ref2.key,
-          dataIndex = _ref2.dataIndex,
-          fixed = _ref2.fixed,
-          disable = _ref2.disable,
-          width = _ref2.width;
+      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref3, index) {
+        var _ref4;
+        var key = _ref3.key,
+          dataIndex = _ref3.dataIndex,
+          fixed = _ref3.fixed,
+          disable = _ref3.disable,
+          width = _ref3.width;
         var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
         columnKeyMap[columnKey] = {
-          show: indexColumn && indexColumnKey == columnKey ? true : (_ref3 = _toConsumableArray(props.defaultVisibleColumnKeys)) === null || _ref3 === void 0 ? void 0 : _ref3.includes(columnKey),
+          show: indexColumn && indexColumnKey == columnKey ? true : (_ref4 = _toConsumableArray(props.defaultVisibleColumnKeys)) === null || _ref4 === void 0 ? void 0 : _ref4.includes(columnKey),
           fixed: fixed,
           disable: disable,
           width: width
         };
       });
     } else {
-      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref4, index) {
-        var key = _ref4.key,
-          dataIndex = _ref4.dataIndex,
-          fixed = _ref4.fixed,
-          disable = _ref4.disable,
-          width = _ref4.width;
+      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref5, index) {
+        var key = _ref5.key,
+          dataIndex = _ref5.dataIndex,
+          fixed = _ref5.fixed,
+          disable = _ref5.disable,
+          width = _ref5.width;
         var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
         columnKeyMap[columnKey] = {
           show: true,
@@ -239,44 +290,44 @@ function useContainer() {
   (0, _utils.useDeepCompareEffectDebounce)(function () {
     var columnKeyMap = {};
     if (Array.isArray(visibleColumnKeys)) {
-      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref5, index) {
-        var _ref6;
-        var key = _ref5.key,
-          dataIndex = _ref5.dataIndex,
-          fixed = _ref5.fixed,
-          disable = _ref5.disable,
-          width = _ref5.width;
+      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref6, index) {
+        var _ref7;
+        var key = _ref6.key,
+          dataIndex = _ref6.dataIndex,
+          fixed = _ref6.fixed,
+          disable = _ref6.disable,
+          width = _ref6.width;
         var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
         columnKeyMap[columnKey] = {
-          show: isFirst.current && indexColumn && indexColumnKey == columnKey ? true : (_ref6 = _toConsumableArray(visibleColumnKeys)) === null || _ref6 === void 0 ? void 0 : _ref6.includes(columnKey),
+          show: isFirst.current && indexColumn && indexColumnKey == columnKey ? true : (_ref7 = _toConsumableArray(visibleColumnKeys)) === null || _ref7 === void 0 ? void 0 : _ref7.includes(columnKey),
           fixed: fixed,
           disable: disable,
           width: width
         };
       });
     } else if (Array.isArray(props.defaultVisibleColumnKeys)) {
-      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref7, index) {
-        var _ref8;
-        var key = _ref7.key,
-          dataIndex = _ref7.dataIndex,
-          fixed = _ref7.fixed,
-          disable = _ref7.disable,
-          width = _ref7.width;
+      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref8, index) {
+        var _ref9;
+        var key = _ref8.key,
+          dataIndex = _ref8.dataIndex,
+          fixed = _ref8.fixed,
+          disable = _ref8.disable,
+          width = _ref8.width;
         var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
         columnKeyMap[columnKey] = {
-          show: isFirst.current && indexColumn && indexColumnKey == columnKey ? true : (_ref8 = _toConsumableArray(props.defaultVisibleColumnKeys)) === null || _ref8 === void 0 ? void 0 : _ref8.includes(columnKey),
+          show: isFirst.current && indexColumn && indexColumnKey == columnKey ? true : (_ref9 = _toConsumableArray(props.defaultVisibleColumnKeys)) === null || _ref9 === void 0 ? void 0 : _ref9.includes(columnKey),
           fixed: fixed,
           disable: disable,
           width: width
         };
       });
     } else {
-      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref9, index) {
-        var key = _ref9.key,
-          dataIndex = _ref9.dataIndex,
-          fixed = _ref9.fixed,
-          disable = _ref9.disable,
-          width = _ref9.width;
+      tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref10, index) {
+        var key = _ref10.key,
+          dataIndex = _ref10.dataIndex,
+          fixed = _ref10.fixed,
+          disable = _ref10.disable,
+          width = _ref10.width;
         var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
         columnKeyMap[columnKey] = {
           show: true,
@@ -287,9 +338,9 @@ function useContainer() {
       });
     }
     var sortKeys = visibleColumnKeys || props.defaultVisibleColumnKeys || [];
-    sortKeyColumns.current = Object.entries(columnKeyMap).map(function (_ref10) {
-      var _ref11 = _slicedToArray(_ref10, 1),
-        key = _ref11[0];
+    sortKeyColumns.current = Object.entries(columnKeyMap).map(function (_ref11) {
+      var _ref12 = _slicedToArray(_ref11, 1),
+        key = _ref12[0];
       return key;
     });
     if ((sortKeys === null || sortKeys === void 0 ? void 0 : sortKeys.length) > 0) {

package/lib/vtx-datagrid/ToolBar/components/Density/index.js

@@ -13,6 +13,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function Density() {
   var counter = (0, _react.useContext)(_Provide.TableContext);
   var TextEnum = counter.TextEnum;
+  console.log('tableSize', counter.tableSize);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Dropdown, {
       menu: {
@@ -29,6 +30,7 @@ function Density() {
         onClick: function onClick(_ref) {
           var _counter$setTableSize;
           var key = _ref.key;
+          console.log('counter', counter, key);
           (_counter$setTableSize = counter.setTableSize) === null || _counter$setTableSize === void 0 || _counter$setTableSize.call(counter, key);
         },
         selectedKeys: [counter.tableSize]

package/lib/vtx-datagrid/index.js

@@ -42,8 +42,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,7 +62,8 @@ 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()),
@@ -121,8 +122,18 @@ function VtxTable(props) {
       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;
       var bodyDiv = Array.prototype.filter.call(divs, function (dom) {
         return dom.className.includes('ant-table-body') || dom.className.includes('ant-table-content');
       })[0];
@@ -134,12 +145,11 @@ function VtxTable(props) {
       }
       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) {
-        var _rootDomRef$current2;
-        tablePlaceholder.style.height = "".concat(((_rootDomRef$current2 = rootDomRef.current) === null || _rootDomRef$current2 === void 0 ? void 0 : _rootDomRef$current2.clientHeight) - headFootHeight + 68 - (rest.scrollY || 0) - 12, "px");
+        tablePlaceholder.style.height = "".concat(bodyHeight - (rest.scrollY || 0) - 12 - 32, "px");
         var tableCell = Array.prototype.filter.call(tablePlaceholder.getElementsByTagName('td'), function (dom) {
           return dom.className.includes('ant-table-cell');
         })[0];
-        tableCell.style.height = "".concat(bodyHeight - (rest.scrollY || 0) - 12, "px");
+        tableCell.style.height = "".concat(bodyHeight - (rest.scrollY || 0) - 12 - 32, "px");
       }
       // antd6.x 的bug  如果table的高度 没有body 高 则没有滚动条
 
@@ -164,7 +174,7 @@ function VtxTable(props) {
         resizeObserver.disconnect();
       }
     };
-  }, [autoFit]);
+  }, [autoFit, tableSize]);
   (0, _react.useLayoutEffect)(function () {
     if (autoFit) {
       calculateHeight();
@@ -261,7 +271,7 @@ function VtxTable(props) {
   var _useAntdColumnResize = (0, _reactAntdColumnResize.useAntdColumnResize)(function () {
       return {
         columns: columns,
-        minWidth: 20
+        minWidth: 10
       };
     }, [columns]),
     resizableColumns = _useAntdColumnResize.resizableColumns,
@@ -364,7 +374,9 @@ function VtxTable(props) {
       bordered: true
       // virtual
     }, rest), {}, {
-      dataSource: dataSource,
+      dataSource: dataSource
+      // scroll={{  ...scroll }}   
+      ,
       scroll: _objectSpread({
         x: 'max-content'
       }, scroll),

package/lib/vtx-datagrid/renderColumnButtons.js

@@ -76,8 +76,8 @@ var renderColumnButtons = function renderColumnButtons(_ref) {
           };
         })) || [],
         onClick: function onClick(e) {
-          var _moreActions$e$key;
-          (_moreActions$e$key = moreActions[e.key]) === null || _moreActions$e$key === void 0 || _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", {

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

@@ -14,30 +14,33 @@ 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({}, componentCls, _defineProperty({
     position: 'relative',
-    overflow: 'hidden'
-  }, "".concat(antCls, "-table-wrapper"), _defineProperty(_defineProperty(_defineProperty({}, '.ant-spin', _defineProperty({
+    // overflow: 'hidden',
+    display: 'flex',
+    flexDirection: 'column'
+  }, "".concat(antCls, "-table-wrapper"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "table", {
+    // minWidth: "calc(100% - 2px) !important"
+  }), '.ant-spin', _defineProperty({
     height: '100%'
   }, '.ant-spin-container', _defineProperty({
-    height: '100%'
-  }, '.ant-table', {
+    height: '100%',
+    display: 'flex',
+    flexDirection: 'column'
+  }, '.ant-table', _defineProperty({
     // height: '100%',
-    // ['.ant-table-container']: {
+    flex: 1
+  }, '.ant-table-container', _defineProperty(_defineProperty({}, '.ant-table-body', {
+    scrollbarWidth: "thin"
+  }), '.ant-table-content', _defineProperty({}, 'table', {
     // height: '100%',
-    // ['.ant-table-content']: {
-    //     height: '100%',
-    //     ['table']: {
-    //         height: '100%',
-    //     }
-    // }
-    // }
-  }))), '.ant-table', _defineProperty(_defineProperty(_defineProperty({}, '.ant-table-header', _defineProperty({}, '.ant-table-thead', {
+    // minWidth: "calc(100% - 1px) !important",
+  })))))), '.ant-table', _defineProperty(_defineProperty(_defineProperty({}, '.ant-table-header', _defineProperty({}, '.ant-table-thead', {
     '>tr>th': {
       background: token.colorBgContainer
     }
   })), '.ant-table-cell', {
-    minWidth: 20
+    // minWidth: 10,
   }), '.ant-table-tbody', {
     '>tr.ant-table-placeholder': {
       position: 'absolute',
@@ -68,9 +71,9 @@ var genVtxStyle = function genVtxStyle(token) {
     }
   })), '.ant-pagination', _defineProperty({}, '.ant-pagination-item', {
     borderRadius: token.borderRadiusSM
-  }))), "&-fit", {
+  })))), "".concat(componentCls, "-fit"), {
     height: '100%'
-  }), "&-noFit", {}), "&-no-border", _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, "".concat(antCls, "-table"), _defineProperty({}, '>.ant-table-container', _defineProperty(_defineProperty({
+  }), "".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': {
@@ -84,7 +87,7 @@ var genVtxStyle = function genVtxStyle(token) {
       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({}, '.ant-table-body', {
     '>table >tbody>tr:nth-child(odd)>td': {
       backgroundColor: token.colorBgLayoutTable,
       '&.ant-table-cell-row-hover': {
@@ -100,11 +103,11 @@ 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', {
+  }))))), "".concat(componentCls, "-header-background"), _defineProperty({}, "".concat(antCls, "-table-wrapper"), _defineProperty({}, '.ant-table', _defineProperty({}, '.ant-table-header', _defineProperty({}, '.ant-table-thead', {
     '>tr>th': {
       background: token.colorBgLayoutTable
     }
-  }))))));
+  })))));
 };
 function useStyle(prefix) {
   return (0, _vtxProvider.useStyle)(prefix, function (token) {

package/lib/vtx-ellipsis-text/style/index.js

@@ -16,7 +16,9 @@ var genVtxEllipsisTextStyle = function genVtxEllipsisTextStyle(token) {
   return _defineProperty({}, componentCls, _defineProperty(_defineProperty({
     margin: 0,
     overflow: 'hidden',
-    textOverflow: 'ellipsis'
+    textOverflow: 'ellipsis',
+    wordBreak: "break-all",
+    wordWrap: "break-word"
   }, "&--single", {
     whiteSpace: 'nowrap'
   }), "&--multi", {

package/lib/vtx-select/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.VtxSelect = void 0;
 var _antd = require("antd");
-var _classnames = _interopRequireDefault(require("classnames"));
+var _classnames2 = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
 var _style = require("./style");
 var _icons = require("@ant-design/icons");
@@ -114,7 +114,7 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
       return child[key] || '';
     };
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: "vtx-all-list",
+      className: (0, _classnames2.default)("".concat(prefixCls, "-all-list"), hashId),
       children: Array.isArray(value) && value.length ? value.map(function (item, index) {
         var name = getChildren(child, item);
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tag, {
@@ -221,9 +221,7 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
   return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    className: (0, _classnames.default)(prefixCls, hashId, {
-      'vtx-multi-select': mode == 'multiple' || mode == 'tags'
-    }),
+    className: (0, _classnames2.default)(prefixCls, hashId, _defineProperty({}, "".concat(prefixCls, "-multi"), mode == 'multiple' || mode == 'tags')),
     id: elId.current,
     ref: elRef,
     style: _objectSpread(_objectSpread({}, props.style), {}, {