@zat-design/sisyphus-react 4.5.10-beta.1 → 4.5.10-beta.2

package/es/ProForm/hooks/useRules.js

@@ -1,28 +1,16 @@
-import _isString from "lodash/isString";
-import _isBoolean from "lodash/isBoolean";
-import { useEffect, useMemo } from 'react';
+import { useEffect, useMemo } from "react";
+import isBoolean from "lodash/isBoolean";
+import isString from "lodash/isString";
 import { rulesCreator } from "../utils/rulesCreator";
 import { isNotFullArray, isNullArray } from "../utils";
 import locale from "../../locale";
-const useRules = props => {
-  const {
-    rules,
-    required,
-    isSelect,
-    label,
-    names,
-    labelRequired,
-    type
-  } = props;
-  const _label = _isString(label) ? label : '';
-  const requiredRule = Array.isArray(rules) && rules?.find(rule => rule.required === true);
-  const allRequired = required === true || Array.isArray(required) && required.every(item => item === true);
-
-  // 根据 required 添加 rules, names 字段会添加数组的必填校验
+const useRules = (props) => {
+  const { rules, required, isSelect, label, names, labelRequired, type } = props;
+  const _label = isString(label) ? label : "";
+  const requiredRule = Array.isArray(rules) && (rules == null ? void 0 : rules.find((rule) => rule.required === true));
+  const allRequired = required === true || Array.isArray(required) && required.every((item) => item === true);
   const internalRule = useMemo(() => {
-    const result = {
-      rules: rules || []
-    };
+    const result = { rules: rules || [] };
     if (allRequired) {
       if (!requiredRule) {
         const message = isSelect ? `${locale.ProForm.selectPlaceHolder}${_label}` : `${locale.ProForm.inputPlaceholder}${_label}`;
@@ -30,9 +18,7 @@ const useRules = props => {
           required: allRequired,
           message
         };
-
-        // names字段的必填校验
-        if (names?.length) {
+        if (names == null ? void 0 : names.length) {
           rule.validator = (_, value) => {
             if (!value || isNullArray(value)) {
               return Promise.reject(new Error(`${locale.ProForm.inputPlaceholder}${_label}`));
@@ -42,8 +28,7 @@ const useRules = props => {
         }
         result.rules = Array.isArray(rules) ? [...rules, rule] : [rule];
       }
-    } else if (requiredRule && names?.length) {
-      // names字段 修改必填规则校验
+    } else if (requiredRule && (names == null ? void 0 : names.length)) {
       requiredRule.validator = (_, value) => {
         if (!value || isNullArray(value)) {
           return Promise.reject(new Error(`${locale.ProForm.inputPlaceholder}${_label}`));
@@ -53,8 +38,6 @@ const useRules = props => {
     }
     return result;
   }, [rules, required]);
-
-  // type转换为内置rules
   internalRule.rules = internalRule.rules && rulesCreator({
     rules: internalRule.rules,
     label: _label,
@@ -63,11 +46,9 @@ const useRules = props => {
     required
   });
   useEffect(() => {
-    // 添加完整性校验
-    if (names && !_isBoolean(labelRequired)) {
+    if (names && !isBoolean(labelRequired)) {
       const customRequired = {
-        validator: (rules, value) => {
-          // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
+        validator: (rules2, value) => {
           if (Array.isArray(value) && !isNullArray(value) && isNotFullArray(value, names.length, required)) {
             return Promise.reject(new Error(`${locale.ProForm.completeText}${_label}`));
           }
@@ -79,4 +60,7 @@ const useRules = props => {
   }, [internalRule]);
   return internalRule;
 };
-export default useRules;
+var useRules_default = useRules;
+export {
+  useRules_default as default
+};

package/es/ProForm/hooks/useShouldUpdate.js

@@ -1,24 +1,22 @@
-import _debounce from "lodash/debounce";
-import _get from "lodash/get";
-import _isEqualWith from "lodash/isEqualWith";
-import _isFunction from "lodash/isFunction";
-import { useRef, useState, useEffect } from 'react';
+import { useRef, useState, useEffect } from "react";
+import isFunction from "lodash/isFunction";
+import isEqualWith from "lodash/isEqualWith";
+import get from "lodash/get";
+import debounce from "lodash/debounce";
 import { customEqualForFunction } from "../../utils";
-import { resolveReactiveValues, hasReactiveDiff, commitReactiveValues } from "../utils/reactiveValues";
-/** FormList中被删除的行也会再触发一次响应式函数 排除这种场景 */
+import {
+  resolveReactiveValues,
+  hasReactiveDiff,
+  commitReactiveValues
+} from "../utils/reactiveValues";
 const isDeleteLine = (form, namePath) => {
   if (namePath) {
     const line = form.getFieldValue(namePath);
-    return line === undefined;
+    return line === void 0;
   }
   return false;
 };
-
-/**
- * 执行清值逻辑
- * @param params 清值所需参数
- */
-const executeClearValue = params => {
+const executeClearValue = (params) => {
   const {
     form,
     name,
@@ -31,38 +29,31 @@ const executeClearValue = params => {
     needClear,
     timerRef
   } = params;
-
-  // 提前返回：不满足清值条件
   const shouldClear = clearNotShow !== false && (name || names) && !isDeleteLine(form, namePath);
   if (!shouldClear) {
     return;
   }
-
-  // 当show从其他值变为false时，标记需要清值
   const showChangedToFalse = currentShow !== previousShow && currentShow === false;
   if (showChangedToFalse) {
     needClear.current = true;
   }
-
-  // show为false时，执行清值操作（带防抖）
   if (currentShow === false) {
     clearTimeout(timerRef.current);
     timerRef.current = setTimeout(() => {
-      if (needClear.current !== true) return;
-      const fieldsToReset = Array.isArray(names) ? names : [formItemProps.namePath ? formItemProps.namePath.slice(0, -1).concat(formItemProps.name) : formItemProps.name];
+      if (needClear.current !== true)
+        return;
+      const fieldsToReset = Array.isArray(names) ? names : [
+        formItemProps.namePath ? formItemProps.namePath.slice(0, -1).concat(formItemProps.name) : formItemProps.name
+      ];
       form.resetFields(fieldsToReset);
       needClear.current = false;
     }, 300);
     return;
   }
-
-  // show不为false时，清除清值标记和定时器
   needClear.current = false;
   clearTimeout(timerRef.current);
 };
-
-// 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
-const useShouldUpdate = props => {
+const useShouldUpdate = (props) => {
   const {
     show,
     formItemProps,
@@ -77,20 +68,11 @@ const useShouldUpdate = props => {
     desensitization,
     shouldUpdateDebounce
   } = props;
-  const {
-    shouldUpdate,
-    name,
-    clearNotShow,
-    index,
-    namePath,
-    names,
-    dependNames
-  } = formItemProps;
-  const timerRef = useRef(null); // 清值防抖
-  const debouncedShouldUpdateRef = useRef(null); // shouldUpdate防抖函数
-  const pendingValuesRef = useRef(null); // 待处理的表单值
-
-  const needClear = useRef(false); // 是否需要执行清值操作
+  const { shouldUpdate, name, clearNotShow, index, namePath, names, dependNames } = formItemProps;
+  const timerRef = useRef(null);
+  const debouncedShouldUpdateRef = useRef(null);
+  const pendingValuesRef = useRef(null);
+  const needClear = useRef(false);
   const showRef = useRef(false);
   const disabledRef = useRef(false);
   const requiredRef = useRef(false);
@@ -99,11 +81,9 @@ const useShouldUpdate = props => {
   const originComponentRef = useRef(null);
   const dependNamesRef = useRef([]);
   const desensitizationRef = useRef([0, 0]);
-  const newComponent = originComponent || component; // 解决component默认赋值污染问题，需要使用originComponent
+  const newComponent = originComponent || component;
   const [, reRender] = useState({});
   let values = {};
-
-  // 响应式配置与 ref 集合，供纯函数复用
   const reactiveProps = {
     show,
     disabled,
@@ -120,18 +100,10 @@ const useShouldUpdate = props => {
     fieldPropsRef,
     desensitizationRef
   };
-
-  // 处理表单值更新的函数
-  const processValuesUpdate = currentValues => {
+  const processValuesUpdate = (currentValues) => {
     const _currentValues = namePath ? form.getFieldValue(namePath) || {} : currentValues;
-    const ctx = {
-      form,
-      index,
-      namePath
-    };
+    const ctx = { form, index, namePath };
     const next = resolveReactiveValues(reactiveProps, _currentValues, ctx);
-
-    // 在防抖函数中也执行清值逻辑，确保清值功能在防抖场景下也能正常工作
     executeClearValue({
       form,
       name,
@@ -149,27 +121,32 @@ const useShouldUpdate = props => {
       reRender({});
     }
   };
-
-  // 创建防抖函数
   useEffect(() => {
-    if (shouldUpdateDebounce > 0 && (dependNames?.length || _isFunction(show) || _isFunction(disabled) || _isFunction(required) || _isFunction(rules) || _isFunction(fieldProps) || _isFunction(originComponent) || _isFunction(desensitization))) {
-      debouncedShouldUpdateRef.current = _debounce(() => {
+    if (shouldUpdateDebounce > 0 && ((dependNames == null ? void 0 : dependNames.length) || isFunction(show) || isFunction(disabled) || isFunction(required) || isFunction(rules) || isFunction(fieldProps) || isFunction(originComponent) || isFunction(desensitization))) {
+      debouncedShouldUpdateRef.current = debounce(() => {
         if (pendingValuesRef.current) {
           const currentValues = pendingValuesRef.current;
           pendingValuesRef.current = null;
-
-          // 使用最新的values重新计算状态
           processValuesUpdate(currentValues);
         }
       }, shouldUpdateDebounce);
     }
     return () => {
-      debouncedShouldUpdateRef.current?.cancel();
+      var _a;
+      (_a = debouncedShouldUpdateRef.current) == null ? void 0 : _a.cancel();
     };
-  }, [shouldUpdateDebounce, dependNames?.length, show, disabled, required, rules, fieldProps, originComponent, desensitization]);
-
-  // 不是动态函数直接返回
-  if (!dependNames?.length && !_isFunction(show) && !_isFunction(disabled) && !_isFunction(required) && !_isFunction(rules) && !_isFunction(fieldProps) && !_isFunction(originComponent) && !_isFunction(desensitization)) {
+  }, [
+    shouldUpdateDebounce,
+    dependNames == null ? void 0 : dependNames.length,
+    show,
+    disabled,
+    required,
+    rules,
+    fieldProps,
+    originComponent,
+    desensitization
+  ]);
+  if (!(dependNames == null ? void 0 : dependNames.length) && !isFunction(show) && !isFunction(disabled) && !isFunction(required) && !isFunction(rules) && !isFunction(fieldProps) && !isFunction(originComponent) && !isFunction(desensitization)) {
     return {
       shouldUpdate,
       show,
@@ -182,117 +159,72 @@ const useShouldUpdate = props => {
     };
   }
   if (namePath) {
-    // formList场景values取当前行数据
     values = form.getFieldValue(namePath) || {};
   } else {
     values = form.getFieldsValue(true);
   }
-  if (_isFunction(show)) {
-    showRef.current = Boolean(show(values, {
-      form,
-      index,
-      namePath
-    }));
+  if (isFunction(show)) {
+    showRef.current = Boolean(show(values, { form, index, namePath }));
   } else {
     showRef.current = show;
   }
-  if (_isFunction(desensitization)) {
-    desensitizationRef.current = desensitization(values, {
-      form,
-      index,
-      namePath
-    });
+  if (isFunction(desensitization)) {
+    desensitizationRef.current = desensitization(values, { form, index, namePath });
   } else {
     desensitizationRef.current = desensitization;
   }
-  if (_isFunction(disabled)) {
-    // RangePicker返回数组时，特殊处理
-    if (['Group', 'RangePicker', 'ProCascader'].includes(type) && Array.isArray(disabled(values, {
-      form,
-      index,
-      namePath
-    }))) {
-      disabledRef.current = disabled(values, {
-        form,
-        index,
-        namePath
-      });
+  if (isFunction(disabled)) {
+    if (["Group", "RangePicker", "ProCascader"].includes(type) && Array.isArray(disabled(values, { form, index, namePath }))) {
+      disabledRef.current = disabled(values, { form, index, namePath });
     } else {
-      disabledRef.current = Boolean(disabled(values, {
-        form,
-        index,
-        namePath
-      }));
+      disabledRef.current = Boolean(disabled(values, { form, index, namePath }));
     }
   } else {
     disabledRef.current = disabled;
   }
-  if (_isFunction(required)) {
-    requiredRef.current = required(values, {
-      form,
-      index,
-      namePath
-    });
+  if (isFunction(required)) {
+    requiredRef.current = required(values, { form, index, namePath });
   } else {
     requiredRef.current = required;
   }
-  if (_isFunction(rules)) {
-    rulesRef.current = rules(values, {
-      form,
-      index,
-      namePath
-    });
+  if (isFunction(rules)) {
+    rulesRef.current = rules(values, { form, index, namePath });
   } else {
     rulesRef.current = rules;
   }
-  if (_isFunction(originComponent)) {
-    originComponentRef.current = originComponent(values, {
-      form,
-      index,
-      namePath
-    });
+  if (isFunction(originComponent)) {
+    originComponentRef.current = originComponent(values, { form, index, namePath });
   } else {
     originComponentRef.current = newComponent;
   }
-  if (_isFunction(fieldProps)) {
-    fieldPropsRef.current = fieldProps(values, {
-      form,
-      index,
-      namePath
-    }); // index, namePath FormList才会有
+  if (isFunction(fieldProps)) {
+    fieldPropsRef.current = fieldProps(values, { form, index, namePath });
   } else {
     fieldPropsRef.current = fieldProps;
   }
-  if (dependNames?.length) {
-    dependNamesRef.current = dependNames.map(name => _get(values, name));
+  if (dependNames == null ? void 0 : dependNames.length) {
+    dependNamesRef.current = dependNames.map((name2) => get(values, name2));
   }
   return {
     shouldUpdate: (prevValues, currentValues, ...rest) => {
-      // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
-      if (dependNames?.length) {
-        const curDependNamesValue = dependNames.map(name => _get(currentValues, name));
-        const dependNamesChanged = !_isEqualWith(dependNamesRef.current, curDependNamesValue, customEqualForFunction);
+      if (dependNames == null ? void 0 : dependNames.length) {
+        const curDependNamesValue = dependNames.map((name2) => get(currentValues, name2));
+        const dependNamesChanged = !isEqualWith(
+          dependNamesRef.current,
+          curDependNamesValue,
+          customEqualForFunction
+        );
         dependNamesRef.current = curDependNamesValue;
-        if (!dependNamesChanged) return false;
+        if (!dependNamesChanged)
+          return false;
       }
-
-      // 先获取当前表单值，用于判断是否需要清值
       let _currentValues;
       if (namePath) {
-        // formList场景values取当前行数据
         _currentValues = form.getFieldValue(namePath) || {};
       } else {
         _currentValues = form.getFieldsValue(true);
       }
-
-      // 计算当前的 show 值
-      const _show = _isFunction(show) ? Boolean(show(_currentValues, {
-        form,
-        index,
-        namePath
-      })) : show;
-
-      // 在防抖判断之前先执行清值逻辑检查，确保清值逻辑不受防抖影响
+      const _show = isFunction(show) ? Boolean(show(_currentValues, { form, index, namePath })) : show;
       executeClearValue({
         form,
         name,
@@ -305,28 +237,18 @@ const useShouldUpdate = props => {
         needClear,
         timerRef
       });
-
-      // 如果启用了防抖且存在防抖函数
       if (shouldUpdateDebounce > 0 && debouncedShouldUpdateRef.current) {
-        // 缓存最新的表单值
         pendingValuesRef.current = currentValues;
-        // 触发防抖函数
         debouncedShouldUpdateRef.current();
-        return false; // 暂时不更新，由防抖函数控制
+        return false;
       }
-
-      // 原有的非防抖逻辑
-      const next = resolveReactiveValues(reactiveProps, _currentValues, {
-        form,
-        index,
-        namePath
-      });
+      const next = resolveReactiveValues(reactiveProps, _currentValues, { form, index, namePath });
       if (hasReactiveDiff(reactiveRefs, next)) {
         commitReactiveValues(reactiveRefs, next);
         reRender({});
         return false;
       }
-      if (typeof shouldUpdate === 'function') {
+      if (typeof shouldUpdate === "function") {
         return shouldUpdate(prevValues, currentValues, ...rest);
       }
       return !!shouldUpdate;
@@ -340,4 +262,7 @@ const useShouldUpdate = props => {
     desensitization: desensitizationRef.current
   };
 };
-export default useShouldUpdate;
+var useShouldUpdate_default = useShouldUpdate;
+export {
+  useShouldUpdate_default as default
+};