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

package/lib/ProEditTable/style/index.less

@@ -56,7 +56,7 @@
       text-indent  : 5px;
     }
   }
-  
+
   .drag-wrapper {
     display: flex;
     .drag-icon {
@@ -110,12 +110,12 @@
         line-height: 1;
         content    : "*";
       }
-    
+
       &.is-required-left {
         &::after {
           display: none;
         }
-    
+
         &::before {
           position   : static;
           top        : 0;
@@ -140,6 +140,13 @@
         .ant-table-cell-fix-left,
         .ant-table-cell-fix-right {
           background-color: var(--zaui-table-header-bg, #f2f3f5);
+          
+        }
+      }
+
+      .ant-table-cell-fix-right-first {
+        &::after {
+          box-shadow: inset -10px 0 8px -8px rgba(0, 0, 0, 0.15);
         }
       }
 
@@ -175,12 +182,12 @@
             line-height: 1;
             content    : "*";
           }
-        
+
           &.is-required-left {
             &::after {
               display: none;
             }
-        
+
             &::before {
               position   : static;
               top        : 0;
@@ -282,7 +289,7 @@
 }
 
 .pro-edit-table-header {
-  margin-bottom: var(--zaui-space-size-md, 16px);
+  margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
 }
 
 .pro-edit-table-toolbar-fixed {
@@ -300,11 +307,11 @@
         display: flex;
         align-items: center;
         padding: 0 var(--zaui-space-size-xs, 4px);
-  
+
         &:first-child {
           padding-left: 0;
         }
-  
+
         span:nth-child(2) {
           margin-left: var(--zaui-space-size-xs, 4px);
         }

package/lib/ProEditTable/utils/config.d.ts

@@ -1,12 +1,12 @@
 export declare const defaultBtnNameMap: {
-    add: string;
-    edit: string;
-    copy: string;
-    delete: string;
-    mulDelete: string;
-    save: string;
-    cancel: string;
-    custom: string;
+    add: any;
+    edit: any;
+    copy: any;
+    delete: any;
+    mulDelete: any;
+    save: any;
+    cancel: any;
+    custom: any;
 };
 export declare const iconMap: {
     add: JSX.Element;

package/lib/ProEditTable/utils/config.js

@@ -13,16 +13,18 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _jsxRuntime = require("react/jsx-runtime");
 var _icons = require("@ant-design/icons");
 var _antd = require("antd");
+var _lodash = require("lodash");
 var _tools = require("./tools");
+var _locale = _interopRequireDefault(require("../../locale"));
 var defaultBtnNameMap = exports.defaultBtnNameMap = {
-  add: '添加',
-  edit: '编辑',
-  copy: '复制',
-  delete: '删除',
-  mulDelete: '删除',
-  save: '保存',
-  cancel: '取消',
-  custom: '自定义'
+  add: _locale.default.ProEditTable.add,
+  edit: _locale.default.ProEditTable.edit,
+  copy: _locale.default.ProEditTable.copy,
+  delete: _locale.default.ProEditTable.delete,
+  mulDelete: _locale.default.ProEditTable.mulDelete,
+  save: _locale.default.ProEditTable.save,
+  cancel: _locale.default.ProEditTable.cancel,
+  custom: _locale.default.ProEditTable.custom
 };
 // 默认按钮配置
 var iconMap = exports.iconMap = {
@@ -68,7 +70,7 @@ var actions = exports.actions = {
   },
   save: function () {
     var _save = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref2) {
-      var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys;
+      var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -86,11 +88,14 @@ var actions = exports.actions = {
             } else {
               delete record.isEditing;
             }
-            form.setFieldValue(rowName, record);
+            // 防止value引用不变, 值不更新 - (自定义组件)
+            values = form.getFieldsValue();
+            (0, _lodash.set)(values, rowName, record);
+            form.setFieldsValue(values);
             setState({
               editingKeys: nextEditingKeys
             });
-          case 8:
+          case 10:
           case "end":
             return _context.stop();
         }
@@ -130,7 +135,10 @@ var actions = exports.actions = {
         selectedRowKeys: [record.rowKey]
       });
     } else {
-      form.setFieldValue(virtualRowName, record);
+      // 防止value引用不变, 值不更新 - (自定义组件)
+      var values = form.getFieldsValue();
+      (0, _lodash.set)(values, virtualRowName, record);
+      form.setFieldsValue(values);
     }
   },
   delete: function _delete(_ref4) {

package/lib/ProEditTable/utils/index.js

@@ -24,6 +24,7 @@ var _tools = require("./tools");
 var _ProTooltip = _interopRequireDefault(require("../../ProTooltip"));
 var _components = require("../components");
 var _tip = _interopRequireDefault(require("../../assets/tip.svg"));
+var _locale = _interopRequireDefault(require("../../locale"));
 var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
   _excluded2 = ["title", "icon"];
 // 渲染操作栏
@@ -145,7 +146,7 @@ var getActionColumn = function getActionColumn(config) {
     return action;
   });
   return {
-    title: '操作',
+    title: _locale.default.ProEditTable.operation,
     key: 'action',
     fixed: 'right',
     width: actionWidth || (virtualKey ? '120px' : '60px'),
@@ -345,7 +346,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
   if (disabled || isView) {
     // 查看模式下过滤操作栏
     _columns = _columns.filter(function (item) {
-      return item.title !== '操作';
+      return item.title !== _locale.default.ProEditTable.operation;
     });
   } else {
     var validateKeys = _columns.filter(function (i) {

package/lib/ProEnum/hooks/useEnumRequest.js

@@ -13,6 +13,7 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _react = require("react");
 var _ahooks = require("ahooks");
 var _utils = require("../utils");
+var _locale = _interopRequireDefault(require("../../locale"));
 require("../utils/eventCenter");
 var useEnumRequest = function useEnumRequest(props, dispatch) {
   var _ref = props || {},
@@ -41,7 +42,8 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     _ref$dics = _ref.dics,
     dics = _ref$dics === void 0 ? {} : _ref$dics;
   if ((0, _typeof2.default)(dataSource) === 'object' && dataSource === null) {
-    throw new Error('请传入有效的数据源');
+    var _locale$ProEnum;
+    throw new Error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum = _locale.default.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorDataSource);
   }
   var logDebug = function logDebug(msg) {
     if (props.debugger) {
@@ -56,7 +58,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
       setCache: function () {
         var _setCache = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(res) {
-          var response, _useRequest$options, ignoreCodes, cacheData;
+          var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
           return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -73,7 +75,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                   _context.next = 9;
                   break;
                 }
-                throw new Error('请返回正确的数据类型!');
+                throw new Error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum2 = _locale.default.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
               case 9:
                 res.data = response;
               case 10:
@@ -105,8 +107,9 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                 });
                 if (main) {
                   setTimeout(function () {
+                    var _locale$ProEnum3;
                     window.eventCenter.publish('zat-design-pro-component-event', res.data);
-                    logDebug('主应用初始化触发从接口读取数据更新');
+                    logDebug(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum3 = _locale.default.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
                   }, 10000);
                 }
                 return _context.abrupt("return", res);
@@ -131,8 +134,9 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         });
         if (main) {
           setTimeout(function () {
+            var _locale$ProEnum4;
             window.eventCenter.publish('zat-design-pro-component-event', res.data);
-            logDebug('主应用初始化触发从缓存读取数据更新');
+            logDebug(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
           }, 10000);
         }
         return res;
@@ -142,14 +146,15 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
           status = _res$status === void 0 ? 200 : _res$status,
           msg = res.message;
         if (status !== 200) {
-          throw new Error('请求失败');
+          var _locale$ProEnum5;
+          throw new Error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum5 = _locale.default.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
         }
       }
     })),
     run = _useRequestFunc.run;
   var mergeData = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
-      var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res;
+      var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -189,7 +194,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
               _context2.next = 18;
               break;
             }
-            throw new Error('请返回正确的数据类型!');
+            throw new Error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum6 = _locale.default.ProEnum) === null || _locale$ProEnum6 === void 0 ? void 0 : _locale$ProEnum6.errorMessage);
           case 18:
             _context2.next = 21;
             break;
@@ -279,12 +284,14 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
   };
   (0, _react.useEffect)(function () {
     if (main) {
+      var _locale$ProEnum7;
       window.eventCenter.publish('zat-design-pro-component-event', {});
-      logDebug('主应用初始化触发一次');
+      logDebug(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum7 = _locale.default.ProEnum) === null || _locale$ProEnum7 === void 0 ? void 0 : _locale$ProEnum7.mainInitOnce);
     }
     if (!main && share) {
+      var _locale$ProEnum8;
       window.eventCenter.subscribe('zat-design-pro-component-event', shareProEnumDic);
-      logDebug('子应用初始化监听动作');
+      logDebug(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum8 = _locale.default.ProEnum) === null || _locale$ProEnum8 === void 0 ? void 0 : _locale$ProEnum8.sonInitEvent);
     }
     return function () {
       window.eventCenter.unsubscribe('zat-design-pro-component-event', shareProEnumDic);

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/ProEnum/style/index.less

@@ -9,7 +9,7 @@
     align-items: center;
     justify-content: center;
     margin-right: var(--zaui-space-size-sm);
-    margin-bottom: var(--zaui-space-size-sm);
+     margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
     padding: var(--zaui-space-size-xs) 10px;
     background-color: #f5f5f5;
     border-radius: var(--zaui-space-size-xs);

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/RangePicker/index.js

@@ -13,7 +13,7 @@ var _lodash = require("lodash");
 var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["format", "otherProps", "separator"];
+var _excluded = ["format", "otherProps", "separator"]; // @ts-check
 var AntRangePicker = _antd.DatePicker.RangePicker;
 var RangePicker = function RangePicker(props) {
   var _props$format = props.format,
@@ -54,9 +54,6 @@ var RangePicker = function RangePicker(props) {
   var _res = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
     showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
   });
-  if (_res === null || _res === void 0 ? void 0 : _res.placeholder) {
-    _res === null || _res === void 0 ? true : delete _res.placeholder;
-  }
   // 字符串时间格式兼容
   if (Array.isArray(_res.value) && (0, _lodash.isString)(_res.value[0]) && (0, _lodash.isString)(_res.value[1])) {
     _res.value = [(0, _moment.default)(_res.value[0]), (0, _moment.default)(_res.value[1])];

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/base/TextArea/index.less

@@ -6,6 +6,6 @@ div.pro-textarea-view {
   }
   &::after {
     display: none;
-    padding-bottom: 11px;
+    padding-bottom: 12px;
   }
 }

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

@@ -23,7 +23,6 @@
     min-width       : 0;
     margin-left     : -12px;
     margin-right    : -12px;
-    // margin-bottom: -22px;
 
     &>.ant-col {
       padding-left : 12px;