@zat-design/sisyphus-react 3.13.19-beta.1 → 3.13.19-beta.11

package/es/ProForm/utils/processDependencies.js

@@ -1,4 +1,11 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
+/**
+ * 定义支持多字段依赖的类型
+ */
+
+/**
+ * dependencies支持的类型
+ */
+
 /**
  * 处理表单依赖项
  *
@@ -19,17 +26,18 @@ export function processDependencies(dependencies) {
    * 1、没有 dependencies，直接返回
    */
   if (!dependencies) return undefined;
+
   /**
    * 2、如果是数组，处理可能包含多种类型的元素
    */
   if (Array.isArray(dependencies)) {
-    return dependencies.map(function (item) {
+    return dependencies.map(item => {
       // 处理数组中的namesPaths类型元素
-      if (_typeof(item) === 'object' && item !== null && 'type' in item && item.type === 'namesPaths') {
+      if (typeof item === 'object' && item !== null && 'type' in item && item.type === 'namesPaths') {
         // 安全类型转换
         var itemWithPaths = item;
         var paths = itemWithPaths.paths;
-        return paths.map(function (path) {
+        return paths.map(path => {
           return Array.isArray(path) ? path.join('_') : String(path);
         }).join('-');
       }
@@ -37,16 +45,18 @@ export function processDependencies(dependencies) {
       return item;
     });
   }
+
   /**
    * 3、如果是单个namesPaths对象，转换为特定的字符串形式
    * 例如：[['a','b','c'], ['a','b','d']] => 'a_b_c-a_b_d'
    */
   if ('type' in dependencies && dependencies.type === 'namesPaths') {
     var paths = dependencies.paths;
-    return [paths.map(function (path) {
+    return [paths.map(path => {
       return Array.isArray(path) ? path.join('_') : String(path);
     }).join('-')];
   }
+
   /**
    * 4、如果是普通的 dependencies，直接返回
    */

package/es/ProForm/utils/rulesCreator.js

@@ -1,19 +1,18 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _isNumber from "lodash/isNumber";
-import _isString from "lodash/isString";
 import { validate, regExp } from '@zat-design/utils';
-import { isNullValue } from './index';
-import locale, { formatMessage } from '../../locale';
-var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, valueArray) {
+import { isString, isNumber } from 'lodash';
+import { isNullValue } from "./index";
+import locale, { formatMessage } from "../../locale";
+var getNonEmptyValuesByIndex = (required, valueArray) => {
   var result = [];
-  required.forEach(function (item, index) {
-    if (item && !(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index]) && !_isNumber(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index])) {
+  required.forEach((item, index) => {
+    if (item && !(valueArray !== null && valueArray !== void 0 && valueArray[index]) && !isNumber(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index])) {
       result.push(index + 1);
     }
   });
   return result;
 };
-export var rulesCreator = function rulesCreator(_ref) {
+export var rulesCreator = _ref => {
   var _result;
   var _ref$rules = _ref.rules,
     rules = _ref$rules === void 0 ? [] : _ref$rules,
@@ -21,14 +20,14 @@ export var rulesCreator = function rulesCreator(_ref) {
     isSelect = _ref.isSelect,
     names = _ref.names,
     required = _ref.required;
-  var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(_isString(label) ? label : '');
+  var message = `${isSelect ? `${locale.ProForm.selectPlaceHolder}` : `${locale.ProForm.inputPlaceholder}`}${locale.ProForm.ruleText}${isString(label) ? label : ''}`;
   var result = [];
   if (Array.isArray(rules)) {
-    result = rules.map(function (ruleItem) {
+    result = rules.map(ruleItem => {
       var rule = _objectSpread({}, ruleItem);
       if (rule instanceof Object && 'type' in rule) {
         if (Object.keys(regExp).includes(rule.type)) {
-          rule.validator = function (rule, value) {
+          rule.validator = (rule, value) => {
             if (!isNullValue(value) && !regExp[rule.type].test(value)) {
               return Promise.reject(new Error(rule.message || message));
             }
@@ -36,7 +35,7 @@ export var rulesCreator = function rulesCreator(_ref) {
           };
         }
         if (Object.keys(validate).includes(rule.type)) {
-          rule.validator = function (rule, value) {
+          rule.validator = (rule, value) => {
             if (!isNullValue(value) && !validate[rule.type](value)) {
               return Promise.reject(new Error(rule.message || message));
             }
@@ -47,35 +46,35 @@ export var 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 === null || locale === void 0 ? void 0 : (_locale$ProForm = locale.ProForm) === null || _locale$ProForm === void 0 ? void 0 : _locale$ProForm.ruleStartEndText[item - 1];
+            return locale === null || locale === void 0 || (_locale$ProForm = locale.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 === null || locale === void 0 ? void 0 : (_locale$ProForm2 = locale.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 === null || locale === void 0 || (_locale$ProForm2 = locale.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(formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProForm3 = locale.ProForm) === null || _locale$ProForm3 === void 0 ? void 0 : _locale$ProForm3.halfRuleText, {
+          return Promise.reject(new Error(`${formatMessage(locale === null || locale === void 0 || (_locale$ProForm3 = locale.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
     }];

package/es/ProForm/utils/transformNames.js

@@ -1,15 +1,16 @@
-import _union from "lodash/union";
-import { transformValue } from './transformValue';
-var transformNames = function transformNames(formItem, form, names, fieldName, type) {
+import { union } from 'lodash';
+import { transformValue } from "./transformValue";
+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) ? _union(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) ? union(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
   var _transformValue = transformValue(names, form, _fieldName, normalize, getValueProps),
     _normalize = _transformValue.normalize,
     _getValueProps = _transformValue.getValueProps,
@@ -25,7 +26,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/es/ProForm/utils/transformValue.js

@@ -1,32 +1,33 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _set from "lodash/set";
-import { diffField } from '../utils';
-import { isEmpty } from '../../utils';
+import { set } from 'lodash';
+import { diffField } from "../utils";
+import { isEmpty } from "../../utils";
 export var 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;
-        _set(form.getFieldsValue(true), name, (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2[index]);
+        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;
         });
@@ -35,24 +36,26 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       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 isEmpty(item);
-      })) {
+      if ((_curValue = curValue) !== null && _curValue !== void 0 && _curValue.every(item => isEmpty(item))) {
         curValue = undefined;
       }
+
       // 如果来源是比对且有names场景, 则不更新表单值
       if (!isOrigin) {
-        _set(form.getFieldsValue(true), fieldName, curValue);
+        set(form.getFieldsValue(true), fieldName, curValue);
       }
+
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
       return _objectSpread(_objectSpread({}, res), {}, {
         value: curValue
       });
     },
-    shouldUpdate: function shouldUpdate(prevValues, curValues) {
+    shouldUpdate: (prevValues, curValues) => {
       return diffField(prevValues, curValues, names);
     }
   };

package/es/ProForm/utils/useDeepCompareMemo.js

@@ -1,13 +1,15 @@
-import _isEqualWith from "lodash/isEqualWith";
 import { useRef } from 'react';
+import { isEqualWith } from 'lodash';
 import { customEqualForFun } from '.';
+
 /** 深度比较依赖变化memo */
-export var useDeepCompareMemo = function useDeepCompareMemo(fun, changedCb, depList) {
+export var useDeepCompareMemo = (fun, changedCb, depList) => {
   var lastDependency = useRef(); // 上一次的依赖
   var lastRes = useRef(); // 上一次的结果
-  if (!_isEqualWith(depList, lastDependency.current, customEqualForFun)) {
+
+  if (!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;

package/es/ProForm/utils/useFieldProps.js

@@ -1,6 +1,4 @@
 import React, { useContext } from 'react';
 var FieldContext = /*#__PURE__*/React.createContext({});
 export var FieldProvider = FieldContext.Provider;
-export var useFieldProps = function useFieldProps() {
-  return useContext(FieldContext);
-};
+export var useFieldProps = () => useContext(FieldContext);

package/es/ProForm/utils/useForm.js

@@ -1,5 +1,4 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
@@ -7,27 +6,28 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useContext } from 'react';
-import { filterInternalFields, getFormFieldPaths } from './index';
-import { handleScrollToError as handleScrollToErrorProEditTable } from '../../ProEditTable/utils/tools';
-import { FormsContext } from '../../FormsProvider';
+import { filterInternalFields, getFormFieldPaths } from "./index";
+import { handleScrollToError as handleScrollToErrorProEditTable } from "../../ProEditTable/utils/tools";
+import { FormsContext } from "../../FormsProvider";
 export var 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 = useContext(FormsContext);
-  var _Form$useForm = _Form.useForm(forms[formKey] || _originForm),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    form = _Form$useForm2[0];
+  var _ref2 = _Form.useForm(forms[formKey] || _originForm),
+    _ref3 = _slicedToArray(_ref2, 1),
+    form = _ref3[0];
   if (formKey && forms[formKey] !== form) {
     forms[formKey] = form;
     form.formKey = formKey;
@@ -39,8 +39,9 @@ export var 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);
@@ -49,7 +50,7 @@ export var useForm = function useForm(originForm, options) {
     return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
       var _rest$,
         _form$__INTERNAL_CONF,
         _len,
@@ -81,8 +82,8 @@ export var 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;
@@ -102,7 +103,7 @@ export var useForm = function useForm(originForm, options) {
             _context.prev = 11;
             // 创建不包含 stopOnFirstError 的选项
             // @ts-ignore
-            _options2 = (rest === null || rest === void 0 ? void 0 : rest[0]) ? _objectSpread({}, rest[0]) : {};
+            _options2 = rest !== null && rest !== void 0 && rest[0] ? _objectSpread({}, rest[0]) : {};
             delete _options2.stopOnFirstError;
             // 验证单个字段
             // eslint-disable-next-line no-await-in-loop
@@ -115,7 +116,7 @@ export var 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'
@@ -148,33 +149,34 @@ export var 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 = _toConsumableArray(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 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:
@@ -182,7 +184,7 @@ export var 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'
@@ -197,34 +199,34 @@ export var 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([_objectSpread({
-        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/es/ProForm/utils/useRules.js

@@ -1,11 +1,9 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _isString from "lodash/isString";
-import _isBoolean from "lodash/isBoolean";
 import { useEffect, useMemo } from 'react';
-import { rulesCreator } from './rulesCreator';
-import { isNotFullArray, isNullArray } from './index';
-import locale from '../../locale';
-var useRules = function useRules(props) {
+import { isBoolean, isString } from 'lodash';
+import { rulesCreator } from "./rulesCreator";
+import { isNotFullArray, isNullArray } from "./index";
+import locale from "../../locale";
+var useRules = props => {
   var rules = props.rules,
     required = props.required,
     isSelect = props.isSelect,
@@ -13,63 +11,62 @@ var useRules = function useRules(props) {
     names = props.names,
     labelRequired = props.labelRequired,
     type = props.type;
-  var _label = _isString(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 = 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 = useMemo(function () {
+  var internalRule = useMemo(() => {
     var result = {
       rules: rules || []
     };
     if (allRequired) {
       if (!requiredRule) {
-        var message = isSelect ? "".concat(locale.ProForm.selectPlaceHolder).concat(_label) : "".concat(locale.ProForm.inputPlaceholder).concat(_label);
+        var message = isSelect ? `${locale.ProForm.selectPlaceHolder}${_label}` : `${locale.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 || isNullArray(value)) {
-              return Promise.reject(new Error("".concat(locale.ProForm.inputPlaceholder).concat(_label)));
+              return Promise.reject(new Error(`${locale.ProForm.inputPlaceholder}${_label}`));
             }
             return Promise.resolve();
           };
         }
-        result.rules = Array.isArray(rules) ? [].concat(_toConsumableArray(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 || isNullArray(value)) {
-          return Promise.reject(new Error("".concat(locale.ProForm.inputPlaceholder).concat(_label)));
+          return Promise.reject(new Error(`${locale.ProForm.inputPlaceholder}${_label}`));
         }
         return Promise.resolve();
       };
     }
     return result;
   }, [rules, required]);
+
   // type转换为内置rules
   internalRule.rules = internalRule.rules && rulesCreator({
     rules: internalRule.rules,
     label: _label,
-    isSelect: isSelect,
-    names: names,
-    required: required
+    isSelect,
+    names,
+    required
   });
-  useEffect(function () {
+  useEffect(() => {
     // 添加完整性校验
-    if (names && !_isBoolean(labelRequired)) {
+    if (names && !isBoolean(labelRequired)) {
       var customRequired = {
-        validator: function validator(rules, value) {
+        validator: (rules, value) => {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
           if (Array.isArray(value) && !isNullArray(value) && isNotFullArray(value, names.length, required)) {
-            return Promise.reject(new Error("".concat(locale.ProForm.completeText).concat(_label)));
+            return Promise.reject(new Error(`${locale.ProForm.completeText}${_label}`));
           }
           return Promise.resolve();
         }