@zat-design/sisyphus-react 3.13.19-beta.6 → 3.13.19-beta.8

package/lib/ProForm/utils/rulesCreator.js

@@ -7,21 +7,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.rulesCreator = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _isNumber2 = _interopRequireDefault(require("lodash/isNumber"));
-var _isString2 = _interopRequireDefault(require("lodash/isString"));
 var _utils = require("@zat-design/utils");
+var _lodash = require("lodash");
 var _index = require("./index");
 var _locale = _interopRequireWildcard(require("../../locale"));
-var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, valueArray) {
+var getNonEmptyValuesByIndex = (required, valueArray) => {
   var result = [];
-  required.forEach(function (item, index) {
-    if (item && !(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index]) && !(0, _isNumber2.default)(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index])) {
+  required.forEach((item, index) => {
+    if (item && !(valueArray !== null && valueArray !== void 0 && valueArray[index]) && !(0, _lodash.isNumber)(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index])) {
       result.push(index + 1);
     }
   });
   return result;
 };
-var rulesCreator = exports.rulesCreator = function rulesCreator(_ref) {
+var rulesCreator = _ref => {
   var _result;
   var _ref$rules = _ref.rules,
     rules = _ref$rules === void 0 ? [] : _ref$rules,
@@ -29,14 +28,14 @@ var rulesCreator = exports.rulesCreator = function rulesCreator(_ref) {
     isSelect = _ref.isSelect,
     names = _ref.names,
     required = _ref.required;
-  var message = "".concat(isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_locale.default.ProForm.ruleText).concat((0, _isString2.default)(label) ? label : '');
+  var message = `${isSelect ? `${_locale.default.ProForm.selectPlaceHolder}` : `${_locale.default.ProForm.inputPlaceholder}`}${_locale.default.ProForm.ruleText}${(0, _lodash.isString)(label) ? label : ''}`;
   var result = [];
   if (Array.isArray(rules)) {
-    result = rules.map(function (ruleItem) {
+    result = rules.map(ruleItem => {
       var rule = (0, _objectSpread2.default)({}, ruleItem);
       if (rule instanceof Object && 'type' in rule) {
         if (Object.keys(_utils.regExp).includes(rule.type)) {
-          rule.validator = function (rule, value) {
+          rule.validator = (rule, value) => {
             if (!(0, _index.isNullValue)(value) && !_utils.regExp[rule.type].test(value)) {
               return Promise.reject(new Error(rule.message || message));
             }
@@ -44,7 +43,7 @@ var rulesCreator = exports.rulesCreator = function rulesCreator(_ref) {
           };
         }
         if (Object.keys(_utils.validate).includes(rule.type)) {
-          rule.validator = function (rule, value) {
+          rule.validator = (rule, value) => {
             if (!(0, _index.isNullValue)(value) && !_utils.validate[rule.type](value)) {
               return Promise.reject(new Error(rule.message || message));
             }
@@ -55,38 +54,39 @@ var rulesCreator = exports.rulesCreator = function rulesCreator(_ref) {
       return rule;
     });
   }
-  if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
+  if (names !== null && names !== void 0 && names.length && required !== null && required !== void 0 && required.length) {
     var customRequired = {
-      validator: function validator(rules, value) {
+      validator: (rules, value) => {
         var _errorValues3;
         var errorValues = getNonEmptyValuesByIndex(required, value);
         if ((value === null || value === void 0 ? void 0 : value.length) === 2) {
           var _errorValues;
-          errorValues = errorValues.map(function (item) {
+          errorValues = errorValues.map(item => {
             var _locale$ProForm;
-            return _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProForm = _locale.default.ProForm) === null || _locale$ProForm === void 0 ? void 0 : _locale$ProForm.ruleStartEndText[item - 1];
+            return _locale.default === null || _locale.default === void 0 || (_locale$ProForm = _locale.default.ProForm) === null || _locale$ProForm === void 0 ? void 0 : _locale$ProForm.ruleStartEndText[item - 1];
           });
-          if ((_errorValues = errorValues) === null || _errorValues === void 0 ? void 0 : _errorValues.length) {
+          if ((_errorValues = errorValues) !== null && _errorValues !== void 0 && _errorValues.length) {
             var _locale$ProForm2, _errorValues2;
-            return Promise.reject(new Error("".concat(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProForm2 = _locale.default.ProForm) === null || _locale$ProForm2 === void 0 ? void 0 : _locale$ProForm2.inputPlaceholder).concat((_errorValues2 = errorValues) === null || _errorValues2 === void 0 ? void 0 : _errorValues2.join(','))));
+            return Promise.reject(new Error(`${_locale.default === null || _locale.default === void 0 || (_locale$ProForm2 = _locale.default.ProForm) === null || _locale$ProForm2 === void 0 ? void 0 : _locale$ProForm2.inputPlaceholder}${(_errorValues2 = errorValues) === null || _errorValues2 === void 0 ? void 0 : _errorValues2.join(',')}`));
           }
         }
         // 校验为true的值是否存在
-        if (Array.isArray(value) && ((_errorValues3 = errorValues) === null || _errorValues3 === void 0 ? void 0 : _errorValues3.length)) {
+        if (Array.isArray(value) && (_errorValues3 = errorValues) !== null && _errorValues3 !== void 0 && _errorValues3.length) {
           var _locale$ProForm3, _errorValues4;
-          return Promise.reject(new Error("".concat((0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProForm3 = _locale.default.ProForm) === null || _locale$ProForm3 === void 0 ? void 0 : _locale$ProForm3.halfRuleText, {
+          return Promise.reject(new Error(`${(0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 || (_locale$ProForm3 = _locale.default.ProForm) === null || _locale$ProForm3 === void 0 ? void 0 : _locale$ProForm3.halfRuleText, {
             total: (_errorValues4 = errorValues) === null || _errorValues4 === void 0 ? void 0 : _errorValues4.join(',')
-          }))));
+          })}`));
         }
         return Promise.resolve();
       }
     };
     result.push(customRequired);
   }
-  if (!((_result = result) === null || _result === void 0 ? void 0 : _result.length)) {
+  if (!((_result = result) !== null && _result !== void 0 && _result.length)) {
     result = [{
       required: false
     }];
   }
   return result;
-};
+};
+exports.rulesCreator = rulesCreator;

package/lib/ProForm/utils/transformNames.js

@@ -1,22 +1,22 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _union2 = _interopRequireDefault(require("lodash/union"));
+var _lodash = require("lodash");
 var _transformValue2 = require("./transformValue");
-var transformNames = function transformNames(formItem, form, names, fieldName, type) {
+var transformNames = (formItem, form, names, fieldName, type) => {
   var _ref = formItem || {},
     normalize = _ref.normalize,
     getValueProps = _ref.getValueProps,
     _shouldUpdate2 = _ref.shouldUpdate;
-  if (!(names === null || names === void 0 ? void 0 : names.length)) {
+  if (!(names !== null && names !== void 0 && names.length)) {
     return {};
   }
+
   // 当在formList场景下，给transformValue函数的setFiledProps的name, 需要全namePath
-  var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? (0, _union2.default)(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
+  var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? (0, _lodash.union)(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
   var _transformValue = (0, _transformValue2.transformValue)(names, form, _fieldName, normalize, getValueProps),
     _normalize = _transformValue.normalize,
     _getValueProps = _transformValue.getValueProps,
@@ -32,7 +32,7 @@ var transformNames = function transformNames(formItem, form, names, fieldName, t
       for (var _len = arguments.length, rest = new Array(_len), _key = 0; _key < _len; _key++) {
         rest[_key] = arguments[_key];
       }
-      return (_shouldUpdate2 === null || _shouldUpdate2 === void 0 ? void 0 : _shouldUpdate2.apply(void 0, rest)) || _shouldUpdate.apply(void 0, rest);
+      return (_shouldUpdate2 === null || _shouldUpdate2 === void 0 ? void 0 : _shouldUpdate2(...rest)) || _shouldUpdate(...rest);
     }
   };
 };

package/lib/ProForm/utils/transformValue.js

@@ -6,34 +6,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.transformValue = exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _set2 = _interopRequireDefault(require("lodash/set"));
+var _lodash = require("lodash");
 var _utils = require("../utils");
 var _utils2 = require("../../utils");
 var transformValue = exports.transformValue = function transformValue(names, form, fieldName, _normalize, _getValueProps) {
   return {
     normalize: function normalize(value) {
       var _value = value;
+
       // 支持外部传入转换函数
       if (_normalize) {
         for (var _len = arguments.length, res = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
           res[_key - 1] = arguments[_key];
         }
-        _value = _normalize.apply(void 0, [value].concat(res));
+        _value = _normalize(value, ...res);
       }
-      names.forEach(function (name, index) {
+      names.forEach((name, index) => {
         var _value2;
-        (0, _set2.default)(form.getFieldsValue(true), name, (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2[index]);
+        (0, _lodash.set)(form.getFieldsValue(true), name, (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2[index]);
       });
       return _value;
     },
-    getValueProps: function getValueProps(value, isOrigin) {
+    getValueProps: (value, isOrigin) => {
       var _curValue;
       var _value = [];
       if (isOrigin) {
         _value = value;
       } else {
         // 非比对names场景
-        names.forEach(function (name, index) {
+        names.forEach((name, index) => {
           var value = form.getFieldValue(name);
           _value[index] = value;
         });
@@ -42,24 +43,26 @@ var transformValue = exports.transformValue = function transformValue(names, for
       var res = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
         value: _value
       };
+
       // 如果数组中值都为空, 则值置为空
       var curValue = res === null || res === void 0 ? void 0 : res.value;
+
       // @ts-ignore
-      if ((_curValue = curValue) === null || _curValue === void 0 ? void 0 : _curValue.every(function (item) {
-        return (0, _utils2.isEmpty)(item);
-      })) {
+      if ((_curValue = curValue) !== null && _curValue !== void 0 && _curValue.every(item => (0, _utils2.isEmpty)(item))) {
         curValue = undefined;
       }
+
       // 如果来源是比对且有names场景, 则不更新表单值
       if (!isOrigin) {
-        (0, _set2.default)(form.getFieldsValue(true), fieldName, curValue);
+        (0, _lodash.set)(form.getFieldsValue(true), fieldName, curValue);
       }
+
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, res), {}, {
         value: curValue
       });
     },
-    shouldUpdate: function shouldUpdate(prevValues, curValues) {
+    shouldUpdate: (prevValues, curValues) => {
       return (0, _utils.diffField)(prevValues, curValues, names);
     }
   };

package/lib/ProForm/utils/useDeepCompareMemo.js

@@ -1,22 +1,23 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useDeepCompareMemo = void 0;
-var _isEqualWith2 = _interopRequireDefault(require("lodash/isEqualWith"));
 var _react = require("react");
+var _lodash = require("lodash");
 var _ = require(".");
 /** 深度比较依赖变化memo */
-var useDeepCompareMemo = exports.useDeepCompareMemo = function useDeepCompareMemo(fun, changedCb, depList) {
+var useDeepCompareMemo = (fun, changedCb, depList) => {
   var lastDependency = (0, _react.useRef)(); // 上一次的依赖
   var lastRes = (0, _react.useRef)(); // 上一次的结果
-  if (!(0, _isEqualWith2.default)(depList, lastDependency.current, _.customEqualForFun)) {
+
+  if (!(0, _lodash.isEqualWith)(depList, lastDependency.current, _.customEqualForFun)) {
     var res = fun();
-    changedCb === null || changedCb === void 0 ? void 0 : changedCb(lastRes.current, res);
+    changedCb === null || changedCb === void 0 || changedCb(lastRes.current, res);
     lastRes.current = res;
   }
   lastDependency.current = depList;
   return lastRes.current;
-};
+};
+exports.useDeepCompareMemo = useDeepCompareMemo;

package/lib/ProForm/utils/useFieldProps.js

@@ -8,6 +8,5 @@ exports.useFieldProps = exports.FieldProvider = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var FieldContext = /*#__PURE__*/_react.default.createContext({});
 var FieldProvider = exports.FieldProvider = FieldContext.Provider;
-var useFieldProps = exports.useFieldProps = function useFieldProps() {
-  return (0, _react.useContext)(FieldContext);
-};
+var useFieldProps = () => (0, _react.useContext)(FieldContext);
+exports.useFieldProps = useFieldProps;

package/lib/ProForm/utils/useForm.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useForm = void 0;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -20,21 +19,22 @@ var _FormsProvider = require("../../FormsProvider");
 var useForm = exports.useForm = function useForm(originForm, options) {
   // 如果没有form实例可以直接把options放在第一个参数位置
   // @ts-ignore
-  var _originForm = (originForm === null || originForm === void 0 ? void 0 : originForm._init) ? originForm : undefined;
+  var _originForm = originForm !== null && originForm !== void 0 && originForm._init ? originForm : undefined;
   var _options =
   // @ts-ignore
-  options || (originForm && !(originForm === null || originForm === void 0 ? void 0 : originForm._init) ? originForm : undefined);
+  options || (originForm && !(originForm !== null && originForm !== void 0 && originForm._init) ? originForm : undefined);
   var _ref = _options || {},
     _ref$scrollToError = _ref.scrollToError,
     scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError,
     optimize = _ref.optimize,
     formKey = _ref.formKey,
     source = _ref.source;
+
   // formKey全局共享逻辑
   var forms = (0, _react.useContext)(_FormsProvider.FormsContext);
-  var _Form$useForm = _form.default.useForm(forms[formKey] || _originForm),
-    _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
-    form = _Form$useForm2[0];
+  var _ref2 = _form.default.useForm(forms[formKey] || _originForm),
+    _ref3 = (0, _slicedToArray2.default)(_ref2, 1),
+    form = _ref3[0];
   if (formKey && forms[formKey] !== form) {
     forms[formKey] = form;
     form.formKey = formKey;
@@ -46,8 +46,9 @@ var useForm = exports.useForm = function useForm(originForm, options) {
     getFieldsError = form.getFieldsError,
     setFieldsValue = form.setFieldsValue;
   if (isModified) return [form];
+
   // @ts-ignore
-  var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
+  var _getFieldsValue = (nameList, filterFunc) => {
     // 全部查询
     if (nameList !== true) {
       var values = getFieldsValue(nameList || true, filterFunc);
@@ -56,7 +57,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
     return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
       var _rest$,
         _form$__INTERNAL_CONF,
         _len,
@@ -88,8 +89,8 @@ var useForm = exports.useForm = function useForm(originForm, options) {
             for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               rest[_key - 1] = _args[_key];
             }
-            isRecursive = rest === null || rest === void 0 ? void 0 : (_rest$ = rest[0]) === null || _rest$ === void 0 ? void 0 : _rest$.recursive;
-            stopOnFirstError = form === null || form === void 0 ? void 0 : (_form$__INTERNAL_CONF = form.__INTERNAL_CONFIG__) === null || _form$__INTERNAL_CONF === void 0 ? void 0 : _form$__INTERNAL_CONF.stopOnFirstError; // 如果启用了 stopOnFirstError 且没有指定字段列表
+            isRecursive = rest === null || rest === void 0 || (_rest$ = rest[0]) === null || _rest$ === void 0 ? void 0 : _rest$.recursive;
+            stopOnFirstError = form === null || form === void 0 || (_form$__INTERNAL_CONF = form.__INTERNAL_CONFIG__) === null || _form$__INTERNAL_CONF === void 0 ? void 0 : _form$__INTERNAL_CONF.stopOnFirstError; // 如果启用了 stopOnFirstError 且没有指定字段列表
             if (!(stopOnFirstError && !nameList)) {
               _context.next = 33;
               break;
@@ -109,7 +110,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
             _context.prev = 11;
             // 创建不包含 stopOnFirstError 的选项
             // @ts-ignore
-            _options2 = (rest === null || rest === void 0 ? void 0 : rest[0]) ? (0, _objectSpread2.default)({}, rest[0]) : {};
+            _options2 = rest !== null && rest !== void 0 && rest[0] ? (0, _objectSpread2.default)({}, rest[0]) : {};
             delete _options2.stopOnFirstError;
             // 验证单个字段
             // eslint-disable-next-line no-await-in-loop
@@ -122,7 +123,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
             _context.prev = 18;
             _context.t0 = _context["catch"](11);
             // 遇到错误，滚动到错误位置
-            if (scrollToError && (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
+            if (scrollToError && _context.t0 !== null && _context.t0 !== void 0 && (_error$errorFields = _context.t0.errorFields) !== null && _error$errorFields !== void 0 && _error$errorFields.length) {
               form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
                 behavior: 'smooth'
@@ -155,33 +156,34 @@ var useForm = exports.useForm = function useForm(originForm, options) {
             // @ts-ignore
             _form$getInternalHook = form.getInternalHooks('RC_FORM_INTERNAL_HOOKS'), getFields = _form$getInternalHook.getFields;
             fieldsList = getFields();
-            fieldsList.forEach(function (item) {
-              var _item$name, _item$name2, _item$name2$;
-              if (nameList[0] === ((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name[0]) || ((_item$name2 = item.name) === null || _item$name2 === void 0 ? void 0 : (_item$name2$ = _item$name2[0]) === null || _item$name2$ === void 0 ? void 0 : _item$name2$.startsWith("".concat(nameList[0], "_")))) {
+            fieldsList.forEach(item => {
+              var _item$name, _item$name2;
+              if (nameList[0] === ((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name[0]) || (_item$name2 = item.name) !== null && _item$name2 !== void 0 && (_item$name2 = _item$name2[0]) !== null && _item$name2 !== void 0 && _item$name2.startsWith(`${nameList[0]}_`)) {
                 validateNames.push(item.name);
               }
             });
             if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
-              validateNames = (0, _toConsumableArray2.default)(nameList);
+              validateNames = [...nameList];
             }
+
             // @ts-ignore
             // delete rest[0].recursive;
             _context.next = 41;
-            return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
+            return validateFields(validateNames, ...rest).then(values => {
               return (0, _index.filterInternalFields)(values, optimize);
             });
           case 41:
             return _context.abrupt("return", _context.sent);
           case 42:
             // 解决，单个pro-edit-table的表单校验
-            if ((nameList === null || nameList === void 0 ? void 0 : nameList.length) && !nameList.join('-').includes(',')) {
-              tablePagination = document && ((_document = document) === null || _document === void 0 ? void 0 : _document.querySelector("#pro-edit-table-pagination-".concat(nameList.join('-'))));
+            if (nameList !== null && nameList !== void 0 && nameList.length && !nameList.join('-').includes(',')) {
+              tablePagination = document && ((_document = document) === null || _document === void 0 ? void 0 : _document.querySelector(`#pro-edit-table-pagination-${nameList.join('-')}`));
               if (tablePagination) {
-                tablePagination === null || tablePagination === void 0 ? void 0 : (_tablePagination$clic = tablePagination.click) === null || _tablePagination$clic === void 0 ? void 0 : _tablePagination$clic.call(tablePagination);
+                tablePagination === null || tablePagination === void 0 || (_tablePagination$clic = tablePagination.click) === null || _tablePagination$clic === void 0 || _tablePagination$clic.call(tablePagination);
               }
             }
             _context.next = 45;
-            return validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
+            return validateFields(nameList, ...rest).then(values => {
               return nameList ? values : _getFieldsValue();
             });
           case 45:
@@ -189,7 +191,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
           case 48:
             _context.prev = 48;
             _context.t2 = _context["catch"](0);
-            if (scrollToError && (_context.t2 === null || _context.t2 === void 0 ? void 0 : (_error$errorFields2 = _context.t2.errorFields) === null || _error$errorFields2 === void 0 ? void 0 : _error$errorFields2.length) && source === 'ProForm') {
+            if (scrollToError && _context.t2 !== null && _context.t2 !== void 0 && (_error$errorFields2 = _context.t2.errorFields) !== null && _error$errorFields2 !== void 0 && _error$errorFields2.length && source === 'ProForm') {
               form.scrollToField((_error$errorFields$2 = _context.t2.errorFields[0]) === null || _error$errorFields$2 === void 0 ? void 0 : _error$errorFields$2.name, {
                 block: 'center',
                 behavior: 'smooth'
@@ -204,34 +206,34 @@ var useForm = exports.useForm = function useForm(originForm, options) {
       }, _callee, null, [[0, 48], [7, 26, 29, 32], [11, 18]]);
     }));
     return function _validateFields(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
-  var _setFieldValue = function _setFieldValue(name, value, info) {
+  var _setFieldValue = (name, value, info) => {
     if (info) {
       setFields([(0, _objectSpread2.default)({
-        name: name,
-        value: value
+        name,
+        value
       }, info)]);
     } else {
       setFields([{
-        name: name,
-        value: value,
+        name,
+        value,
         errors: [],
         warnings: []
       }]);
     }
   };
-  var _setFieldsValue = function _setFieldsValue(values) {
+  var _setFieldsValue = values => {
     var errors = getFieldsError();
-    var errorNames = errors.reduce(function (acc, entry) {
+    var errorNames = errors.reduce((acc, entry) => {
       if (entry.errors.length > 0) {
         acc.push(entry.name[0]);
       }
       return acc;
     }, []) || [];
     if (errorNames.length) {
-      errorNames.forEach(function (errorName) {
+      errorNames.forEach(errorName => {
         // 只处理names的报错
         if (errorName.includes('-')) {
           setFields([{

package/lib/ProForm/utils/useRules.js

@@ -5,14 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _isString2 = _interopRequireDefault(require("lodash/isString"));
-var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
 var _react = require("react");
+var _lodash = require("lodash");
 var _rulesCreator = require("./rulesCreator");
 var _index = require("./index");
 var _locale = _interopRequireDefault(require("../../locale"));
-var useRules = function useRules(props) {
+var useRules = props => {
   var rules = props.rules,
     required = props.required,
     isSelect = props.isSelect,
@@ -20,63 +18,62 @@ var useRules = function useRules(props) {
     names = props.names,
     labelRequired = props.labelRequired,
     type = props.type;
-  var _label = (0, _isString2.default)(label) ? label : '';
-  var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
-    return rule.required === true;
-  }));
-  var allRequired = required === true || Array.isArray(required) && required.every(function (item) {
-    return item === true;
-  });
+  var _label = (0, _lodash.isString)(label) ? label : '';
+  var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(rule => rule.required === true));
+  var allRequired = required === true || Array.isArray(required) && required.every(item => item === true);
+
   // 根据 required 添加 rules, names 字段会添加数组的必填校验
-  var internalRule = (0, _react.useMemo)(function () {
+  var internalRule = (0, _react.useMemo)(() => {
     var result = {
       rules: rules || []
     };
     if (allRequired) {
       if (!requiredRule) {
-        var message = isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder).concat(_label) : "".concat(_locale.default.ProForm.inputPlaceholder).concat(_label);
+        var message = isSelect ? `${_locale.default.ProForm.selectPlaceHolder}${_label}` : `${_locale.default.ProForm.inputPlaceholder}${_label}`;
         var rule = {
           required: allRequired,
-          message: message
+          message
         };
+
         // names字段的必填校验
-        if (names === null || names === void 0 ? void 0 : names.length) {
-          rule.validator = function (_, value) {
+        if (names !== null && names !== void 0 && names.length) {
+          rule.validator = (_, value) => {
             if (!value || (0, _index.isNullArray)(value)) {
-              return Promise.reject(new Error("".concat(_locale.default.ProForm.inputPlaceholder).concat(_label)));
+              return Promise.reject(new Error(`${_locale.default.ProForm.inputPlaceholder}${_label}`));
             }
             return Promise.resolve();
           };
         }
-        result.rules = Array.isArray(rules) ? [].concat((0, _toConsumableArray2.default)(rules), [rule]) : [rule];
+        result.rules = Array.isArray(rules) ? [...rules, rule] : [rule];
       }
-    } else if (requiredRule && (names === null || names === void 0 ? void 0 : names.length)) {
+    } else if (requiredRule && names !== null && names !== void 0 && names.length) {
       // names字段 修改必填规则校验
-      requiredRule.validator = function (_, value) {
+      requiredRule.validator = (_, value) => {
         if (!value || (0, _index.isNullArray)(value)) {
-          return Promise.reject(new Error("".concat(_locale.default.ProForm.inputPlaceholder).concat(_label)));
+          return Promise.reject(new Error(`${_locale.default.ProForm.inputPlaceholder}${_label}`));
         }
         return Promise.resolve();
       };
     }
     return result;
   }, [rules, required]);
+
   // type转换为内置rules
   internalRule.rules = internalRule.rules && (0, _rulesCreator.rulesCreator)({
     rules: internalRule.rules,
     label: _label,
-    isSelect: isSelect,
-    names: names,
-    required: required
+    isSelect,
+    names,
+    required
   });
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     // 添加完整性校验
-    if (names && !(0, _isBoolean2.default)(labelRequired)) {
+    if (names && !(0, _lodash.isBoolean)(labelRequired)) {
       var customRequired = {
-        validator: function validator(rules, value) {
+        validator: (rules, value) => {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
           if (Array.isArray(value) && !(0, _index.isNullArray)(value) && (0, _index.isNotFullArray)(value, names.length, required)) {
-            return Promise.reject(new Error("".concat(_locale.default.ProForm.completeText).concat(_label)));
+            return Promise.reject(new Error(`${_locale.default.ProForm.completeText}${_label}`));
           }
           return Promise.resolve();
         }