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

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

@@ -5,73 +5,178 @@ 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 _index = require("./style/index");
+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"];
+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; }
 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 _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 VtxColorPicker = exports.VtxColorPicker = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var intl = (0, _vtxProvider.useIntl)();
   var value = props.value,
-    onChange = props.onChange,
+    _onChange = props.onChange,
     className = props.className,
     style = props.style,
     disabled = props.disabled,
+    _props$format = props.format,
+    format = _props$format === void 0 ? 'hex' : _props$format,
+    _props$input = props.input,
+    input = _props$input === void 0 ? true : _props$input,
+    panelStyle = props.panelStyle,
     rest = _objectWithoutProperties(props, _excluded);
-  var _useState = (0, _react.useState)(value),
-    _useState2 = _slicedToArray(_useState, 2),
-    colorHex = _useState2[0],
-    setColorHex = _useState2[1];
-  var _useState3 = (0, _react.useState)('hex'),
-    _useState4 = _slicedToArray(_useState3, 2),
-    formatHex = _useState4[0],
-    setFormatHex = _useState4[1];
-  var hexString = (0, _react.useMemo)(function () {
-    return typeof colorHex === 'string' ? colorHex : colorHex === null || colorHex === void 0 ? void 0 : colorHex.toHexString();
-  }, [colorHex]);
-  var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
+  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('', 'vtx-color-picker');
-  var _useStyle = (0, _index.useStyle)(prefixCls),
+  var prefixCls = getPrefixCls('color-picker', props.prefixCls);
+  var _useStyle = (0, _style.useStyle)(prefixCls),
     wrapSSR = _useStyle.wrapSSR,
     hashId = _useStyle.hashId;
+  var getChangeFun = (0, _react.useCallback)(function () {
+    switch (format) {
+      case 'hsb':
+        return 'toHsbString';
+      case 'rgb':
+        return 'toRgbString';
+      default:
+        return 'toHexString';
+    }
+  }, [format]);
+  var horizontalPanelRender = function horizontalPanelRender(_, _ref) {
+    var _ref$components = _ref.components,
+      Picker = _ref$components.Picker,
+      Presets = _ref$components.Presets;
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: (0, _classnames.default)("".concat(prefixCls, "-horizontal")),
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Presets, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Picker, {})
+      })]
+    });
+  };
+  var verticalPanelRender = function verticalPanelRender(_, _ref2) {
+    var _ref2$components = _ref2.components,
+      Picker = _ref2$components.Picker,
+      Presets = _ref2$components.Presets;
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: (0, _classnames.default)("".concat(prefixCls, "-vertical")),
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Picker, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(Presets, {})]
+    });
+  };
+  var panelStyleProps = _objectSpread(_objectSpread(_objectSpread({}, panelStyle === 'vtx' ? {
+    presets: getVtxPresets(),
+    styles: {
+      popupOverlayInner: {
+        width: 460
+      }
+    },
+    panelRender: horizontalPanelRender
+  } : {}), panelStyle === 'normal' ? {
+    presets: getNormalPresets(),
+    styles: {
+      popupOverlayInner: {
+        width: 258
+      }
+    },
+    panelRender: verticalPanelRender
+  } : {}), panelStyle === 'horizontal' ? {
+    presets: getHorizontalPresets(),
+    styles: {
+      popupOverlayInner: {
+        width: 504
+      }
+    },
+    panelRender: horizontalPanelRender
+  } : {});
   return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
     style: {
       width: '100%'
     },
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, {
+    children: [input && /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, {
       ref: ref,
-      value: hexString,
+      value: value,
       placeholder: (0, _utils.getPlaceholder)(props.placeholder),
       readOnly: true,
       disabled: disabled,
-      className: (0, _classnames.default)(prefixCls, className, hashId),
+      className: (0, _classnames.default)("".concat(prefixCls, "-input"), hashId),
       style: style
-    }), disabled ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ColorPicker, _objectSpread(_objectSpread({}, rest), {}, {
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ColorPicker, _objectSpread(_objectSpread({
       animation: "slide-up",
-      format: formatHex,
-      value: colorHex,
-      onChange: setColorHex,
-      onFormatChange: setFormatHex
-    }))]
+      allowClear: true,
+      className: (0, _classnames.default)(prefixCls, className, hashId),
+      onChange: function onChange(e, css) {
+        var _e$colors;
+        var res = undefined;
+        if (((_e$colors = e.colors) === null || _e$colors === void 0 ? void 0 : _e$colors.length) > 1) {
+          res = e === null || e === void 0 ? void 0 : e.toCssString();
+        } else {
+          var _e$getChangeFun;
+          res = e === null || e === void 0 || (_e$getChangeFun = e[getChangeFun(format)]) === null || _e$getChangeFun === void 0 ? void 0 : _e$getChangeFun.call(e);
+        }
+        if (e.cleared) {
+          res = undefined;
+        }
+        _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-color-picker/style/index.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useStyle = useStyle;
-require("rc-color-picker/assets/index.css");
 var _vtxProvider = require("../../vtx-provider");
 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; }
@@ -14,17 +13,42 @@ 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); }
 var genVtxColorPickerStyle = function genVtxColorPickerStyle(token) {
   var componentCls = token.componentCls;
-  return _defineProperty({}, componentCls, {
-    backgroundColor: 'transparent',
-    '.ant-input-group-addon': {
-      width: '37px !important'
-    },
-    '.rc-color-picker-wrap': _defineProperty(_defineProperty({
-      position: 'absolute',
-      top: '50%',
-      left: '50%'
-    }, 'line-height', '0'), "transform", 'translate(-50%, -50%)')
-  });
+  return {
+    '.ant-color-picker-inner': _defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty({}, "&-vertical, &-horizontal", {
+      '.ant-color-picker-presets': {
+        paddingTop: 4,
+        '.ant-color-picker-presets-items': {
+          '.ant-color-picker-presets-color': {
+            width: 18,
+            height: 18,
+            '&::before': {
+              width: "calc(18px + var(--ant-line-width) * 4)",
+              height: "calc(18px + var(--ant-line-width) * 4)"
+            },
+            '&::affter': {
+              width: "calc(18px / 13 * 5)",
+              height: "calc(18px / 13 * 8)"
+            }
+          }
+        }
+      }
+    }), "&-vertical", {
+      '.ant-collapse-header': {
+        display: 'none'
+      }
+    }), "&-horizontal", {
+      display: 'flex',
+      gap: 12,
+      '.ant-color-picker-presets': {
+        flex: 1
+      },
+      '>div': {
+        display: 'flex',
+        flexDirection: 'column',
+        width: 234
+      }
+    }))
+  };
 };
 function useStyle(prefixCls) {
   return (0, _vtxProvider.useStyle)('VtxColorPicker', function (token) {

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/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

@@ -44,13 +44,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 +80,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)();

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;
 

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
             })

package/lib/vtx-datagrid/index.js

@@ -4,6 +4,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.DEFAULT_HEIGHTS = void 0;
 exports.VtxDatagrid = VtxDatagrid;
 exports.indexColumnKey = exports.default = void 0;
 var _ahooks = require("ahooks");
@@ -18,6 +19,7 @@ var _ToolBar = _interopRequireDefault(require("./ToolBar"));
 var _Provide = require("./Store/Provide");
 var _index = require("./style/index");
 var _reactAntdColumnResize = require("react-antd-column-resize");
+var _vtxProvider = require("../vtx-provider");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["toolbar", "toolbarClassName", "toolbarTilte", "buttonGroup", "refreshIconVisible", "hideColumnSetting", "hideColumnHeight", "onRefresh", "bordered", "startIndex", "autoFit", "headFootHeight", "columnResizable", "components", "className", "style", "emptyText", "onRowSelectionClear", "onColumnsSave", "uniqueKey", "prefixUrl", "hideSelectionClear", "customEnumText"];
 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); }
@@ -38,8 +40,14 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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
+};
 function VtxTable(props) {
   var _rest$dataSource, _rest$rowSelection, _rest$rowSelection3, _rest$rowSelection4;
+  var intl = (0, _vtxProvider.useIntl)();
   var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('', 'vtx-datagrid');
@@ -75,7 +83,7 @@ function VtxTable(props) {
     toolbar = _props$toolbar === void 0 ? true : _props$toolbar,
     toolbarClassName = props.toolbarClassName,
     _props$toolbarTilte = props.toolbarTilte,
-    toolbarTilte = _props$toolbarTilte === void 0 ? '查询结果' : _props$toolbarTilte,
+    toolbarTilte = _props$toolbarTilte === void 0 ? intl.getMessage('datagrid.queryResults', '查询结果') : _props$toolbarTilte,
     buttonGroup = props.buttonGroup,
     _props$refreshIconVis = props.refreshIconVisible,
     refreshIconVisible = _props$refreshIconVis === void 0 ? true : _props$refreshIconVis,
@@ -89,14 +97,14 @@ function VtxTable(props) {
     _props$autoFit = props.autoFit,
     autoFit = _props$autoFit === void 0 ? true : _props$autoFit,
     _props$headFootHeight = props.headFootHeight,
-    headFootHeight = _props$headFootHeight === void 0 ? 115 : _props$headFootHeight,
+    headFootHeight = _props$headFootHeight === void 0 ? DEFAULT_HEIGHTS.HEAD_FOOT : _props$headFootHeight,
     _props$columnResizabl = props.columnResizable,
     columnResizable = _props$columnResizabl === void 0 ? true : _props$columnResizabl,
     components = props.components,
     className = props.className,
     style = props.style,
     _props$emptyText = props.emptyText,
-    emptyText = _props$emptyText === void 0 ? '暂无数据' : _props$emptyText,
+    emptyText = _props$emptyText === void 0 ? intl.getMessage('select.empty', '暂无数据') : _props$emptyText,
     onRowSelectionClear = props.onRowSelectionClear,
     onColumnsSave = props.onColumnsSave,
     uniqueKey = props.uniqueKey,
@@ -132,14 +140,12 @@ function VtxTable(props) {
     var resizeObserver = new ResizeObserver(function () {
       calculateHeight();
     });
-    // componentDidMount
     if (autoFit && rootDomRef.current) {
       resizeObserver.observe(rootDomRef.current, {
         box: 'border-box'
       });
     }
     return function () {
-      // componentWillUnmount
       if (autoFit) {
         resizeObserver.disconnect();
       }
@@ -161,7 +167,7 @@ function VtxTable(props) {
       showSizeChanger: true,
       showQuickJumper: true,
       showTotal: function showTotal(total) {
-        return "".concat(TextEnum.total, " ").concat(total, " ").concat(TextEnum.item);
+        return "".concat(TextEnum.paginationTotalText, " ").concat(total, " ").concat(TextEnum.paginationItemText);
       }
     }, pagination);
   };
@@ -236,8 +242,8 @@ function VtxTable(props) {
     selectedRowKeys: (_rest$rowSelection4 = rest.rowSelection) === null || _rest$rowSelection4 === void 0 ? void 0 : _rest$rowSelection4.selectedRowKeys,
     onRowSelectionClear: onRowSelectionClear
   }) : null;
-  alertHeight.current = !hideSelectionClear && hasAlert ? 49 : 0;
-  toolbarHeight.current = toolbar ? 56 : 0;
+  alertHeight.current = !hideSelectionClear && hasAlert ? DEFAULT_HEIGHTS.ALERT : 0;
+  toolbarHeight.current = toolbar ? DEFAULT_HEIGHTS.TOOLBAR : 0;
   var _useAntdColumnResize = (0, _reactAntdColumnResize.useAntdColumnResize)(function () {
       return {
         columns: columns,
@@ -288,7 +294,7 @@ function VtxTable(props) {
     hideColumnHeight: hideColumnHeight,
     hideColumnSetting: hideColumnSetting,
     onRefresh: onRefresh,
-    columns: _columns,
+    columns: tableColumn,
     onColumnsSave: onColumnsSave,
     uniqueKey: uniqueKey,
     prefixUrl: prefixUrl,

package/lib/vtx-form-layout/FormItem.js

@@ -106,7 +106,8 @@ function FormItem(props) {
         children: label
       }),
       required: required,
-      hidden: hidden
+      hidden: hidden,
+      colon: label ? true : false
     }, formItemLayout), {}, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, _objectSpread(_objectSpread(_objectSpread({
         noStyle: true

package/lib/vtx-import2/index.js

@@ -221,7 +221,7 @@ var VtxImport2 = exports.VtxImport2 = function VtxImport2(props) {
       if (xhr.status === 200) {
         var res = JSON.parse(xhr.responseText);
         if ((res === null || res === void 0 ? void 0 : res.result) == 0) {
-          _antd.message.success('上传成功');
+          _antd.message.success(intl.getMessage('import.success', '上传成功'));
           chunkUpload(res.data);
         } else {
           _antd.message.error((res === null || res === void 0 ? void 0 : res.msg) || intl.getMessage('import.error', '上传失败'));

package/lib/vtx-input/TextArea/index.js

@@ -54,12 +54,17 @@ var TextArea = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }));
 
   // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-  showCount && 'value' in props && (render = /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    className: (0, _classnames.default)(prefixCls, hashId),
-    "data-count": "".concat(len, "/").concat(maxLength),
-    children: render
-  }));
-  return wrapSSR(render);
+  var wrapper = null;
+  if (showCount && 'value' in props) {
+    wrapper = function wrapper(element) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: (0, _classnames.default)(prefixCls, hashId),
+        "data-count": "".concat(len, "/").concat(maxLength),
+        children: element
+      });
+    };
+  }
+  return wrapSSR(wrapper ? wrapper(render) : render);
 });
 var _default = exports.default = TextArea;
 TextArea.propTypes = {

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

@@ -25,11 +25,13 @@ var genVtxModalStyle = function genVtxModalStyle(token) {
           padding: 0
         },
         '.ant-modal-body': {
-          maxHeight: 'calc(100% - 108px)',
+          height: 'calc(100% - 108px)',
           padding: '12px 20px 8px 20px',
-          overflowY: 'auto',
-          height: '100%'
+          overflowY: 'auto'
         }
+      },
+      '.ant-modal-container': {
+        padding: 0
       }
     }
   }, '&-title', _defineProperty(_defineProperty(_defineProperty({

package/lib/vtx-page-layout/Content.js

@@ -26,7 +26,7 @@ function Content(props) {
     height = props.height;
   var contentClass = (0, _classnames2.default)(_defineProperty(_defineProperty(_defineProperty({}, 'vtx-page-content-absolute', !relative), 'vtx-page-content-relative', relative), 'vtx-page-content-scroll-y', scrollY), className);
   var newStyle = style;
-  if ('height' in props) {
+  if (height !== undefined) {
     newStyle = _objectSpread(_objectSpread({}, newStyle), {}, {
       height: height
     });

package/lib/vtx-page-layout/TabLayout.js

@@ -12,16 +12,10 @@ var _style = require("./style");
 var _vtxProvider = require("../vtx-provider");
 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 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); } /**
+/**
  * 页面
  * @param {*} props
- */
-var Page = function Page(props) {
+ */var Page = function Page(props) {
   var _useContext = (0, _react.useContext)(_vtxProvider.VtxProvider),
     getPrefixCls = _useContext.getPrefixCls;
   var prefix = getPrefixCls('page', props.prefixCls);
@@ -55,7 +49,7 @@ var Content = function Content(props) {
     hashId = _useStyle2.hashId;
   return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: (0, _classnames.default)("".concat(prefix, "-tab-content"), className, hashId),
-    style: _objectSpread({}, style),
+    style: style,
     children: props.children
   }));
 };