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

package/lib/ProForm/utils/useShouldUpdate.js

@@ -6,21 +6,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _get2 = _interopRequireDefault(require("lodash/get"));
-var _isEqualWith2 = _interopRequireDefault(require("lodash/isEqualWith"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _react = require("react");
+var _lodash = require("lodash");
 var _index = require("./index");
 /** FormList中被删除的行也会再触发一次响应式函数 排除这种场景 */
-var isDeleteLine = function isDeleteLine(form, namePath) {
+var isDeleteLine = (form, namePath) => {
   if (namePath) {
     var line = form.getFieldValue(namePath);
     return line === undefined;
   }
   return false;
 };
+
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
-var useShouldUpdate = function useShouldUpdate(props) {
+var useShouldUpdate = props => {
   var show = props.show,
     formItemProps = props.formItemProps,
     form = props.form,
@@ -54,17 +53,18 @@ var useShouldUpdate = function useShouldUpdate(props) {
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     reRender = _useState2[1];
   var values = {};
+
   // 不是动态函数直接返回
-  if (!(dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) && !(0, _isFunction2.default)(show) && !(0, _isFunction2.default)(disabled) && !(0, _isFunction2.default)(required) && !(0, _isFunction2.default)(rules) && !(0, _isFunction2.default)(fieldProps) && !(0, _isFunction2.default)(originComponent) && !(0, _isFunction2.default)(desensitization)) {
+  if (!(dependNames !== null && dependNames !== void 0 && dependNames.length) && !(0, _lodash.isFunction)(show) && !(0, _lodash.isFunction)(disabled) && !(0, _lodash.isFunction)(required) && !(0, _lodash.isFunction)(rules) && !(0, _lodash.isFunction)(fieldProps) && !(0, _lodash.isFunction)(originComponent) && !(0, _lodash.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) {
@@ -73,95 +73,91 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     values = form.getFieldsValue(true);
   }
-  if ((0, _isFunction2.default)(show)) {
+  if ((0, _lodash.isFunction)(show)) {
     showRef.current = Boolean(show(values, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     }));
   } else {
     showRef.current = show;
   }
-  if ((0, _isFunction2.default)(desensitization)) {
+  if ((0, _lodash.isFunction)(desensitization)) {
     desensitizationRef.current = desensitization(values, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     });
   } else {
     desensitizationRef.current = desensitization;
   }
-  if ((0, _isFunction2.default)(disabled)) {
+  if ((0, _lodash.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 {
     disabledRef.current = disabled;
   }
-  if ((0, _isFunction2.default)(required)) {
+  if ((0, _lodash.isFunction)(required)) {
     requiredRef.current = required(values, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     });
   } else {
     requiredRef.current = required;
   }
-  if ((0, _isFunction2.default)(rules)) {
+  if ((0, _lodash.isFunction)(rules)) {
     rulesRef.current = rules(values, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     });
   } else {
     rulesRef.current = rules;
   }
-  if ((0, _isFunction2.default)(originComponent)) {
+  if ((0, _lodash.isFunction)(originComponent)) {
     originComponentRef.current = originComponent(values, {
-      form: form,
-      index: index,
-      namePath: namePath
+      form,
+      index,
+      namePath
     });
   } else {
     originComponentRef.current = newComponent;
   }
-  if ((0, _isFunction2.default)(fieldProps)) {
+  if ((0, _lodash.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 ? void 0 : dependNames.length) {
-    dependNamesRef.current = dependNames.map(function (name) {
-      return (0, _get2.default)(values, name);
-    });
+  if (dependNames !== null && dependNames !== void 0 && dependNames.length) {
+    dependNamesRef.current = dependNames.map(name => (0, _lodash.get)(values, name));
   }
   return {
     shouldUpdate: function shouldUpdate(prevValues, currentValues) {
       // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
-      if (dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) {
-        var curDependNamesValue = dependNames.map(function (name) {
-          return (0, _get2.default)(currentValues, name);
-        });
-        var dependNamesChanged = !(0, _isEqualWith2.default)(dependNamesRef.current, curDependNamesValue, _index.customEqualForFun);
+      if (dependNames !== null && dependNames !== void 0 && dependNames.length) {
+        var curDependNamesValue = dependNames.map(name => (0, _lodash.get)(currentValues, name));
+        var dependNamesChanged = !(0, _lodash.isEqualWith)(dependNamesRef.current, curDependNamesValue, _index.customEqualForFun);
         dependNamesRef.current = curDependNamesValue;
         if (!dependNamesChanged) return false;
       }
@@ -172,36 +168,37 @@ var useShouldUpdate = function useShouldUpdate(props) {
       } else {
         _currentValues = form.getFieldsValue(true);
       }
-      var _show = (0, _isFunction2.default)(show) ? Boolean(show(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
+      var _show = (0, _lodash.isFunction)(show) ? Boolean(show(_currentValues, {
+        form,
+        index,
+        namePath
       })) : show;
-      var _disabled = (0, _isFunction2.default)(disabled) ? Boolean(disabled(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
+      var _disabled = (0, _lodash.isFunction)(disabled) ? Boolean(disabled(_currentValues, {
+        form,
+        index,
+        namePath
       })) : disabled;
-      var _required = (0, _isFunction2.default)(required) ? required(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
+      var _required = (0, _lodash.isFunction)(required) ? required(_currentValues, {
+        form,
+        index,
+        namePath
       }) : required;
-      var _rules = (0, _isFunction2.default)(rules) ? rules(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
+      var _rules = (0, _lodash.isFunction)(rules) ? rules(_currentValues, {
+        form,
+        index,
+        namePath
       }) : rules;
-      var _fieldProps = (0, _isFunction2.default)(fieldProps) ? fieldProps(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
+      var _fieldProps = (0, _lodash.isFunction)(fieldProps) ? fieldProps(_currentValues, {
+        form,
+        index,
+        namePath
       }) : fieldProps;
-      var _desensitization = (0, _isFunction2.default)(desensitization) ? desensitization(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
+      var _desensitization = (0, _lodash.isFunction)(desensitization) ? desensitization(_currentValues, {
+        form,
+        index,
+        namePath
       }) : desensitization;
+
       // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && (name || names) && !isDeleteLine(form, namePath)) {
         // 当show为其他变为false的时候记录一次需要清值
@@ -210,7 +207,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);
@@ -225,10 +222,10 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearTimeout(timerRef.current);
         }
       }
-      var equalRes = (0, _isEqualWith2.default)(rulesRef.current, _rules, _index.customEqualForFun);
-      var proEqualRes = (0, _isEqualWith2.default)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun);
-      var desensitizationRes = (0, _isEqualWith2.default)(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 = (0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun);
+      var proEqualRes = (0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun);
+      var desensitizationRes = (0, _lodash.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;
@@ -243,7 +240,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/lib/ProForm/utils/useWatch.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 exports.toArray = toArray;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _debounce2 = _interopRequireDefault(require("lodash/debounce"));
+var _lodash = require("lodash");
 var _warning = _interopRequireDefault(require("rc-util/lib/warning"));
 var _react = require("react");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
@@ -18,6 +18,7 @@ function toArray(value) {
   }
   return Array.isArray(value) ? value : [value];
 }
+
 // 从一个对象或Form值中获取特定路径的值
 function get(source, path) {
   if (!source || path.length === 0) {
@@ -32,6 +33,7 @@ function get(source, path) {
   }
   return current;
 }
+
 /**
  * 将值设置到指定路径的嵌套对象中
  * @param obj 目标对象
@@ -40,11 +42,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++) {
@@ -56,12 +60,14 @@ function setValueByPath(obj, path, value) {
   }
   current[path[path.length - 1]] = 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 = (0, _react.useRef)(depsStr);
   (0, _warning.default)(depsStrRef.current === depsStr, '`useWatch` is not support dynamic `namePath`. Please provide static instead.');
-} : function () {};
+} : () => {};
+
 /**
  * ProForm的useWatch hook，用于监听表单字段变化
  * @param dependencies 监听的字段路径
@@ -72,20 +78,25 @@ var useWatchWarning = process.env.NODE_ENV !== 'production' ? function (dependen
 function useWatch(dependencies, form, wait) {
   // 处理开发环境警告
   useWatchWarning(dependencies);
+
   // 获取表单实例
   var formInstance = form;
+
   // 用于存储最终结果
   var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
+
   // 使用ref存储中间状态，避免不必要的渲染
   var valueRef = (0, _react.useRef)({});
   var prevStateRef = (0, _react.useRef)({});
+
   // 标准化依赖为路径数组的数组
-  var namePaths = (0, _react.useMemo)(function () {
+  var namePaths = (0, _react.useMemo)(() => {
     // 将依赖标准化为数组的数组形式
     var paths = [];
+
     // 字符串形式: 'fieldName'
     if (typeof dependencies === 'string') {
       paths.push(dependencies);
@@ -95,7 +106,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 {
@@ -105,10 +116,11 @@ function useWatch(dependencies, form, wait) {
     }
     return paths;
   }, [/* dependencies 故意忽略，与原实现一致 */]);
+
   // 保存防抖函数引用，避免重复创建
-  var debouncedFn = (0, _react.useMemo)(function () {
+  var debouncedFn = (0, _react.useMemo)(() => {
     if (wait) {
-      return (0, _debounce2.default)(function (value) {
+      return (0, _lodash.debounce)(value => {
         // 只在值真正变化时才更新状态
         if (!(0, _isEqual.default)(prevStateRef.current, value)) {
           prevStateRef.current = (0, _objectSpread2.default)({}, value);
@@ -116,46 +128,56 @@ function useWatch(dependencies, form, wait) {
         }
       }, wait);
     }
+
     // 非防抖版本
-    return function (value) {
+    return value => {
       if (!(0, _isEqual.default)(prevStateRef.current, value)) {
         prevStateRef.current = (0, _objectSpread2.default)({}, value);
         setState(value);
       }
     };
   }, [wait]);
-  (0, _react.useEffect)(function () {
+  (0, _react.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);
+
         // 获取路径对应的值
         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) {
+    var cancelWatch = registerWatch(values => {
       if (values) {
         updateState();
       }
     });
+
     // 清理订阅
-    return function () {
+    return () => {
       if (wait) {
         debouncedFn.cancel();
       }