@zat-design/sisyphus-react 4.0.0-beta.4 → 4.0.0-beta.5

package/es/ProForm/utils/useForm.js

@@ -1,10 +1,10 @@
 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";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { Form } from 'antd';
 import { useContext } from 'react';
 import { filterInternalFields, getFormFieldPaths, mergeNames, isListForm } from "./index";
 import { handleScrollToError as handleScrollToErrorProEditTable } from "../../ProEditTable/utils/tools";
@@ -25,7 +25,7 @@ export var useForm = function useForm(originForm, options) {
 
   // formKey全局共享逻辑
   var forms = useContext(FormsContext);
-  var _ref2 = Form.useForm(forms[formKey] || _originForm),
+  var _ref2 = _Form.useForm(forms[formKey] || _originForm),
     _ref3 = _slicedToArray(_ref2, 1),
     form = _ref3[0];
   if (formKey && forms[formKey] !== form) {
@@ -41,7 +41,7 @@ export var useForm = function useForm(originForm, options) {
   if (isModified) return [form];
 
   // @ts-ignore
-  var nextGetFieldsValue = function nextGetFieldsValue(nameList, filterFunc) {
+  var nextGetFieldsValue = (nameList, filterFunc) => {
     // 全部查询
     if (nameList !== true) {
       var values = getFieldsValue(nameList || true, filterFunc);
@@ -151,26 +151,24 @@ export var useForm = function useForm(originForm, options) {
             _form$getInternalHook = form.getInternalHooks('RC_FORM_INTERNAL_HOOKS'), getFields = _form$getInternalHook.getFields;
             fieldsList = getFields(); // formList& proEditTable 特殊处理
             if (Array.isArray(nameList) && isListForm(String(nameList))) {
-              fieldsNames = fieldsList.map(function (item) {
-                return item.name;
-              });
+              fieldsNames = fieldsList.map(item => item.name);
               validateNames = mergeNames(nameList, fieldsNames);
             } else {
               // 其他情况
-              fieldsList.forEach(function (item) {
+              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("".concat(nameList[0], "_"))) {
+                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
             _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:
@@ -178,13 +176,13 @@ export var useForm = function useForm(originForm, options) {
           case 42:
             // 解决，单个pro-edit-table的表单校验
             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-".concat(nameList.join('-'))));
+              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 || (_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 : nextGetFieldsValue();
             });
           case 45:
@@ -210,31 +208,31 @@ export var useForm = function useForm(originForm, options) {
       return _ref4.apply(this, arguments);
     };
   }();
-  var nextSetFieldValue = function nextSetFieldValue(name, value, info) {
+  var nextSetFieldValue = (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 nextSetFieldsValue = function nextSetFieldsValue(values) {
+  var nextSetFieldsValue = 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,10 +1,9 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { useEffect, useMemo } from 'react';
 import { isBoolean, isString } from 'lodash';
 import { rulesCreator } from "./rulesCreator";
 import { isNotFullArray, isNullArray } from "./index";
 import locale from "../../locale";
-var useRules = function useRules(props) {
+var useRules = props => {
   var rules = props.rules,
     required = props.required,
     isSelect = props.isSelect,
@@ -13,42 +12,38 @@ var useRules = function useRules(props) {
     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 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 && names.length) {
-          rule.validator = function (_, value) {
+          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 && 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();
       };
@@ -60,18 +55,18 @@ var useRules = function useRules(props) {
   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)) {
       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();
         }

package/es/ProForm/utils/useShouldUpdate.js

@@ -3,7 +3,7 @@ import { useRef, useState, useEffect } from 'react';
 import { isFunction, isEqualWith, get, debounce } from 'lodash';
 import { customEqualForFunction } from "../../utils";
 /** FormList中被删除的行也会再触发一次响应式函数 排除这种场景 */
-var isDeleteLine = function isDeleteLine(form, namePath) {
+var isDeleteLine = (form, namePath) => {
   if (namePath) {
     var line = form.getFieldValue(namePath);
     return line === undefined;
@@ -12,7 +12,7 @@ var isDeleteLine = function isDeleteLine(form, namePath) {
 };
 
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
-var useShouldUpdate = function useShouldUpdate(props) {
+var useShouldUpdate = props => {
   var show = props.show,
     formItemProps = props.formItemProps,
     form = props.form,
@@ -53,7 +53,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
   var values = {};
 
   // 处理表单值更新的函数
-  var processValuesUpdate = function processValuesUpdate(currentValues) {
+  var processValuesUpdate = currentValues => {
     var _currentValues;
     if (namePath) {
       _currentValues = form.getFieldValue(namePath) || {};
@@ -61,34 +61,34 @@ var useShouldUpdate = function useShouldUpdate(props) {
       _currentValues = currentValues;
     }
     var _show = isFunction(show) ? Boolean(show(_currentValues, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     })) : show;
     var _disabled = isFunction(disabled) ? disabled(_currentValues, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     }) : disabled;
     var _required = isFunction(required) ? required(_currentValues, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     }) : required;
     var _rules = isFunction(rules) ? rules(_currentValues, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     }) : rules;
     var _fieldProps = isFunction(fieldProps) ? fieldProps(_currentValues, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     }) : fieldProps;
     var _desensitization = isFunction(desensitization) ? desensitization(_currentValues, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     }) : desensitization;
     var equalRes = isEqualWith(rulesRef.current, _rules, customEqualForFunction);
     var proEqualRes = isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFunction);
@@ -105,9 +105,9 @@ var useShouldUpdate = function useShouldUpdate(props) {
   };
 
   // 创建防抖函数
-  useEffect(function () {
+  useEffect(() => {
     if (shouldUpdateDebounce > 0 && (dependNames !== null && dependNames !== void 0 && dependNames.length || isFunction(show) || isFunction(disabled) || isFunction(required) || isFunction(rules) || isFunction(fieldProps) || isFunction(originComponent) || isFunction(desensitization))) {
-      debouncedShouldUpdateRef.current = debounce(function () {
+      debouncedShouldUpdateRef.current = debounce(() => {
         if (pendingValuesRef.current) {
           var currentValues = pendingValuesRef.current;
           pendingValuesRef.current = null;
@@ -117,7 +117,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
         }
       }, shouldUpdateDebounce);
     }
-    return function () {
+    return () => {
       var _debouncedShouldUpdat;
       (_debouncedShouldUpdat = debouncedShouldUpdateRef.current) === null || _debouncedShouldUpdat === void 0 || _debouncedShouldUpdat.cancel();
     };
@@ -127,13 +127,13 @@ var useShouldUpdate = function useShouldUpdate(props) {
   if (!(dependNames !== null && dependNames !== void 0 && dependNames.length) && !isFunction(show) && !isFunction(disabled) && !isFunction(required) && !isFunction(rules) && !isFunction(fieldProps) && !isFunction(originComponent) && !isFunction(desensitization)) {
     return {
       shouldUpdate: _shouldUpdate,
-      show: show,
-      disabled: disabled,
-      required: required,
-      rules: rules,
-      fieldProps: fieldProps,
+      show,
+      disabled,
+      required,
+      rules,
+      fieldProps,
       component: newComponent,
-      desensitization: desensitization
+      desensitization
     };
   }
   if (namePath) {
@@ -144,18 +144,18 @@ var useShouldUpdate = function useShouldUpdate(props) {
   }
   if (isFunction(show)) {
     showRef.current = Boolean(show(values, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     }));
   } else {
     showRef.current = show;
   }
   if (isFunction(desensitization)) {
     desensitizationRef.current = desensitization(values, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     });
   } else {
     desensitizationRef.current = desensitization;
@@ -163,20 +163,20 @@ var useShouldUpdate = function useShouldUpdate(props) {
   if (isFunction(disabled)) {
     // RangePicker返回数组时，特殊处理
     if (['Group', 'RangePicker', 'ProCascader'].includes(type) && Array.isArray(disabled(values, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     }))) {
       disabledRef.current = disabled(values, {
-        form: form,
-        index: index,
-        namePath: namePath
+        form,
+        index,
+        namePath
       });
     } else {
       disabledRef.current = Boolean(disabled(values, {
-        form: form,
-        index: index,
-        namePath: namePath
+        form,
+        index,
+        namePath
       }));
     }
   } else {
@@ -184,52 +184,48 @@ var useShouldUpdate = function useShouldUpdate(props) {
   }
   if (isFunction(required)) {
     requiredRef.current = required(values, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     });
   } else {
     requiredRef.current = required;
   }
   if (isFunction(rules)) {
     rulesRef.current = rules(values, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     });
   } else {
     rulesRef.current = rules;
   }
   if (isFunction(originComponent)) {
     originComponentRef.current = originComponent(values, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     });
   } else {
     originComponentRef.current = newComponent;
   }
   if (isFunction(fieldProps)) {
     fieldPropsRef.current = fieldProps(values, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     }); // index, namePath FormList才会有
   } else {
     fieldPropsRef.current = fieldProps;
   }
   if (dependNames !== null && dependNames !== void 0 && dependNames.length) {
-    dependNamesRef.current = dependNames.map(function (name) {
-      return get(values, name);
-    });
+    dependNamesRef.current = dependNames.map(name => get(values, name));
   }
   return {
     shouldUpdate: function shouldUpdate(prevValues, currentValues) {
       // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
       if (dependNames !== null && dependNames !== void 0 && dependNames.length) {
-        var curDependNamesValue = dependNames.map(function (name) {
-          return get(currentValues, name);
-        });
+        var curDependNamesValue = dependNames.map(name => get(currentValues, name));
         var dependNamesChanged = !isEqualWith(dependNamesRef.current, curDependNamesValue, customEqualForFunction);
         dependNamesRef.current = curDependNamesValue;
         if (!dependNamesChanged) return false;
@@ -253,34 +249,34 @@ var useShouldUpdate = function useShouldUpdate(props) {
         _currentValues = form.getFieldsValue(true);
       }
       var _show = isFunction(show) ? Boolean(show(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
+        form,
+        index,
+        namePath
       })) : show;
       var _disabled = isFunction(disabled) ? Boolean(disabled(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
+        form,
+        index,
+        namePath
       })) : disabled;
       var _required = isFunction(required) ? required(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
+        form,
+        index,
+        namePath
       }) : required;
       var _rules = isFunction(rules) ? rules(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
+        form,
+        index,
+        namePath
       }) : rules;
       var _fieldProps = isFunction(fieldProps) ? fieldProps(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
+        form,
+        index,
+        namePath
       }) : fieldProps;
       var _desensitization = isFunction(desensitization) ? desensitization(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
+        form,
+        index,
+        namePath
       }) : desensitization;
 
       // 清值防抖  多次刷新时以最后一次为准
@@ -291,7 +287,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
         }
         if (_show === false) {
           clearTimeout(timerRef.current);
-          timerRef.current = setTimeout(function () {
+          timerRef.current = setTimeout(() => {
             if (needClear.current !== true) return;
             if (Array.isArray(names)) {
               form.resetFields(names);
@@ -324,7 +320,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
         for (var _len = arguments.length, rest = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
           rest[_key - 2] = arguments[_key];
         }
-        return _shouldUpdate.apply(void 0, [prevValues, currentValues].concat(rest));
+        return _shouldUpdate(prevValues, currentValues, ...rest);
       }
       return !!_shouldUpdate;
     },

package/es/ProForm/utils/useWatch.js

@@ -54,11 +54,11 @@ function setValueByPath(obj, path, value) {
 }
 
 // 创建之后namepath就不可变的警告
-var useWatchWarning = process.env.NODE_ENV !== 'production' ? function (dependencies) {
+var useWatchWarning = process.env.NODE_ENV !== 'production' ? dependencies => {
   var depsStr = JSON.stringify(dependencies);
   var depsStrRef = useRef(depsStr);
   warning(depsStrRef.current === depsStr, '`useWatch` is not support dynamic `namePath`. Please provide static instead.');
-} : function () {};
+} : () => {};
 
 /**
  * ProForm的useWatch hook，用于监听表单字段变化
@@ -85,7 +85,7 @@ function useWatch(dependencies, form, wait) {
   var prevStateRef = useRef({});
 
   // 标准化依赖为路径数组的数组
-  var namePaths = useMemo(function () {
+  var namePaths = useMemo(() => {
     // 将依赖标准化为数组的数组形式
     var paths = [];
 
@@ -98,7 +98,7 @@ function useWatch(dependencies, form, wait) {
       var isPathsCollection = dependencies.length > 0 && (typeof dependencies[0] === 'string' || Array.isArray(dependencies[0]));
       if (isPathsCollection) {
         // 每个元素都是一个路径
-        dependencies.forEach(function (path) {
+        dependencies.forEach(path => {
           paths.push(path);
         });
       } else {
@@ -110,9 +110,9 @@ function useWatch(dependencies, form, wait) {
   }, [/* dependencies 故意忽略，与原实现一致 */]);
 
   // 保存防抖函数引用，避免重复创建
-  var debouncedFn = useMemo(function () {
+  var debouncedFn = useMemo(() => {
     if (wait) {
-      return debounce(function (value) {
+      return debounce(value => {
         // 只在值真正变化时才更新状态
         if (!isEqual(prevStateRef.current, value)) {
           prevStateRef.current = _objectSpread({}, value);
@@ -122,23 +122,23 @@ function useWatch(dependencies, form, wait) {
     }
 
     // 非防抖版本
-    return function (value) {
+    return value => {
       if (!isEqual(prevStateRef.current, value)) {
         prevStateRef.current = _objectSpread({}, value);
         setState(value);
       }
     };
   }, [wait]);
-  useEffect(function () {
+  useEffect(() => {
     if (!formInstance) return undefined;
 
     // 创建更新状态的函数
-    var updateState = function updateState() {
+    var updateState = () => {
       var values = formInstance.getFieldsValue(true);
       var newState = {};
 
       // 处理每个监听路径
-      namePaths.forEach(function (path) {
+      namePaths.forEach(path => {
         // 将路径转换为数组形式
         var namePath = toArray(path);
 
@@ -162,14 +162,14 @@ function useWatch(dependencies, form, wait) {
       getInternalHooks = _ref.getInternalHooks;
     var _getInternalHooks = getInternalHooks('RC_FORM_INTERNAL_HOOKS'),
       registerWatch = _getInternalHooks.registerWatch;
-    var cancelWatch = registerWatch(function (values) {
+    var cancelWatch = registerWatch(values => {
       if (values) {
         updateState();
       }
     });
 
     // 清理订阅
-    return function () {
+    return () => {
       if (wait) {
         debouncedFn.cancel();
       }