@vtx/components 4.0.0-beta.2 → 4.0.0-beta.21

package/lib/index.js

@@ -253,15 +253,15 @@ Object.keys(_vtxSignature).forEach(function (key) {
     }
   });
 });
-var _vtxTransfer = require("./vtx-transfer");
-Object.keys(_vtxTransfer).forEach(function (key) {
+var _vtxTransferSelect = require("./vtx-transfer-select");
+Object.keys(_vtxTransferSelect).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _vtxTransfer[key]) return;
+  if (key in exports && exports[key] === _vtxTransferSelect[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _vtxTransfer[key];
+      return _vtxTransferSelect[key];
     }
   });
 });
@@ -337,6 +337,18 @@ Object.keys(_vtxTree).forEach(function (key) {
     }
   });
 });
+var _vtxTransfer = require("./vtx-transfer");
+Object.keys(_vtxTransfer).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _vtxTransfer[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _vtxTransfer[key];
+    }
+  });
+});
 var _vtxSplitPane = require("./vtx-split-pane");
 Object.keys(_vtxSplitPane).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -361,6 +373,18 @@ Object.keys(_vtxIcon).forEach(function (key) {
     }
   });
 });
+var _vtxDescriptions = require("./vtx-descriptions");
+Object.keys(_vtxDescriptions).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _vtxDescriptions[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _vtxDescriptions[key];
+    }
+  });
+});
 var _vtxModal = require("./vtx-modal");
 Object.keys(_vtxModal).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/utils/filterSpecialCharacters.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.SpecialCharacters = void 0;
 exports.default = filterSpecialCharacters;
 var _difference = _interopRequireDefault(require("lodash-es/difference"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -16,6 +17,52 @@ function isNotEmpty(value) {
   return Array.isArray(value) && value.length > 0;
 }
 
+// 特殊符号，- _ 排除
+var SpecialCharacters = exports.SpecialCharacters = [
+// 小括号
+'(', ')', '（', '）',
+// 中括号
+'\\[', '\\]', '［', '］',
+// 大括号
+'{', '}', '｛', '｝',
+// 方头括号
+'【', '】',
+// 尖括号
+'<', '>',
+// 书名号
+'《', '》',
+// 斜杠
+'/',
+// 反斜杠
+'\\\\',
+// 逗号
+',', '，',
+// 句号
+'.', '。',
+// 冒号
+':', '：',
+// 分号
+';', '；',
+// 顿号
+'、',
+// 破折号
+'——',
+// 感叹号
+'!', '！',
+// 问号
+'?', '？',
+// 加减等于
+'+', '=',
+// 单引号
+"'", '‘', '’',
+// 双引号
+'"', '“', '”',
+// 金钱
+'$', '￥',
+// 百分号
+'%', '％',
+// 其它
+'@', '#', '`', '~', '*', '^', '……', '|', '&'];
 /**
  * 过滤特殊字符
  * @param {String} value 值
@@ -29,52 +76,7 @@ function filterSpecialCharacters(value) {
     include = _ref$include === void 0 ? [] : _ref$include,
     _ref$exclude = _ref.exclude,
     exclude = _ref$exclude === void 0 ? [] : _ref$exclude;
-  // 特殊符号，- _ 排除
-  var specialCharacter = [
-  // 小括号
-  '(', ')', '（', '）',
-  // 中括号
-  '\\[', '\\]', '［', '］',
-  // 大括号
-  '{', '}', '｛', '｝',
-  // 方头括号
-  '【', '】',
-  // 尖括号
-  '<', '>',
-  // 书名号
-  '《', '》',
-  // 斜杠
-  '/',
-  // 反斜杠
-  '\\\\',
-  // 逗号
-  ',', '，',
-  // 句号
-  '.', '。',
-  // 冒号
-  ':', '：',
-  // 分号
-  ';', '；',
-  // 顿号
-  '、',
-  // 破折号
-  '——',
-  // 感叹号
-  '!', '！',
-  // 问号
-  '?', '？',
-  // 加减等于
-  '+', '=',
-  // 单引号
-  "'", '‘', '’',
-  // 双引号
-  '"', '“', '”',
-  // 金钱
-  '$', '￥',
-  // 百分号
-  '%', '％',
-  // 其它
-  '@', '#', '`', '~', '*', '^', '……', '|', '&'];
+  var specialCharacter = JSON.parse(JSON.stringify(SpecialCharacters));
 
   // 新增
   if (isNotEmpty(include)) {

package/lib/utils/index.js

@@ -333,12 +333,6 @@ Object.defineProperty(exports, "useEditableMap", {
     return _useEditableMap.useEditableMap;
   }
 });
-Object.defineProperty(exports, "useFetchData", {
-  enumerable: true,
-  get: function get() {
-    return _useFetchData.useFetchData;
-  }
-});
 Object.defineProperty(exports, "useLatest", {
   enumerable: true,
   get: function get() {
@@ -398,7 +392,6 @@ var _useDebounceValue = require("./hooks/useDebounceValue");
 var _useDeepCompareEffect = require("./hooks/useDeepCompareEffect");
 var _useDeepCompareMemo = _interopRequireDefault(require("./hooks/useDeepCompareMemo"));
 var _useDocumentTitle = require("./hooks/useDocumentTitle");
-var _useFetchData = require("./hooks/useFetchData");
 var _useLatest = require("./hooks/useLatest");
 var _usePrevious = require("./hooks/usePrevious");
 var _useReactiveRef = require("./hooks/useReactiveRef");

package/lib/vtx-color-picker/index.js

@@ -5,17 +5,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.VtxColorPicker = void 0;
+var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _react = _interopRequireWildcard(require("react"));
+var _propTypes = _interopRequireDefault(require("prop-types"));
 var _style = require("./style");
 var _utils = require("../utils");
 var _vtxProvider = require("../vtx-provider");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["value", "onChange", "className", "style", "disabled", "format", "input", "panelStyle"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -23,44 +24,8 @@ 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; }
-var getVtxPresets = function getVtxPresets() {
-  return [{
-    label: '基础颜色',
-    key: 'basic',
-    colors: ['#0EBF37', '#1890FF', '#FAAD14', '#FF4D4F', '#898989', '#13C2C2', '#FA8C16', '#722ED1', '#EB2F96', '#2F54EB']
-  }, {
-    label: '图表颜色',
-    key: 'chart',
-    colors: ['#249AF8', '#1FC678', '#FFB737', '#4ABEFF', '#FD6865', '#A09CF7', '#1BCEBF', '#F58E44', '#27AD8E', '#F18F86', '#7996FF', '#5AD8A6', '#E9C140', '#79C2E6', '#FF9E9E', '#D396DE', '#3CBDCB', '#F29F64', '#85ACD7', '#FDA3C7']
-  }];
-};
-var getNormalPresets = function getNormalPresets() {
-  return [{
-    label: '',
-    key: '1',
-    colors: ['#F5222D', '#FA8C16 ', '#FAAD14', '#52C41A', '#389E0D', '#CF1322', '#1677FF', '#5B83FB', '#9254DE', '#5D7092']
-  }];
-};
-var getHorizontalPresets = function getHorizontalPresets(token) {
-  return [{
-    label: '主要',
-    key: '主要',
-    colors: ['#E6F4FF', '#BAE0FF', '#91CAFF', '#69B1FF', '#4096FF', '#1677FF', '#0958D9', '#003EB3', '#002C8C', '#001D66']
-  }, {
-    label: '红色',
-    key: '红色',
-    colors: ['#FFF1F0', '#FFCCC7', '#FFA39E', '#FF7875', '#FF4D4F', '#F5222D', '#CF1322', '#A8071A', '#820014', '#5C0011']
-  }, {
-    label: '绿色',
-    key: '绿色',
-    colors: ['#F6FFED', '#D9F7BE', '#B7EB8F', '#95DE64', '#73D13D', '#52C41A', '#389E0D', '#237804', '#135200', '#092B00']
-  }, {
-    label: '青色',
-    key: '青色',
-    colors: ['#E6FFFB', '#B5F5EC', '#87E8DE', '#5CDBD3', '#36CFC9', '#13C2C2', '#08979C', '#006D75', '#00474F', '#002329']
-  }];
-};
 var VtxColorPicker = exports.VtxColorPicker = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var intl = (0, _vtxProvider.useIntl)();
   var value = props.value,
     _onChange = props.onChange,
     className = props.className,
@@ -72,6 +37,43 @@ var VtxColorPicker = exports.VtxColorPicker = /*#__PURE__*/(0, _react.forwardRef
     input = _props$input === void 0 ? true : _props$input,
     panelStyle = props.panelStyle,
     rest = _objectWithoutProperties(props, _excluded);
+  var getVtxPresets = function getVtxPresets() {
+    return [{
+      label: intl.getMessage('colorPicker.basic', '基础颜色'),
+      key: 'basic',
+      colors: ['#0EBF37', '#1890FF', '#FAAD14', '#FF4D4F', '#898989', '#13C2C2', '#FA8C16', '#722ED1', '#EB2F96', '#2F54EB']
+    }, {
+      label: intl.getMessage('colorPicker.chart', '图表颜色'),
+      key: 'chart',
+      colors: ['#249AF8', '#1FC678', '#FFB737', '#4ABEFF', '#FD6865', '#A09CF7', '#1BCEBF', '#F58E44', '#27AD8E', '#F18F86', '#7996FF', '#5AD8A6', '#E9C140', '#79C2E6', '#FF9E9E', '#D396DE', '#3CBDCB', '#F29F64', '#85ACD7', '#FDA3C7']
+    }];
+  };
+  var getNormalPresets = function getNormalPresets() {
+    return [{
+      label: '',
+      key: '1',
+      colors: ['#F5222D', '#FA8C16', '#FAAD14', '#52C41A', '#389E0D', '#CF1322', '#1677FF', '#5B83FB', '#9254DE', '#5D7092']
+    }];
+  };
+  var getHorizontalPresets = function getHorizontalPresets(token) {
+    return [{
+      label: intl.getMessage('colorPicker.primary', '主要'),
+      key: '主要',
+      colors: ['#E6F4FF', '#BAE0FF', '#91CAFF', '#69B1FF', '#4096FF', '#1677FF', '#0958D9', '#003EB3', '#002C8C', '#001D66']
+    }, {
+      label: intl.getMessage('colorPicker.danger', '红色'),
+      key: '红色',
+      colors: ['#FFF1F0', '#FFCCC7', '#FFA39E', '#FF7875', '#FF4D4F', '#F5222D', '#CF1322', '#A8071A', '#820014', '#5C0011']
+    }, {
+      label: intl.getMessage('colorPicker.success', '绿色'),
+      key: '绿色',
+      colors: ['#F6FFED', '#D9F7BE', '#B7EB8F', '#95DE64', '#73D13D', '#52C41A', '#389E0D', '#237804', '#135200', '#092B00']
+    }, {
+      label: intl.getMessage('colorPicker.info', '青色'),
+      key: '青色',
+      colors: ['#E6FFFB', '#B5F5EC', '#87E8DE', '#5CDBD3', '#36CFC9', '#13C2C2', '#08979C', '#006D75', '#00474F', '#002329']
+    }];
+  };
   var _useContext = (0, _react.useContext)(_vtxProvider.VtxProvider),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('color-picker', props.prefixCls);
@@ -163,9 +165,18 @@ var VtxColorPicker = exports.VtxColorPicker = /*#__PURE__*/(0, _react.forwardRef
         }
         _onChange === null || _onChange === void 0 || _onChange(res, css);
       },
+      value: value,
       disabled: disabled
     }, panelStyleProps), rest))]
   }));
 });
 VtxColorPicker.displayName = 'VtxColorPicker';
+VtxColorPicker.propTypes = {
+  value: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.object]),
+  onChange: _propTypes.default.func,
+  className: _propTypes.default.string,
+  style: _propTypes.default.object,
+  disabled: _propTypes.default.bool,
+  placeholder: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node])
+};
 var _default = exports.default = VtxColorPicker;

package/lib/vtx-combogrid/Combogrid.js

@@ -14,7 +14,7 @@ var _vtxDatagrid = _interopRequireDefault(require("../vtx-datagrid"));
 var _style = require("./style");
 var _vtxProvider = require("../vtx-provider");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["setPopoverVisible", "multiple", "onChange", "getTableData", "columns", "searchForms", "selectedRowKeys", "setSelectedRowKeys", "spread", "defaultPageSize", "customEnumText"];
+var _excluded = ["setPopoverVisible", "multiple", "onChange", "getTableData", "columns", "searchForms", "selectedRowKeys", "setSelectedRowKeys", "spread", "defaultPageSize", "customEnumText", "headFootHeight", "popoverWidth"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -35,10 +35,6 @@ function VtxCombogrid(props, ref) {
   var intl = (0, _vtxProvider.useIntl)();
   var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('', 'vtx-combogrid');
-  var _useStyle = (0, _style.useStyle)(prefixCls),
-    wrapSSR = _useStyle.wrapSSR,
-    hashId = _useStyle.hashId;
   var _useState = (0, _react.useState)(!!props.defaultExpandSearch),
     _useState2 = _slicedToArray(_useState, 2),
     more = _useState2[0],
@@ -59,7 +55,16 @@ function VtxCombogrid(props, ref) {
     defaultPageSize = props.defaultPageSize,
     _props$customEnumText = props.customEnumText,
     customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText,
+    _props$headFootHeight = props.headFootHeight,
+    headFootHeight = _props$headFootHeight === void 0 ? 95 : _props$headFootHeight,
+    popoverWidth = props.popoverWidth,
     rest = _objectWithoutProperties(props, _excluded);
+  var prefixCls = getPrefixCls('', 'vtx-combogrid');
+  var _useStyle = (0, _style.useStyle)(prefixCls, {
+      popoverWidth: popoverWidth
+    }),
+    wrapSSR = _useStyle.wrapSSR,
+    hashId = _useStyle.hashId;
   var TextEnum = _objectSpread({
     indexTitle: intl.getMessage('indexTitle', '序号'),
     actionMoreText: intl.getMessage('actionMoreText', '更多'),
@@ -94,7 +99,7 @@ function VtxCombogrid(props, ref) {
     columns: columns,
     startIndex: (current - 1) * pageSize + 1,
     size: 'small',
-    headFootHeight: 95,
+    headFootHeight: headFootHeight,
     indexTitle: TextEnum.indexTitle,
     onRowSelectionClear: clearSelectedRow,
     pagination: _objectSpread(_objectSpread({}, pagination), {}, {

package/lib/vtx-combogrid/index.js

@@ -117,7 +117,7 @@ var _default = exports.default = VtxCombogrid;
 VtxCombogrid.propTypes = {
   prefixCls: _propTypes.default.string,
   placeholder: _propTypes.default.string,
-  value: _propTypes.default.string,
+  value: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.array]),
   allowClear: _propTypes.default.bool,
   disabled: _propTypes.default.bool,
   className: _propTypes.default.string,

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

@@ -11,10 +11,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 genVtxStyle = function genVtxStyle(token) {
+var genVtxStyle = function genVtxStyle(token, options) {
   var componentCls = token.componentCls;
   return _defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "&-popover", {
-    width: 550,
+    width: options.popoverWidth || 550,
     '.ant-form-item': {
       marginBottom: 12
     }
@@ -38,11 +38,11 @@ var genVtxStyle = function genVtxStyle(token) {
     }
   }));
 };
-function useStyle(prefixCls) {
+function useStyle(prefixCls, options) {
   return (0, _vtxProvider.useStyle)(prefixCls, function (token) {
     var vtxToken = _objectSpread(_objectSpread({}, token), {}, {
       componentCls: ".".concat(prefixCls)
     });
-    return [genVtxStyle(vtxToken)];
+    return [genVtxStyle(vtxToken, options)];
   });
 }

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

@@ -5,13 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.indexColumnKey = exports.TableContext = exports.Container = void 0;
 var _util = require("@rc-component/util");
-var _utils = require("@vtx/utils");
+var _request = _interopRequireDefault(require("@vtx/utils/lib/request"));
 var _getSignature = _interopRequireDefault(require("@vtx/utils/lib/getSignature"));
 var _react = require("react");
 var _vtxProvider = require("../../vtx-provider");
 var _antd = require("antd");
-var _utils2 = require("../../utils");
+var _utils = require("../../utils");
 var _renderColumnButtons = _interopRequireDefault(require("../renderColumnButtons"));
+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); }
@@ -33,7 +34,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 var indexColumnKey = exports.indexColumnKey = '_serialNum';
 function useContainer() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var _ref = (0, _utils.getVtxToken)() || {},
+  var _ref = (0, _utils2.getVtxToken)() || {},
     _ref$userId = _ref.userId,
     userId = _ref$userId === void 0 ? '' : _ref$userId,
     _ref$tenantId = _ref.tenantId,
@@ -44,13 +45,14 @@ function useContainer() {
     _props$indexFixed = props.indexFixed,
     indexFixed = _props$indexFixed === void 0 ? false : _props$indexFixed,
     _props$indexTitle = props.indexTitle,
-    indexTitle = _props$indexTitle === void 0 ? '序号' : _props$indexTitle,
+    indexTitle = _props$indexTitle === void 0 ? intl.getMessage('indexTitle', '序号') : _props$indexTitle,
     _props$indexWidth = props.indexWidth,
     indexWidth = _props$indexWidth === void 0 ? 70 : _props$indexWidth,
     onColumnsSave = props.onColumnsSave,
     disabledColumnKeys = props.disabledColumnKeys,
     hideColumnSetting = props.hideColumnSetting,
-    customEnumText = props.customEnumText;
+    _props$customEnumText = props.customEnumText,
+    customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText;
   var TextEnum = _objectSpread({
     refreshText: intl.getMessage('tableToolBar.reload', '刷新'),
     densityDefaultText: intl.getMessage('tableToolBar.densityDefault', '默认'),
@@ -79,8 +81,8 @@ function useContainer() {
     noFixedTitle: intl.getMessage('tableToolBar.noFixedTitle', '不固定'),
     rightFixedTitle: intl.getMessage('tableToolBar.rightFixedTitle', '固定在右侧'),
     columnAll: intl.getMessage('tableToolBar.columnAll', '全部'),
-    total: intl.getMessage('pagination.total.total', '共'),
-    item: intl.getMessage('pagination.total.item', '条')
+    paginationTotalText: intl.getMessage('pagination.total.total', '共'),
+    paginationItemText: intl.getMessage('pagination.total.item', '条')
   }, customEnumText);
   var isFirst = (0, _react.useRef)(true);
   var actionRef = (0, _react.useRef)();
@@ -174,7 +176,7 @@ function useContainer() {
       return _objectSpread(_objectSpread({}, newColumn), {}, {
         key: newColumn.key || newColumn.dataIndex,
         disable: disabledColumnKeys === null || disabledColumnKeys === void 0 ? void 0 : disabledColumnKeys.includes(column.dataIndex || column.key),
-        render: (0, _utils2.isFunction)(column.renderButtons) ? function (text, record, index) {
+        render: (0, _utils.isFunction)(column.renderButtons) ? function (text, record, index) {
           return (0, _renderColumnButtons.default)({
             renderButtons: column.renderButtons,
             visible: column.renderButtonsVisibleNum,
@@ -206,7 +208,7 @@ function useContainer() {
           fixed = _ref2.fixed,
           disable = _ref2.disable,
           width = _ref2.width;
-        var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
+        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),
           fixed: fixed,
@@ -221,7 +223,7 @@ function useContainer() {
           fixed = _ref4.fixed,
           disable = _ref4.disable,
           width = _ref4.width;
-        var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
+        var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
         columnKeyMap[columnKey] = {
           show: true,
           fixed: fixed,
@@ -234,7 +236,7 @@ function useContainer() {
   }, [tableColumn, props.defaultVisibleColumnKeys, tableConfig, uniqueKey]);
 
   // 深度比较 + 防抖 + 忽略这render函数引用变化
-  (0, _utils2.useDeepCompareEffectDebounce)(function () {
+  (0, _utils.useDeepCompareEffectDebounce)(function () {
     var columnKeyMap = {};
     if (Array.isArray(visibleColumnKeys)) {
       tableColumn === null || tableColumn === void 0 || tableColumn.forEach(function (_ref5, index) {
@@ -244,7 +246,7 @@ function useContainer() {
           fixed = _ref5.fixed,
           disable = _ref5.disable,
           width = _ref5.width;
-        var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
+        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),
           fixed: fixed,
@@ -260,7 +262,7 @@ function useContainer() {
           fixed = _ref7.fixed,
           disable = _ref7.disable,
           width = _ref7.width;
-        var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
+        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),
           fixed: fixed,
@@ -275,7 +277,7 @@ function useContainer() {
           fixed = _ref9.fixed,
           disable = _ref9.disable,
           width = _ref9.width;
-        var columnKey = (0, _utils2.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
+        var columnKey = (0, _utils.genColumnKey)(key !== null && key !== void 0 ? key : dataIndex, index);
         columnKeyMap[columnKey] = {
           show: true,
           fixed: fixed,
@@ -291,14 +293,14 @@ function useContainer() {
       return key;
     });
     if ((sortKeys === null || sortKeys === void 0 ? void 0 : sortKeys.length) > 0) {
-      sortKeyColumns.current = (0, _utils2.sortByGivenOrder)(sortKeyColumns.current, sortKeys);
+      sortKeyColumns.current = (0, _utils.sortByGivenOrder)(sortKeyColumns.current, sortKeys);
     }
     setColumnsMap(columnKeyMap);
     if (isFirst.current) {
       isFirst.current = false;
     }
   }, [visibleColumnKeys], ['render'], 100);
-  (0, _utils2.useDeepCompareEffectDebounce)(function () {
+  (0, _utils.useDeepCompareEffectDebounce)(function () {
     var _sortKeyColumns$curre, _props$onVisibleColum;
     var visibleColumnKeys = [];
     (_sortKeyColumns$curre = sortKeyColumns.current) === null || _sortKeyColumns$curre === void 0 || _sortKeyColumns$curre.map(function (columnKey) {
@@ -318,7 +320,7 @@ function useContainer() {
     var params = {
       tableCode: uniqueKey
     };
-    _utils.request.get("".concat(location.origin, "/cloud/management/api/v101/user/config/table/page"), {
+    _request.default.get("".concat(location.origin, "/cloud/management/api/v101/user/config/table/page"), {
       body: params
     }).then(function (res) {
       var _res$data;
@@ -345,7 +347,7 @@ function useContainer() {
   var getUniqueKey = function getUniqueKey() {
     var route = location.href.match(/#\/(\S*)\?/);
     if (route) {
-      _utils.request.get("".concat(location.pathname, "resources/json/menu.json"), {
+      _request.default.get("".concat(location.pathname, "resources/json/menu.json"), {
         headers: _objectSpread({}, (0, _getSignature.default)({}))
       }).then(function (res) {
         var _res$data2;
@@ -357,7 +359,7 @@ function useContainer() {
     // setUniqueKey('test_demo_7')
   };
   var saveColumns = function saveColumns() {
-    _utils.request.post("/cloud/management/api/v101/user/config/table/save", {
+    _request.default.post("/cloud/management/api/v101/user/config/table/save", {
       body: JSON.stringify({
         showColumns: "".concat(sortKeyColumns.current.join(','), ";").concat(JSON.stringify(columnsMap)),
         tableCode: uniqueKey,

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

@@ -36,7 +36,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 _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); } // omit 用于从对象中排除指定的属性，返回一个新对象
 var ToolTipIcon = function ToolTipIcon(_ref) {
   var title = _ref.title,
     show = _ref.show,
@@ -365,7 +365,6 @@ function ColumnSetting(props) {
   var _useStyle = (0, _style.useStyle)(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
-  var localColumns = props.columns;
   var _useContext8 = (0, _react.useContext)(_Provide.TableContext),
     uniqueKey = _useContext8.uniqueKey,
     columnsMap = _useContext8.columnsMap,
@@ -373,7 +372,9 @@ function ColumnSetting(props) {
     defaultColumnKeyMap = _useContext8.defaultColumnKeyMap,
     setSortKeyColumns = _useContext8.setSortKeyColumns,
     saveColumns = _useContext8.saveColumns,
-    TextEnum = _useContext8.TextEnum;
+    TextEnum = _useContext8.TextEnum,
+    tableColumn = _useContext8.tableColumn;
+  var localColumns = props.localColumns;
   var checkedColumnKeys = props.checkedColumnKeys,
     onColumnsSave = props.onColumnsSave;
 
@@ -504,7 +505,10 @@ function ColumnSetting(props) {
           children: TextEnum.columnSettingSaveText
         })]
       }) : null]
-    })
+    }),
+    getPopupContainer: function getPopupContainer(triggerNode) {
+      return triggerNode.parentNode;
+    }
     // open={true}
     ,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {

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

@@ -34,6 +34,9 @@ function Density() {
         selectedKeys: [counter.tableSize]
       },
       trigger: ['click'],
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      },
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
         title: TextEnum.columnDensityText,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {

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

@@ -37,6 +37,9 @@ function TableStyle() {
       trigger: ['click'],
       placement: "bottomRight",
       title: null,
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      },
       content: list === null || list === void 0 ? void 0 : list.map(function (v) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Checkbox, {

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

@@ -29,9 +29,9 @@ function ToolBar(props) {
     onRefresh = props.onRefresh,
     hideColumnHeight = props.hideColumnHeight,
     hideColumnSetting = props.hideColumnSetting,
-    columns = props.columns,
     onColumnsSave = props.onColumnsSave,
     uniqueKey = props.uniqueKey,
+    columns = props.columns,
     TextEnum = props.TextEnum;
   var _useStyle = (0, _style.useStyle)("".concat(prefix, "-toolbar")),
     wrapSSR = _useStyle.wrapSSR,
@@ -80,7 +80,7 @@ function ToolBar(props) {
           }), !hideColumnSetting && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
             className: "".concat(prefix, "-toolbar-setting-item"),
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ColumnSetting.default, {
-              columns: columns,
+              localColumns: columns,
               uniqueKey: uniqueKey,
               onColumnsSave: onColumnsSave
             })