@zat-design/sisyphus-react 3.1.5-beta.9 → 3.2.0

package/lib/ProEnum/index.js

@@ -23,6 +23,7 @@ var _Container = _interopRequireDefault(require("../ProForm/components/Container
 var _utils = require("./utils");
 var _getEnumLabel = _interopRequireDefault(require("./utils/getEnumLabel"));
 var _useEnum = _interopRequireDefault(require("./hooks/useEnum"));
+var _locale = _interopRequireDefault(require("../locale"));
 require("./style/index.less");
 var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps"],
   _excluded2 = ["fieldNames", "clear", "cacheKey"];
@@ -88,7 +89,8 @@ var ProEnum = function ProEnum(props) {
         if (transformResponse && typeof transformResponse === 'function') {
           var responseData = transformResponse(res);
           if ((0, _typeof2.default)(responseData) !== 'object') {
-            return _antd.message.error('请返回正确的数据类型');
+            var _locale$ProEnum;
+            return _antd.message.error((_locale$ProEnum = _locale.default.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorMessage);
           }
           setData(responseData);
         } else {
@@ -98,7 +100,8 @@ var ProEnum = function ProEnum(props) {
             data = res.data;
           if (status === 200) {
             if ((0, _typeof2.default)(data) !== 'object') {
-              return _antd.message.error('请返回正确的数组类型');
+              var _locale$ProEnum2;
+              return _antd.message.error((_locale$ProEnum2 = _locale.default.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
             }
             if (Array.isArray(data)) {
               setData((0, _toConsumableArray2.default)(data));
@@ -142,7 +145,8 @@ var ProEnum = function ProEnum(props) {
     if (!(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) && transformResponse) {
       list = transformResponse(list);
       if (!Array.isArray(list)) {
-        console.error('请返回有效的数组');
+        var _locale$ProEnum3;
+        console.error((_locale$ProEnum3 = _locale.default.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.errorArrayMessage);
         list = [];
       }
     }
@@ -204,7 +208,8 @@ var ProEnum = function ProEnum(props) {
     }
   };
   if (!code && !dataSource && !useRequest) {
-    _antd.message.error('请传入枚举类型');
+    var _locale$ProEnum4;
+    _antd.message.error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType);
     return;
   }
   var transToLabel = function transToLabel(value) {

package/lib/ProForm/components/FormFooter/index.js

@@ -10,6 +10,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _react = require("react");
 var _ProConfigProvider = require("../../../ProConfigProvider");
+var _locale = _interopRequireDefault(require("../../../locale"));
 var PRO_FORM_CACHE = exports.PRO_FORM_CACHE = 'PRO_FORM_CACHE';
 var FormFooter = function FormFooter(props) {
   var initialConfig = (0, _ProConfigProvider.useProConfig)('FormFooter');
@@ -53,24 +54,20 @@ var FormFooter = function FormFooter(props) {
     }
     onCancel();
   };
-  return (
-    // <div className="ant-form-item">
-    (0, _jsxRuntime.jsxs)(_antd.Space, {
-      children: [(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        type: "primary",
-        htmlType: onOk ? 'button' : 'submit',
-        onClick: _onOk,
-        disabled: confirmLoading,
-        loading: confirmLoading
-      }, okButtonProps), {}, {
-        children: okChildren || okText || '查询'
-      })), (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        onClick: _onCancel
-      }, cancelButtonProps), {}, {
-        children: cancelChildren || cancelText || '重置'
-      })), children]
-    })
-    // </div>
-  );
+  return (0, _jsxRuntime.jsxs)(_antd.Space, {
+    children: [(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      type: "primary",
+      htmlType: onOk ? 'button' : 'submit',
+      onClick: _onOk,
+      disabled: confirmLoading,
+      loading: confirmLoading
+    }, okButtonProps), {}, {
+      children: okChildren || okText || "".concat(_locale.default.ProForm.search)
+    })), (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      onClick: _onCancel
+    }, cancelButtonProps), {}, {
+      children: cancelChildren || cancelText || "".concat(_locale.default.ProForm.reset)
+    })), children]
+  });
 };
 var _default = exports.default = FormFooter;

package/lib/ProForm/components/base/Input/index.js

@@ -9,8 +9,10 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
+var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
+var _locale = _interopRequireDefault(require("../../../../locale"));
 var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps"];
 // 参数优先级
 // 组件内默认值 < config默认值 < props
@@ -34,8 +36,7 @@ var Input = function Input(props) {
   return (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     allowClear: true,
     autoComplete: "off",
-    placeholder: placeholder || '请输入',
-    title: rest.value
-  }, initialConfig), rest));
+    placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder)
+  }, (0, _lodash.omit)(initialConfig, ['trim'])), rest));
 };
 var _default = exports.default = Input;

package/lib/ProForm/components/base/InputNumber/index.js

@@ -19,6 +19,7 @@ var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _index = require("../../../utils/index");
+var _locale = _interopRequireDefault(require("../../../../locale"));
 var _excluded = ["placeholder", "className", "otherProps", "range", "min", "max", "onBlur"];
 var calc = _utils.tools.calc;
 var rangeReg = /^[([](-?\d+(\.\d+)?)?,\s*(-?\d+(\.\d+)?)?[)\]]$/;
@@ -106,9 +107,9 @@ var InputNumber = function InputNumber(props) {
       var _max;
       if (range) {
         if (rest.precision === undefined) {
-          console.warn('使用 "range" 时, 必须传入 "precision"');
+          console.warn('When using [range], you must pass in [precision]');
         } else if (!rangeReg.test(range)) {
-          console.warn('"range" 格式有误, 参考: "(a, b)", "[a, b]", "(a, b]", "[a, b)"');
+          console.warn('" range "format is wrong, the reference:" (a, b) ", "[a, b]", "(a, b] [a, b)", "');
         } else {
           var _range$replace$split = range.replace(' ', '').split(','),
             _range$replace$split2 = (0, _slicedToArray2.default)(_range$replace$split, 2),
@@ -244,7 +245,7 @@ var InputNumber = function InputNumber(props) {
   };
   return (0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     autoComplete: "off",
-    placeholder: placeholder || "\u8BF7\u8F93\u5165".concat(label !== null && label !== void 0 ? label : ''),
+    placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder).concat(label !== null && label !== void 0 ? label : ''),
     className: _className
   }, valueProps), initialConfig), rest), {}, {
     onBlur: handleBlur,

package/lib/ProForm/components/base/Select/index.js

@@ -11,6 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _locale = _interopRequireDefault(require("../../../../locale"));
 var _excluded = ["dataSource", "fieldNames", "otherProps", "scrollFollowParent"];
 var Select = function Select(props) {
   var _props$dataSource = props.dataSource,
@@ -65,7 +66,7 @@ var Select = function Select(props) {
     }
   }
   return (0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-    placeholder: "\u8BF7\u9009\u62E9",
+    placeholder: "".concat(_locale.default.ProForm.selectPlaceHolder),
     allowClear: true,
     getPopupContainer: function getPopupContainer(trigger) {
       return scrollFollowParent ? trigger.parentElement : document.body;

package/lib/ProForm/components/base/Switch/index.js

@@ -12,6 +12,7 @@ var _antd = require("antd");
 var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
+var _locale = _interopRequireDefault(require("../../../../locale"));
 var _excluded = ["disabled", "otherProps"];
 var Switch = function Switch(props) {
   var disabled = props.disabled,
@@ -30,13 +31,15 @@ var Switch = function Switch(props) {
     }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
-      children: res.checked === true ? '是' : '否'
+      children: res.checked === true ? "".concat(_locale.default.ProForm.switchText[0]) : "".concat(_locale.default.ProForm.switchText[1])
     });
   }
-  return (0, _jsxRuntime.jsx)(_antd.Switch, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsx)(_antd.Switch, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     disabled: disabled,
-    checkedChildren: "\u662F",
-    unCheckedChildren: "\u5426"
-  }, config), res));
+    checkedChildren: "".concat(_locale.default.ProForm.switchText[0]),
+    unCheckedChildren: "".concat(_locale.default.ProForm.switchText[1])
+  }, config), res), {}, {
+    id: "switch_only" // 解决点击label联动的问题
+  }));
 };
 var _default = exports.default = Switch;

package/lib/ProForm/components/base/SwitchCheckbox/index.js

@@ -11,6 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _locale = _interopRequireDefault(require("../../../../locale"));
 var _excluded = ["onChange", "disabled", "value", "otherProps"];
 var SwitchCheckbox = function SwitchCheckbox(props) {
   var onChange = props.onChange,
@@ -46,7 +47,7 @@ var SwitchCheckbox = function SwitchCheckbox(props) {
         children: restProps.label
       }), (0, _jsxRuntime.jsx)("span", {
         className: "switch-checkbox-view-value",
-        children: restProps.checked === true ? '是' : '否'
+        children: restProps.checked === true ? "".concat(_locale.default.ProForm.switchText[0]) : "".concat(_locale.default.ProForm.switchText[1])
       })]
     });
   }

package/lib/ProForm/components/base/TextArea/index.js

@@ -9,8 +9,10 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
+var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _locale = _interopRequireDefault(require("../../../../locale"));
 require("./index.less");
 var _excluded = ["placeholder", "otherProps", "className"];
 var TextArea = _antd.Input.TextArea;
@@ -37,11 +39,11 @@ var TextAreaDef = function TextAreaDef(props) {
   return (0, _jsxRuntime.jsx)(TextArea, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     showCount: true,
     autoComplete: "off",
-    placeholder: placeholder || "\u8BF7\u8F93\u5165".concat(label || ''),
+    placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder).concat(label || ''),
     autoSize: {
       minRows: 4
     }
-  }, initialConfig), rest), {}, {
+  }, (0, _lodash.omit)(initialConfig, ['trim'])), rest), {}, {
     disabled: disabled,
     className: _className
   }));

package/lib/ProForm/components/combination/FormList/components/ActionButton.js

@@ -14,6 +14,7 @@ var _antd = require("antd");
 var _lodash = require("lodash");
 var _icons = require("@ant-design/icons");
 var _ProIcon = _interopRequireDefault(require("../../../../../ProIcon"));
+var _locale = _interopRequireDefault(require("../../../../../locale"));
 var _excluded = ["label", "onClick", "onHandle", "actionType", "needConfirm", "confirmProps", "title"],
   _excluded2 = ["onClick", "label"];
 var getDefaultActions = function getDefaultActions(mode) {
@@ -22,26 +23,24 @@ var getDefaultActions = function getDefaultActions(mode) {
       onClick: function onClick(record, _ref) {
         var namePath = _ref.namePath,
           index = _ref.index,
-          operation = _ref.operation,
-          form = _ref.form;
+          operation = _ref.operation;
         var add = operation.add;
         add(undefined, index + 1);
       },
       type: 'text',
-      label: '新增',
+      label: "".concat(_locale.default.ProForm.formList_actions[0]),
       icon: (0, _jsxRuntime.jsx)(_icons.PlusSquareOutlined, {})
     },
     delete: {
       onClick: function onClick(record, _ref2) {
         var namePath = _ref2.namePath,
           index = _ref2.index,
-          operation = _ref2.operation,
-          form = _ref2.form;
+          operation = _ref2.operation;
         var remove = operation.remove;
         remove(index);
       },
       type: 'text',
-      label: '删除',
+      label: "".concat(_locale.default.ProForm.formList_actions[1]),
       icon: mode === 'less' ? (0, _jsxRuntime.jsx)(_ProIcon.default, {
         type: "solid-close",
         className: "single-delete"
@@ -53,39 +52,36 @@ var getDefaultActions = function getDefaultActions(mode) {
       onClick: function onClick(record, _ref3) {
         var namePath = _ref3.namePath,
           index = _ref3.index,
-          operation = _ref3.operation,
-          form = _ref3.form;
+          operation = _ref3.operation;
         var add = operation.add;
         add(record, index + 1);
       },
       type: 'text',
-      label: '复制',
+      label: "".concat(_locale.default.ProForm.formList_actions[2]),
       icon: (0, _jsxRuntime.jsx)(_icons.CopyOutlined, {})
     },
     moveUp: {
       onClick: function onClick(record, _ref4) {
         var namePath = _ref4.namePath,
           index = _ref4.index,
-          operation = _ref4.operation,
-          form = _ref4.form;
+          operation = _ref4.operation;
         var move = operation.move;
         move(index, index - 1);
       },
       type: 'text',
-      label: '上移',
+      label: "".concat(_locale.default.ProForm.formList_actions[3]),
       icon: (0, _jsxRuntime.jsx)(_icons.UpSquareOutlined, {})
     },
     moveDown: {
       onClick: function onClick(record, _ref5) {
         var namePath = _ref5.namePath,
           index = _ref5.index,
-          operation = _ref5.operation,
-          form = _ref5.form;
+          operation = _ref5.operation;
         var move = operation.move;
         move(index, index + 1);
       },
       type: 'text',
-      label: '下移',
+      label: "".concat(_locale.default.ProForm.formList_actions[4]),
       icon: (0, _jsxRuntime.jsx)(_icons.DownSquareOutlined, {})
     }
   };
@@ -193,7 +189,7 @@ var ActionButton = function ActionButton(props) {
           return false;
         }
         return _needConfirm ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-          title: title !== null && title !== void 0 ? title : '您确定要删除该条数据吗?',
+          title: title !== null && title !== void 0 ? title : "".concat(_locale.default.ProForm.formList_confirmMessage),
           onCancel: function onCancel(e) {
             return e.stopPropagation();
           },
@@ -216,7 +212,7 @@ var ActionButton = function ActionButton(props) {
         }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index));
       }
       return needConfirm ? (0, _jsxRuntime.jsx)(_antd.Popconfirm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        title: title !== null && title !== void 0 ? title : '您确定要删除该条数据吗?',
+        title: title !== null && title !== void 0 ? title : "".concat(_locale.default.ProForm.formList_confirmMessage),
         onCancel: function onCancel(e) {
           return e.stopPropagation();
         },

package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -13,6 +13,7 @@ var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _lodash = require("lodash");
 var _react = require("react");
+var _locale = _interopRequireDefault(require("../../../../../locale"));
 var _excluded = ["label", "onClick", "onHandle", "actionType"],
   _excluded2 = ["onClick", "label"];
 var actions = {
@@ -23,7 +24,7 @@ var actions = {
         namePath = _ref.namePath;
       operation.add();
     },
-    label: '新增一行',
+    label: "".concat(_locale.default.ProForm.formList_actions[5]),
     type: 'link',
     icon: (0, _jsxRuntime.jsx)(_icons.PlusOutlined, {})
   }

package/lib/ProForm/components/combination/Group/index.js

@@ -33,7 +33,7 @@ var Group = function Group(props) {
     var fieldList = [];
     var result = columns.map(function (item) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        disabled: props === null || props === void 0 ? void 0 : props.disabled
+        disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
       }, item), {}, {
         noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
         parentNames: _parentNames
@@ -47,7 +47,7 @@ var Group = function Group(props) {
       columns: (0, _utils.insertSeparator)(result, space, node, otherProps),
       fieldList: fieldList
     };
-  }, [name, columns, space]);
+  }, [name, columns, space, props]);
   var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {

package/lib/ProForm/components/combination/ProAddressBar/index.js

@@ -19,6 +19,7 @@ var _antd = require("antd");
 var _utils = require("@zat-design/utils");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum"));
+var _locale = _interopRequireDefault(require("../../../../locale"));
 var _excluded = ["className", "getPopupContainer", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
 var transformDataName = _utils.tools.transformDataName;
 var Text = _antd.Typography.Text;
@@ -47,7 +48,7 @@ var levelMap = {
   3: 'county'
 };
 var ProAddressBar = function ProAddressBar(props) {
-  var _otherProps$otherProp, _ref11, _ref11$filter;
+  var _otherProps$otherProp, _ref11, _ref11$filter, _locale$ProAddressBar, _locale$ProAddressBar2, _locale$ProAddressBar3;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProAddressBar') || {},
     configUseRequest = _ref.useRequest,
     configTransformResponse = _ref.transformResponse,
@@ -56,7 +57,6 @@ var ProAddressBar = function ProAddressBar(props) {
     configFieldNames = _ref.fieldNames,
     configEnumCode = _ref.enumCode,
     configCode = _ref.code;
-  // console.count('地址组件渲染次数');
   var className = props.className,
     getPopupContainer = props.getPopupContainer,
     _props$hasDetail = props.hasDetail,
@@ -388,7 +388,7 @@ var ProAddressBar = function ProAddressBar(props) {
     className: "pro-address ".concat(className),
     children: [dataSource || addressCode || !loadData ? (0, _jsxRuntime.jsx)(_antd.Cascader, {
       className: hasDetail ? '' : 'no-detail',
-      placeholder: "\u8BF7\u9009\u62E9",
+      placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar = _locale.default.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
       value: addressValue,
       options: !loadData ? serviceData : realDataSource,
       disabled: disabled,
@@ -403,7 +403,7 @@ var ProAddressBar = function ProAddressBar(props) {
       onChange: handleChange
     }) : (0, _jsxRuntime.jsx)(_antd.Cascader, {
       className: hasDetail ? '' : 'no-detail',
-      placeholder: "\u8BF7\u9009\u62E9",
+      placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar2 = _locale.default.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.placeholder,
       value: addressValue,
       loadData: handleLoadData,
       // @ts-ignore
@@ -428,7 +428,7 @@ var ProAddressBar = function ProAddressBar(props) {
       disabled: disabled,
       value: address,
       maxLength: detailMaxLength,
-      placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740",
+      placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar3 = _locale.default.ProAddressBar) === null || _locale$ProAddressBar3 === void 0 ? void 0 : _locale$ProAddressBar3.detailPlaceholder,
       // @ts-ignore
       onChange: handleAddressChange
     }))]

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -23,6 +23,7 @@ var _index = require("../../../../index");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _view = _interopRequireDefault(require("../../../../assets/view.svg"));
 var _useRequestList2 = _interopRequireDefault(require("./hooks/useRequestList"));
+var _locale = _interopRequireDefault(require("../../../../locale"));
 var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "otherProps", "searchForm", "defaultOne"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
@@ -290,7 +291,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               _context2.next = 4;
               break;
             }
-            _antd.message.error('请先勾选');
+            _antd.message.error(_locale.default.ProModalSelect.checkMsg);
             return _context2.abrupt("return", false);
           case 4:
             _data = isMultiple ? selectedRows : selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows[0];
@@ -455,7 +456,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               }
               _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
               nextSelectRowKeys = isMultiple ? value : [value];
-              console.log('data', _data2);
               if (labelInValue) {
                 onChange(_data2);
               }
@@ -507,7 +507,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               }
               _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
               nextSelectRowKeys = isMultiple ? value : [value];
-              console.log('data', _data3);
               if (labelInValue) {
                 onChange(_data3);
               } else {
@@ -656,7 +655,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onChange: handleChangeValue,
       disabled: disabled,
       addonAfter: forceAddonAfterRender(),
-      placeholder: "\u8BF7\u9009\u62E9",
+      placeholder: _locale.default.ProModalSelect.select,
       autoComplete: "off"
     }, restInputProps)), (0, _jsxRuntime.jsx)(_antd.Input, {
       type: "hidden",

package/lib/ProForm/components/combination/ProNumberRange/index.js

@@ -15,6 +15,7 @@ var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("@zat-design/utils");
 var _Container = _interopRequireDefault(require("../../Container"));
+var _locale = _interopRequireDefault(require("../../../../locale"));
 var formatAmount = _utils.tools.formatAmount,
   formatPercent = _utils.tools.formatPercent,
   formatPerMill = _utils.tools.formatPerMill;
@@ -159,7 +160,7 @@ var ProNumberRange = function ProNumberRange(props) {
     children: [(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       className: "range-left",
       value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
-      placeholder: "\u8BF7\u8F93\u5165",
+      placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
       min: min,
       max: (value === null || value === void 0 ? void 0 : value[1]) || max || range[1],
       precision: precision,
@@ -178,7 +179,7 @@ var ProNumberRange = function ProNumberRange(props) {
     }), (0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       className: "range-right",
       value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
-      placeholder: "\u8BF7\u8F93\u5165",
+      placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
       min: (value === null || value === void 0 ? void 0 : value[0]) || min || range[0],
       max: max,
       precision: precision,

package/lib/ProForm/components/combination/ProRangeLimit/index.js

@@ -16,6 +16,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
+var _locale = _interopRequireDefault(require("../../../../locale"));
 var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator"];
 var defaultPickerValue = [(0, _moment.default)(), (0, _moment.default)()];
 var useControlled = function useControlled(props) {
@@ -44,7 +45,7 @@ var RangePicker = _antd.DatePicker.RangePicker;
 var ProRangeLimit = function ProRangeLimit(props) {
   var disabled = props.disabled,
     _props$foreverText = props.foreverText,
-    foreverText = _props$foreverText === void 0 ? '长期' : _props$foreverText,
+    foreverText = _props$foreverText === void 0 ? _locale.default.ProTimeLimit.foreverText : _props$foreverText,
     _props$foreverDate = props.foreverDate,
     foreverDate = _props$foreverDate === void 0 ? '9999-01-01' : _props$foreverDate,
     _props$format = props.format,
@@ -124,12 +125,10 @@ var ProRangeLimit = function ProRangeLimit(props) {
   };
   return (0, _jsxRuntime.jsxs)(_antd.Input.Group, {
     compact: true,
+    className: "pro-range-limit",
     children: [(0, _jsxRuntime.jsx)(RangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
       allowClear: true,
       disabled: [disabled, disabled || _isForever],
-      style: {
-        width: 'calc(100% - 84px)'
-      },
       defaultPickerValue: defaultPickerValue
     }, initialConfig), (0, _lodash.omit)(rest, ['placeholder', 'separator'])), {}, {
       format: format,
@@ -137,9 +136,6 @@ var ProRangeLimit = function ProRangeLimit(props) {
       onChange: handleRangeChange
     })), (0, _jsxRuntime.jsx)("div", {
       className: className,
-      style: {
-        width: '84px'
-      },
       children: (0, _jsxRuntime.jsx)(_antd.Checkbox, {
         checked: _isForever,
         disabled: disabled,

package/lib/ProForm/components/combination/ProTimeLimit/index.js

@@ -19,6 +19,7 @@ var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _useControlled3 = _interopRequireDefault(require("./hooks/useControlled"));
 var _ProRangeLimit = _interopRequireDefault(require("../ProRangeLimit"));
+var _locale = _interopRequireDefault(require("../../../../locale"));
 var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType", "otherProps"],
   _excluded2 = ["mode"];
 // 永久有效默认值
@@ -28,7 +29,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     disabled = props.disabled,
     foreverTime = props.foreverTime,
     _props$foreverText = props.foreverText,
-    foreverText = _props$foreverText === void 0 ? '长期' : _props$foreverText,
+    foreverText = _props$foreverText === void 0 ? _locale.default.ProTimeLimit.foreverText : _props$foreverText,
     _props$valueType = props.valueType,
     valueType = _props$valueType === void 0 ? 'format' : _props$valueType,
     otherProps = props.otherProps,
@@ -85,25 +86,17 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
   });
   return (0, _jsxRuntime.jsxs)(_antd.Input.Group, {
     compact: true,
+    className: "pro-time-limit",
     children: [(0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-      disabled: disabled || isForever,
-      style: {
-        width: 'calc(100% - 84px)'
-      }
+      disabled: disabled || isForever
     }, initialConfig), (0, _lodash.omit)(rest, ['placeholder'])), {}, {
       value: value,
       onChange: onChange
     })), (0, _jsxRuntime.jsx)("div", {
       className: className,
-      style: {
-        width: '84px'
-      },
       children: (0, _jsxRuntime.jsx)(_antd.Checkbox, {
         checked: isForever,
         disabled: disabled,
-        style: {
-          width: '60px'
-        },
         onChange: foreverChange,
         children: foreverText
       })

package/lib/ProForm/components/combination/ProTimeLimit/style/index.less

@@ -11,3 +11,20 @@
     box-shadow: 0 0 0 2px var(--ant-error-color-outline);
   }
 }
+
+span.ant-input-group-compact {
+  &.pro-time-limit,
+  &.pro-range-limit {
+    display: flex;
+
+    .ant-picker {
+      flex: 1;
+    }
+
+    .forever-checkbox {
+      flex: 0;
+      min-width: unset;
+      white-space: nowrap;
+    }
+  }
+}

package/lib/ProForm/components/render/Render.js

@@ -20,6 +20,7 @@ var _reactSvg = require("react-svg");
 var _lodash = require("lodash");
 var _useShouldUpdate2 = _interopRequireDefault(require("../../utils/useShouldUpdate"));
 var _index = require("../../utils/index");
+var _ProConfigProvider = require("../../../ProConfigProvider");
 var _transformNames = _interopRequireDefault(require("../../utils/transformNames"));
 var _valueType = _interopRequireDefault(require("../../utils/valueType"));
 var _useChanged = require("../../utils/useChanged");
@@ -138,7 +139,8 @@ var Render = function Render(props) {
     required: labelRequired || _required
   } : null, otherProps.isView && !requiredOnView ? {
     required: false
-  } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim)), (0, _objectSpread2.default)({}, (0, _index.isUpperCase)(type, upperCase)), {
+  } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的，其次取ProConfigProvider配置的
+  (0, _objectSpread2.default)({}, (0, _index.isUpperCase)(type, upperCase)), {
     validateFirst: true
   });
   // 添加label宽度
@@ -157,7 +159,7 @@ var Render = function Render(props) {
   var lastComponentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, className, className), (0, _defineProperty2.default)(_classNames, 'pro-form-item-changed', changed), _classNames));
+  var _className = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, className, className), (0, _defineProperty2.default)(_classNames, 'pro-form-item-changed', changed), (0, _defineProperty2.default)(_classNames, 'pro-form-item-width-auto', ['Switch'].includes(type)), _classNames));
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
     return (0, _jsxRuntime.jsx)(_antd.Form.Item, {