@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

package/es/ProForm/utils/useForm.js

@@ -3,31 +3,31 @@ 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 } from './index';
-import { handleScrollToError as handleScrollToErrorProEditTable } from '../../ProEditTable/utils/tools';
-import { FormsContext } from '../../FormsProvider';
+import { filterInternalFields, getFormFieldPaths, mergeNames, isListForm } 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 nextGetFieldsValue = function nextGetFieldsValue(nameList, filterFunc) {
     // 全部查询
     if (nameList !== true) {
       var values = getFieldsValue(nameList || true, filterFunc);
@@ -48,8 +49,8 @@ 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 nextValidateFields = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
       var _rest$,
         _form$__INTERNAL_CONF,
         _len,
@@ -68,6 +69,7 @@ export var useForm = function useForm(originForm, options) {
         _form$getInternalHook,
         getFields,
         fieldsList,
+        fieldsNames,
         _document,
         tablePagination,
         _tablePagination$clic,
@@ -81,8 +83,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 +104,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 +117,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'
@@ -147,18 +149,26 @@ 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], "_")))) {
-                validateNames.push(item.name);
-              }
-            });
+            fieldsList = getFields(); // formList& proEditTable 特殊处理
+            if (Array.isArray(nameList) && isListForm(String(nameList))) {
+              fieldsNames = fieldsList.map(function (item) {
+                return item.name;
+              });
+              validateNames = mergeNames(nameList, fieldsNames);
+            } else {
+              // 其他情况
+              fieldsList.forEach(function (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], "_"))) {
+                  validateNames.push(item.name);
+                }
+              });
+            }
             if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
               validateNames = _toConsumableArray(nameList);
             }
+
             // @ts-ignore
-            // delete rest[0].recursive;
             _context.next = 41;
             return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
               return filterInternalFields(values, optimize);
@@ -167,22 +177,22 @@ export var useForm = function useForm(originForm, options) {
             return _context.abrupt("return", _context.sent);
           case 42:
             // 解决，单个pro-edit-table的表单校验
-            if ((nameList === null || nameList === void 0 ? void 0 : nameList.length) && !nameList.join('-').includes(',')) {
+            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('-'))));
               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 nameList ? values : _getFieldsValue();
+              return nameList ? values : nextGetFieldsValue();
             });
           case 45:
             return _context.abrupt("return", _context.sent);
           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'
@@ -196,11 +206,11 @@ 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 function nextValidateFields(_x) {
+      return _ref4.apply(this, arguments);
     };
   }();
-  var _setFieldValue = function _setFieldValue(name, value, info) {
+  var nextSetFieldValue = function nextSetFieldValue(name, value, info) {
     if (info) {
       setFields([_objectSpread({
         name: name,
@@ -215,7 +225,7 @@ export var useForm = function useForm(originForm, options) {
       }]);
     }
   };
-  var _setFieldsValue = function _setFieldsValue(values) {
+  var nextSetFieldsValue = function nextSetFieldsValue(values) {
     var errors = getFieldsError();
     var errorNames = errors.reduce(function (acc, entry) {
       if (entry.errors.length > 0) {
@@ -239,10 +249,10 @@ export var useForm = function useForm(originForm, options) {
       setFieldsValue(values);
     }
   };
-  form.getFieldsValue = _getFieldsValue;
-  form.setFieldValue = _setFieldValue;
-  form.setFieldsValue = _setFieldsValue;
-  form.validateFields = _validateFields;
+  form.getFieldsValue = nextGetFieldsValue;
+  form.setFieldValue = nextSetFieldValue;
+  form.setFieldsValue = nextSetFieldsValue;
+  form.validateFields = nextValidateFields;
   form.isModified = true;
   form.__INTERNAL_CONFIG__ = {};
   return [form];

package/es/ProForm/utils/useRules.js

@@ -1,10 +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';
+import { isBoolean, isString } from 'lodash';
+import { rulesCreator } from "./rulesCreator";
+import { isNotFullArray, isNullArray } from "./index";
+import locale from "../../locale";
 var useRules = function useRules(props) {
   var rules = props.rules,
     required = props.required,
@@ -13,13 +12,14 @@ var useRules = function useRules(props) {
     names = props.names,
     labelRequired = props.labelRequired,
     type = props.type;
-  var _label = _isString(label) ? label : '';
+  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;
   });
+
   // 根据 required 添加 rules, names 字段会添加数组的必填校验
   var internalRule = useMemo(function () {
     var result = {
@@ -32,8 +32,9 @@ var useRules = function useRules(props) {
           required: allRequired,
           message: message
         };
+
         // names字段的必填校验
-        if (names === null || names === void 0 ? void 0 : names.length) {
+        if (names !== null && names !== void 0 && names.length) {
           rule.validator = function (_, value) {
             if (!value || isNullArray(value)) {
               return Promise.reject(new Error("".concat(locale.ProForm.inputPlaceholder).concat(_label)));
@@ -43,7 +44,7 @@ var useRules = function useRules(props) {
         }
         result.rules = Array.isArray(rules) ? [].concat(_toConsumableArray(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) {
         if (!value || isNullArray(value)) {
@@ -54,6 +55,7 @@ var useRules = function useRules(props) {
     }
     return result;
   }, [rules, required]);
+
   // type转换为内置rules
   internalRule.rules = internalRule.rules && rulesCreator({
     rules: internalRule.rules,
@@ -64,7 +66,7 @@ var useRules = function useRules(props) {
   });
   useEffect(function () {
     // 添加完整性校验
-    if (names && !_isBoolean(labelRequired)) {
+    if (names && !isBoolean(labelRequired)) {
       var customRequired = {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过

package/es/ProForm/utils/useShouldUpdate.js

@@ -1,9 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _get from "lodash/get";
-import _isEqualWith from "lodash/isEqualWith";
-import _isFunction from "lodash/isFunction";
 import { useRef, useState } from 'react';
-import { customEqualForFun } from './index';
+import { isFunction, isEqualWith, get } from 'lodash';
+import { customEqualForFunction } from "../../utils";
 /** FormList中被删除的行也会再触发一次响应式函数 排除这种场景 */
 var isDeleteLine = function isDeleteLine(form, namePath) {
   if (namePath) {
@@ -12,6 +10,7 @@ var isDeleteLine = function isDeleteLine(form, namePath) {
   }
   return false;
 };
+
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
 var useShouldUpdate = function useShouldUpdate(props) {
   var show = props.show,
@@ -32,23 +31,25 @@ var useShouldUpdate = function useShouldUpdate(props) {
     namePath = formItemProps.namePath,
     names = formItemProps.names,
     dependNames = formItemProps.dependNames;
-  var timerRef = useRef();
-  var needClear = useRef(); // 是否需要执行清值操作
-  var showRef = useRef();
-  var disabledRef = useRef();
-  var requiredRef = useRef();
-  var rulesRef = useRef();
-  var fieldPropsRef = useRef();
-  var originComponentRef = useRef();
-  var dependNamesRef = useRef();
-  var desensitizationRef = useRef();
+  var timerRef = useRef(null); // 清值防抖
+
+  var needClear = useRef(false); // 是否需要执行清值操作
+  var showRef = useRef(false);
+  var disabledRef = useRef(false);
+  var requiredRef = useRef(false);
+  var rulesRef = useRef([]);
+  var fieldPropsRef = useRef(null);
+  var originComponentRef = useRef(null);
+  var dependNamesRef = useRef([]);
+  var desensitizationRef = useRef([0, 0]);
   var newComponent = originComponent || component; // 解决component默认赋值污染问题，需要使用originComponent
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     reRender = _useState2[1];
   var values = {};
+
   // 不是动态函数直接返回
-  if (!(dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) && !_isFunction(show) && !_isFunction(disabled) && !_isFunction(required) && !_isFunction(rules) && !_isFunction(fieldProps) && !_isFunction(originComponent) && !_isFunction(desensitization)) {
+  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,
@@ -66,7 +67,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     values = form.getFieldsValue(true);
   }
-  if (_isFunction(show)) {
+  if (isFunction(show)) {
     showRef.current = Boolean(show(values, {
       form: form,
       index: index,
@@ -75,7 +76,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     showRef.current = show;
   }
-  if (_isFunction(desensitization)) {
+  if (isFunction(desensitization)) {
     desensitizationRef.current = desensitization(values, {
       form: form,
       index: index,
@@ -84,7 +85,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     desensitizationRef.current = desensitization;
   }
-  if (_isFunction(disabled)) {
+  if (isFunction(disabled)) {
     // RangePicker返回数组时，特殊处理
     if (['Group', 'RangePicker', 'ProCascader'].includes(type) && Array.isArray(disabled(values, {
       form: form,
@@ -106,7 +107,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     disabledRef.current = disabled;
   }
-  if (_isFunction(required)) {
+  if (isFunction(required)) {
     requiredRef.current = required(values, {
       form: form,
       index: index,
@@ -115,7 +116,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     requiredRef.current = required;
   }
-  if (_isFunction(rules)) {
+  if (isFunction(rules)) {
     rulesRef.current = rules(values, {
       form: form,
       index: index,
@@ -124,7 +125,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     rulesRef.current = rules;
   }
-  if (_isFunction(originComponent)) {
+  if (isFunction(originComponent)) {
     originComponentRef.current = originComponent(values, {
       form: form,
       index: index,
@@ -133,7 +134,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     originComponentRef.current = newComponent;
   }
-  if (_isFunction(fieldProps)) {
+  if (isFunction(fieldProps)) {
     fieldPropsRef.current = fieldProps(values, {
       form: form,
       index: index,
@@ -142,19 +143,19 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     fieldPropsRef.current = fieldProps;
   }
-  if (dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) {
+  if (dependNames !== null && dependNames !== void 0 && dependNames.length) {
     dependNamesRef.current = dependNames.map(function (name) {
-      return _get(values, name);
+      return get(values, name);
     });
   }
   return {
     shouldUpdate: function shouldUpdate(prevValues, currentValues) {
       // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
-      if (dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) {
+      if (dependNames !== null && dependNames !== void 0 && dependNames.length) {
         var curDependNamesValue = dependNames.map(function (name) {
-          return _get(currentValues, name);
+          return get(currentValues, name);
         });
-        var dependNamesChanged = !_isEqualWith(dependNamesRef.current, curDependNamesValue, customEqualForFun);
+        var dependNamesChanged = !isEqualWith(dependNamesRef.current, curDependNamesValue, customEqualForFunction);
         dependNamesRef.current = curDependNamesValue;
         if (!dependNamesChanged) return false;
       }
@@ -165,36 +166,37 @@ var useShouldUpdate = function useShouldUpdate(props) {
       } else {
         _currentValues = form.getFieldsValue(true);
       }
-      var _show = _isFunction(show) ? Boolean(show(_currentValues, {
+      var _show = isFunction(show) ? Boolean(show(_currentValues, {
         form: form,
         index: index,
         namePath: namePath
       })) : show;
-      var _disabled = _isFunction(disabled) ? Boolean(disabled(_currentValues, {
+      var _disabled = isFunction(disabled) ? Boolean(disabled(_currentValues, {
         form: form,
         index: index,
         namePath: namePath
       })) : disabled;
-      var _required = _isFunction(required) ? required(_currentValues, {
+      var _required = isFunction(required) ? required(_currentValues, {
         form: form,
         index: index,
         namePath: namePath
       }) : required;
-      var _rules = _isFunction(rules) ? rules(_currentValues, {
+      var _rules = isFunction(rules) ? rules(_currentValues, {
         form: form,
         index: index,
         namePath: namePath
       }) : rules;
-      var _fieldProps = _isFunction(fieldProps) ? fieldProps(_currentValues, {
+      var _fieldProps = isFunction(fieldProps) ? fieldProps(_currentValues, {
         form: form,
         index: index,
         namePath: namePath
       }) : fieldProps;
-      var _desensitization = _isFunction(desensitization) ? desensitization(_currentValues, {
+      var _desensitization = isFunction(desensitization) ? desensitization(_currentValues, {
         form: form,
         index: index,
         namePath: namePath
       }) : desensitization;
+
       // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && (name || names) && !isDeleteLine(form, namePath)) {
         // 当show为其他变为false的时候记录一次需要清值
@@ -218,10 +220,10 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearTimeout(timerRef.current);
         }
       }
-      var equalRes = _isEqualWith(rulesRef.current, _rules, customEqualForFun);
-      var proEqualRes = _isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun);
-      var desensitizationRes = _isEqualWith(desensitizationRef.current, _desensitization);
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes || !desensitizationRes || (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.transformResponse) // 防止fieldProps变更时，transformResponse根据fieldProps新值无法触发更新
+      var equalRes = isEqualWith(rulesRef.current, _rules, customEqualForFunction);
+      var proEqualRes = isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFunction);
+      var desensitizationRes = isEqualWith(desensitizationRef.current, _desensitization);
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes || !desensitizationRes || _fieldProps !== null && _fieldProps !== void 0 && _fieldProps.transformResponse // 防止fieldProps变更时，transformResponse根据fieldProps新值无法触发更新
       ) {
         showRef.current = _show;
         disabledRef.current = _disabled;

package/es/ProForm/utils/useWatch.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _debounce from "lodash/debounce";
+import { debounce } from 'lodash';
 import warning from 'rc-util/lib/warning';
 import { useState, useEffect, useRef, useMemo } from 'react';
 import isEqual from 'lodash/isEqual';
@@ -10,6 +10,7 @@ export function toArray(value) {
   }
   return Array.isArray(value) ? value : [value];
 }
+
 // 从一个对象或Form值中获取特定路径的值
 function get(source, path) {
   if (!source || path.length === 0) {
@@ -24,6 +25,7 @@ function get(source, path) {
   }
   return current;
 }
+
 /**
  * 将值设置到指定路径的嵌套对象中
  * @param obj 目标对象
@@ -32,11 +34,13 @@ function get(source, path) {
  */
 function setValueByPath(obj, path, value) {
   if (path.length === 0) return;
+
   // 处理单层路径
   if (path.length === 1) {
     obj[path[0]] = value;
     return;
   }
+
   // 处理多层嵌套路径
   var current = obj;
   for (var i = 0; i < path.length - 1; i++) {
@@ -48,12 +52,14 @@ function setValueByPath(obj, path, value) {
   }
   current[path[path.length - 1]] = value;
 }
+
 // 创建之后namepath就不可变的警告
 var useWatchWarning = process.env.NODE_ENV !== 'production' ? function (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，用于监听表单字段变化
  * @param dependencies 监听的字段路径
@@ -64,20 +70,25 @@ var useWatchWarning = process.env.NODE_ENV !== 'production' ? function (dependen
 function useWatch(dependencies, form, wait) {
   // 处理开发环境警告
   useWatchWarning(dependencies);
+
   // 获取表单实例
   var formInstance = form;
+
   // 用于存储最终结果
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
+
   // 使用ref存储中间状态，避免不必要的渲染
   var valueRef = useRef({});
   var prevStateRef = useRef({});
+
   // 标准化依赖为路径数组的数组
   var namePaths = useMemo(function () {
     // 将依赖标准化为数组的数组形式
     var paths = [];
+
     // 字符串形式: 'fieldName'
     if (typeof dependencies === 'string') {
       paths.push(dependencies);
@@ -97,10 +108,11 @@ function useWatch(dependencies, form, wait) {
     }
     return paths;
   }, [/* dependencies 故意忽略，与原实现一致 */]);
+
   // 保存防抖函数引用，避免重复创建
   var debouncedFn = useMemo(function () {
     if (wait) {
-      return _debounce(function (value) {
+      return debounce(function (value) {
         // 只在值真正变化时才更新状态
         if (!isEqual(prevStateRef.current, value)) {
           prevStateRef.current = _objectSpread({}, value);
@@ -108,6 +120,7 @@ function useWatch(dependencies, form, wait) {
         }
       }, wait);
     }
+
     // 非防抖版本
     return function (value) {
       if (!isEqual(prevStateRef.current, value)) {
@@ -118,27 +131,35 @@ function useWatch(dependencies, form, wait) {
   }, [wait]);
   useEffect(function () {
     if (!formInstance) return undefined;
+
     // 创建更新状态的函数
     var updateState = function updateState() {
       var values = formInstance.getFieldsValue(true);
       var newState = {};
+
       // 处理每个监听路径
       namePaths.forEach(function (path) {
         // 将路径转换为数组形式
         var namePath = toArray(path);
+
         // 获取路径对应的值
         var value = get(values, namePath);
+
         // 将值设置到正确的嵌套结构中
         setValueByPath(newState, namePath, value);
       });
+
       // 存储并更新状态
       valueRef.current = newState;
       debouncedFn(newState);
     };
+
     // 初始调用一次
     updateState();
+
     // 注册表单变化监听
-    var getInternalHooks = formInstance.getInternalHooks;
+    var _ref = formInstance,
+      getInternalHooks = _ref.getInternalHooks;
     var _getInternalHooks = getInternalHooks('RC_FORM_INTERNAL_HOOKS'),
       registerWatch = _getInternalHooks.registerWatch;
     var cancelWatch = registerWatch(function (values) {
@@ -146,6 +167,7 @@ function useWatch(dependencies, form, wait) {
         updateState();
       }
     });
+
     // 清理订阅
     return function () {
       if (wait) {

package/es/ProForm/utils/valueType.js

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _isEqual from "lodash/isEqual";
 import Big from 'big.js';
+import { isEqual } from 'lodash';
 import { transforms } from '@zat-design/utils';
 var transformDate = transforms.transformDate,
   transformSwitch = transforms.transformSwitch;
@@ -33,7 +33,7 @@ var transformRatio = function transformRatio(_ref) {
             value: []
           };
         }
-        if (_isEqual(ref, value)) {
+        if (isEqual(ref, value)) {
           return {
             value: [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? Big(value[0] - 0).times(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? Big(value[1] - 0).times(Math.pow(10, precision)).toNumber() : null]
           };
@@ -56,6 +56,7 @@ var transformRatio = function transformRatio(_ref) {
     }
   };
 };
+
 /**
  *  switch转换
  */
@@ -85,6 +86,7 @@ var formatMap = {
     timeType: 'startEndTime'
   }
 };
+
 /**
  *  日期转换
  */
@@ -189,6 +191,7 @@ var dateTransform = function dateTransform(_ref2) {
   }
   return result;
 };
+
 /** 脱敏处理函数 */
 export var maskStringRangeWithRegex = function maskStringRangeWithRegex(input, range) {
   var _input$replace;
@@ -205,7 +208,7 @@ export var maskStringRangeWithRegex = function maskStringRangeWithRegex(input, r
   }
   var regexPattern = "^(.{".concat(start, "})(.{").concat(adjustedEnd - start + 1, "})(.*)$");
   var regex = new RegExp(regexPattern);
-  var maskedValue = input === null || input === void 0 ? void 0 : (_input$replace = input.replace) === null || _input$replace === void 0 ? void 0 : _input$replace.call(input, regex, "$1".concat('*'.repeat(adjustedEnd - start + 1), "$3"));
+  var maskedValue = input === null || input === void 0 || (_input$replace = input.replace) === null || _input$replace === void 0 ? void 0 : _input$replace.call(input, regex, "$1".concat('*'.repeat(adjustedEnd - start + 1), "$3"));
   return maskedValue;
 };
 export default {