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

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 { customEqualForFunction } from '../../utils';
+import { useRef, useState, useEffect } from 'react';
+import { isFunction, isEqualWith, get, debounce } 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,
@@ -24,7 +23,9 @@ var useShouldUpdate = function useShouldUpdate(props) {
     component = props.component,
     originComponent = props.originComponent,
     type = props.type,
-    desensitization = props.desensitization;
+    desensitization = props.desensitization,
+    _props$shouldUpdateDe = props.shouldUpdateDebounce,
+    shouldUpdateDebounce = _props$shouldUpdateDe === void 0 ? 500 : _props$shouldUpdateDe;
   var _shouldUpdate = formItemProps.shouldUpdate,
     name = formItemProps.name,
     clearNotShow = formItemProps.clearNotShow,
@@ -33,6 +34,9 @@ var useShouldUpdate = function useShouldUpdate(props) {
     names = formItemProps.names,
     dependNames = formItemProps.dependNames;
   var timerRef = useRef(null); // 清值防抖
+  var debouncedShouldUpdateRef = useRef(null); // shouldUpdate防抖函数
+  var pendingValuesRef = useRef(null); // 待处理的表单值
+
   var needClear = useRef(false); // 是否需要执行清值操作
   var showRef = useRef(false);
   var disabledRef = useRef(false);
@@ -47,8 +51,80 @@ var useShouldUpdate = function useShouldUpdate(props) {
     _useState2 = _slicedToArray(_useState, 2),
     reRender = _useState2[1];
   var values = {};
+
+  // 处理表单值更新的函数
+  var processValuesUpdate = function processValuesUpdate(currentValues) {
+    var _currentValues;
+    if (namePath) {
+      _currentValues = form.getFieldValue(namePath) || {};
+    } else {
+      _currentValues = currentValues;
+    }
+    var _show = isFunction(show) ? Boolean(show(_currentValues, {
+      form: form,
+      index: index,
+      namePath: namePath
+    })) : show;
+    var _disabled = isFunction(disabled) ? disabled(_currentValues, {
+      form: form,
+      index: index,
+      namePath: namePath
+    }) : disabled;
+    var _required = isFunction(required) ? required(_currentValues, {
+      form: form,
+      index: index,
+      namePath: namePath
+    }) : required;
+    var _rules = isFunction(rules) ? rules(_currentValues, {
+      form: form,
+      index: index,
+      namePath: namePath
+    }) : rules;
+    var _fieldProps = isFunction(fieldProps) ? fieldProps(_currentValues, {
+      form: form,
+      index: index,
+      namePath: namePath
+    }) : fieldProps;
+    var _desensitization = isFunction(desensitization) ? desensitization(_currentValues, {
+      form: form,
+      index: index,
+      namePath: namePath
+    }) : desensitization;
+    var equalRes = isEqualWith(rulesRef.current, _rules, customEqualForFunction);
+    var proEqualRes = isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFunction);
+    var desensitizationRes = isEqualWith(desensitizationRef.current, _desensitization);
+    if (_show !== showRef.current || !isEqualWith(disabledRef.current, _disabled, customEqualForFunction) || _required !== requiredRef.current || !equalRes || !proEqualRes || !desensitizationRes || _fieldProps !== null && _fieldProps !== void 0 && _fieldProps.transformResponse) {
+      showRef.current = _show;
+      disabledRef.current = _disabled;
+      requiredRef.current = _required;
+      rulesRef.current = _rules;
+      fieldPropsRef.current = _fieldProps;
+      desensitizationRef.current = _desensitization;
+      reRender({});
+    }
+  };
+
+  // 创建防抖函数
+  useEffect(function () {
+    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 () {
+        if (pendingValuesRef.current) {
+          var currentValues = pendingValuesRef.current;
+          pendingValuesRef.current = null;
+
+          // 使用最新的values重新计算状态
+          processValuesUpdate(currentValues);
+        }
+      }, shouldUpdateDebounce);
+    }
+    return function () {
+      var _debouncedShouldUpdat;
+      (_debouncedShouldUpdat = debouncedShouldUpdateRef.current) === null || _debouncedShouldUpdat === void 0 || _debouncedShouldUpdat.cancel();
+    };
+  }, [shouldUpdateDebounce, dependNames === null || dependNames === void 0 ? void 0 : dependNames.length, show, disabled, required, rules, fieldProps, originComponent, desensitization]);
+
   // 不是动态函数直接返回
-  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 +142,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 +151,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 +160,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 +182,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 +191,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 +200,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 +209,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,22 +218,33 @@ 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, customEqualForFunction);
+        var dependNamesChanged = !isEqualWith(dependNamesRef.current, curDependNamesValue, customEqualForFunction);
         dependNamesRef.current = curDependNamesValue;
         if (!dependNamesChanged) return false;
       }
+
+      // 如果启用了防抖且存在防抖函数
+      if (shouldUpdateDebounce > 0 && debouncedShouldUpdateRef.current) {
+        // 缓存最新的表单值
+        pendingValuesRef.current = currentValues;
+        // 触发防抖函数
+        debouncedShouldUpdateRef.current();
+        return false; // 暂时不更新，由防抖函数控制
+      }
+
+      // 原有的非防抖逻辑
       var _currentValues;
       if (namePath) {
         // formList场景values取当前行数据
@@ -165,36 +252,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 +306,10 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearTimeout(timerRef.current);
         }
       }
-      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 ? 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 {
@@ -280,9 +283,9 @@ export default {
     });
   },
   /** 百分比 */
-  percentage: function percentage(_ref0) {
-    var type = _ref0.type,
-      valueType = _ref0.valueType;
+  percentage: function percentage(_ref10) {
+    var type = _ref10.type,
+      valueType = _ref10.valueType;
     return transformRatio({
       type: type,
       valueType: valueType,
@@ -290,9 +293,9 @@ export default {
     });
   },
   /** 千分比 */
-  permillage: function permillage(_ref1) {
-    var type = _ref1.type,
-      valueType = _ref1.valueType;
+  permillage: function permillage(_ref11) {
+    var type = _ref11.type,
+      valueType = _ref11.valueType;
     return transformRatio({
       type: type,
       valueType: valueType,
@@ -300,8 +303,8 @@ export default {
     });
   },
   /**  开关 YN转换 */
-  switch: function _switch(_ref10) {
-    var switchValue = _ref10.switchValue;
+  switch: function _switch(_ref12) {
+    var switchValue = _ref12.switchValue;
     return switchTransform(switchValue);
   }
 };

package/es/ProIcon/config/index.js

@@ -255,6 +255,7 @@ export var iconMap = [{
   'text-cn': '调整序号',
   'text-en': 'adjust order'
 }];
+
 // 渐变色icon预设
 export var themeMap = {
   '#006AFF': ['#ADDDFF', '#5FB3D8', '#4181FF'],
@@ -263,6 +264,7 @@ export var themeMap = {
   '#A00F20': ['#FFFFFF', '#E47B7B', '#A00E20'],
   '#31AF96': ['#5FD8C7', '#5FD8C7', '#31AF96']
 };
+
 // 双色icon预设
 export var themeFillMap = {
   '#006AFF': ['none', '#87F1FC', 'black', '#4181FF'],