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

package/es/ProForm/utils/reactiveValues.js

@@ -1,45 +1,31 @@
-import _isEqualWith from "lodash/isEqualWith";
-import _isFunction from "lodash/isFunction";
+import isFunction from "lodash/isFunction";
+import isEqualWith from "lodash/isEqualWith";
 import { customEqualForFunction } from "../../utils";
-
-/** 列级响应式配置（可能为静态值或 ReactiveFunction） */
-
-/** 解析后的列级响应式值 */
-
-/** 持有解析值的 ref 集合 */
-
-/** 按当前表单值解析 show/disabled/required/rules/fieldProps/desensitization（纯函数，无副作用） */
-export const resolveReactiveValues = (reactiveProps, currentValues, ctx) => {
-  const {
-    show,
-    disabled,
-    required,
-    rules,
-    fieldProps,
-    desensitization
-  } = reactiveProps;
+const resolveReactiveValues = (reactiveProps, currentValues, ctx) => {
+  const { show, disabled, required, rules, fieldProps, desensitization } = reactiveProps;
   return {
-    show: _isFunction(show) ? Boolean(show(currentValues, ctx)) : show,
-    disabled: _isFunction(disabled) ? disabled(currentValues, ctx) : disabled,
-    required: _isFunction(required) ? required(currentValues, ctx) : required,
-    rules: _isFunction(rules) ? rules(currentValues, ctx) : rules,
-    fieldProps: _isFunction(fieldProps) ? fieldProps(currentValues, ctx) : fieldProps,
-    desensitization: _isFunction(desensitization) ? desensitization(currentValues, ctx) : desensitization
+    show: isFunction(show) ? Boolean(show(currentValues, ctx)) : show,
+    disabled: isFunction(disabled) ? disabled(currentValues, ctx) : disabled,
+    required: isFunction(required) ? required(currentValues, ctx) : required,
+    rules: isFunction(rules) ? rules(currentValues, ctx) : rules,
+    fieldProps: isFunction(fieldProps) ? fieldProps(currentValues, ctx) : fieldProps,
+    desensitization: isFunction(desensitization) ? desensitization(currentValues, ctx) : desensitization
   };
 };
-
-/** 比较解析值与上一次 ref 值是否有变化（纯函数，无副作用） */
-export const hasReactiveDiff = (refs, next) => {
-  return next.show !== refs.showRef.current || !_isEqualWith(refs.disabledRef.current, next.disabled, customEqualForFunction) || next.required !== refs.requiredRef.current || !_isEqualWith(refs.rulesRef.current, next.rules, customEqualForFunction) || !_isEqualWith(refs.fieldPropsRef.current, next.fieldProps, customEqualForFunction) || !_isEqualWith(refs.desensitizationRef.current, next.desensitization) || Boolean(next.fieldProps?.transformResponse) // 防止fieldProps变更时，transformResponse根据fieldProps新值无法触发更新
-  ;
+const hasReactiveDiff = (refs, next) => {
+  var _a;
+  return next.show !== refs.showRef.current || !isEqualWith(refs.disabledRef.current, next.disabled, customEqualForFunction) || next.required !== refs.requiredRef.current || !isEqualWith(refs.rulesRef.current, next.rules, customEqualForFunction) || !isEqualWith(refs.fieldPropsRef.current, next.fieldProps, customEqualForFunction) || !isEqualWith(refs.desensitizationRef.current, next.desensitization) || Boolean((_a = next.fieldProps) == null ? void 0 : _a.transformResponse);
 };
-
-/** 将解析值写回 ref 集合 */
-export const commitReactiveValues = (refs, next) => {
+const commitReactiveValues = (refs, next) => {
   refs.showRef.current = next.show;
   refs.disabledRef.current = next.disabled;
   refs.requiredRef.current = next.required;
   refs.rulesRef.current = next.rules;
   refs.fieldPropsRef.current = next.fieldProps;
   refs.desensitizationRef.current = next.desensitization;
-};
+};
+export {
+  commitReactiveValues,
+  hasReactiveDiff,
+  resolveReactiveValues
+};

package/es/ProForm/utils/rulesCreator.js

@@ -1,44 +1,36 @@
-import _isNumber from "lodash/isNumber";
-import _isString from "lodash/isString";
-import { validate, regExp } from '@zat-design/utils';
+import { validate, regExp } from "@zat-design/utils";
+import isString from "lodash/isString";
+import isNumber from "lodash/isNumber";
 import { isNullValue } from "./index";
 import locale, { formatMessage } from "../../locale";
 const getNonEmptyValuesByIndex = (required, valueArray) => {
   const result = [];
   required.forEach((item, index) => {
-    if (item && !valueArray?.[index] && !_isNumber(valueArray?.[index])) {
+    if (item && !(valueArray == null ? void 0 : valueArray[index]) && !isNumber(valueArray == null ? void 0 : valueArray[index])) {
       result.push(index + 1);
     }
   });
   return result;
 };
-export const rulesCreator = ({
-  rules = [],
-  label,
-  isSelect,
-  names,
-  required
-}) => {
-  const message = `${isSelect ? `${locale.ProForm.selectPlaceHolder}` : `${locale.ProForm.inputPlaceholder}`}${locale.ProForm.ruleText}${_isString(label) ? label : ''}`;
+const rulesCreator = ({ rules = [], label, isSelect, names, required }) => {
+  const message = `${isSelect ? `${locale.ProForm.selectPlaceHolder}` : `${locale.ProForm.inputPlaceholder}`}${locale.ProForm.ruleText}${isString(label) ? label : ""}`;
   let result = [];
   if (Array.isArray(rules)) {
-    result = rules.map(ruleItem => {
-      const rule = {
-        ...ruleItem
-      };
-      if (rule instanceof Object && 'type' in rule) {
+    result = rules.map((ruleItem) => {
+      const rule = { ...ruleItem };
+      if (rule instanceof Object && "type" in rule) {
         if (Object.keys(regExp).includes(rule.type)) {
-          rule.validator = (rule, value) => {
-            if (!isNullValue(value) && !regExp[rule.type].test(value)) {
-              return Promise.reject(new Error(rule.message || message));
+          rule.validator = (rule2, value) => {
+            if (!isNullValue(value) && !regExp[rule2.type].test(value)) {
+              return Promise.reject(new Error(rule2.message || message));
             }
             return Promise.resolve();
           };
         }
         if (Object.keys(validate).includes(rule.type)) {
-          rule.validator = (rule, value) => {
-            if (!isNullValue(value) && !validate[rule.type](value)) {
-              return Promise.reject(new Error(rule.message || message));
+          rule.validator = (rule2, value) => {
+            if (!isNullValue(value) && !validate[rule2.type](value)) {
+              return Promise.reject(new Error(rule2.message || message));
             }
             return Promise.resolve();
           };
@@ -47,33 +39,43 @@ export const rulesCreator = ({
       return rule;
     });
   }
-  if (names?.length && required?.length) {
+  if ((names == null ? void 0 : names.length) && (required == null ? void 0 : required.length)) {
     const customRequired = {
-      validator: (rules, value) => {
+      validator: (rules2, value) => {
+        var _a, _b, _c, _d;
         let errorValues = getNonEmptyValuesByIndex(required, value);
-        if (value?.length === 2) {
-          errorValues = errorValues.map(item => {
-            return locale?.ProForm?.ruleStartEndText[item - 1];
+        if ((value == null ? void 0 : value.length) === 2) {
+          errorValues = errorValues.map((item) => {
+            var _a2, _b2;
+            return (_b2 = (_a2 = locale) == null ? void 0 : _a2.ProForm) == null ? void 0 : _b2.ruleStartEndText[item - 1];
           });
-          if (errorValues?.length) {
-            return Promise.reject(new Error(`${locale?.ProForm?.inputPlaceholder}${errorValues?.join(',')}`));
+          if (errorValues == null ? void 0 : errorValues.length) {
+            return Promise.reject(
+              new Error(`${(_b = (_a = locale) == null ? void 0 : _a.ProForm) == null ? void 0 : _b.inputPlaceholder}${errorValues == null ? void 0 : errorValues.join(",")}`)
+            );
           }
         }
-        // 校验为true的值是否存在
-        if (Array.isArray(value) && errorValues?.length) {
-          return Promise.reject(new Error(`${formatMessage(locale?.ProForm?.halfRuleText, {
-            total: errorValues?.join(',')
-          })}`));
+        if (Array.isArray(value) && (errorValues == null ? void 0 : errorValues.length)) {
+          return Promise.reject(
+            new Error(
+              `${formatMessage((_d = (_c = locale) == null ? void 0 : _c.ProForm) == null ? void 0 : _d.halfRuleText, { total: errorValues == null ? void 0 : errorValues.join(",") })}`
+            )
+          );
         }
         return Promise.resolve();
       }
     };
     result.push(customRequired);
   }
-  if (!result?.length) {
-    result = [{
-      required: false
-    }];
+  if (!(result == null ? void 0 : result.length)) {
+    result = [
+      {
+        required: false
+      }
+    ];
   }
   return result;
-};
+};
+export {
+  rulesCreator
+};

package/es/ProForm/utils/transformNames.js

@@ -1,17 +1,11 @@
-import _union from "lodash/union";
+import union from "lodash/union";
 import { transformValue } from "./transformValue";
 const transformNames = (formItem, form, names, fieldName, type) => {
-  const {
-    normalize,
-    getValueProps,
-    shouldUpdate
-  } = formItem || {};
-  if (!names?.length) {
+  const { normalize, getValueProps, shouldUpdate } = formItem || {};
+  if (!(names == null ? void 0 : names.length)) {
     return {};
   }
-
-  // 当在formList场景下，给transformValue函数的setFiledProps的name, 需要全namePath
-  const _fieldName = Array.isArray(formItem?.name) ? _union(formItem?.namePath, formItem?.name) : fieldName;
+  const _fieldName = Array.isArray(formItem == null ? void 0 : formItem.name) ? union(formItem == null ? void 0 : formItem.namePath, formItem == null ? void 0 : formItem.name) : fieldName;
   const {
     normalize: _normalize,
     getValueProps: _getValueProps,
@@ -22,11 +16,14 @@ const transformNames = (formItem, form, names, fieldName, type) => {
     normalize: _normalize,
     getValueProps: _getValueProps,
     shouldUpdate: (...rest) => {
-      if (typeof shouldUpdate === 'boolean') {
+      if (typeof shouldUpdate === "boolean") {
         return shouldUpdate || _shouldUpdate();
       }
-      return shouldUpdate?.(...rest) || _shouldUpdate(...rest);
+      return (shouldUpdate == null ? void 0 : shouldUpdate(...rest)) || _shouldUpdate(...rest);
     }
   };
 };
-export default transformNames;
+var transformNames_default = transformNames;
+export {
+  transformNames_default as default
+};

package/es/ProForm/utils/transformValue.js

@@ -1,17 +1,15 @@
-import _set from "lodash/set";
+import set from "lodash/set";
 import { diffField } from "../utils";
 import { isEmpty } from "../../utils";
-export const transformValue = function (names, form, fieldName, normalize, getValueProps) {
+const transformValue = function(names, form, fieldName, normalize, getValueProps) {
   return {
     normalize: (value, ...res) => {
       let _value = value;
-
-      // 支持外部传入转换函数
       if (normalize) {
         _value = normalize(value, ...res);
       }
       names.forEach((name, index) => {
-        _set(form.getFieldsValue(true), name, _value?.[index]);
+        set(form.getFieldsValue(true), name, _value == null ? void 0 : _value[index]);
       });
       return _value;
     },
@@ -20,39 +18,28 @@ export const transformValue = function (names, form, fieldName, normalize, getVa
       if (isOrigin) {
         _value = value;
       } else {
-        // 非比对names场景
         names.forEach((name, index) => {
-          const value = form.getFieldValue(name);
-          _value[index] = value;
+          const value2 = form.getFieldValue(name);
+          _value[index] = value2;
         });
       }
-      // 支持外部传入转换函数
-      const res = getValueProps?.(_value) || {
-        value: _value
-      };
-
-      // 如果数组中值都为空, 则值置为空
-      let curValue = res?.value;
-
-      // @ts-ignore
-      if (curValue?.every(item => isEmpty(item))) {
-        curValue = undefined;
+      const res = (getValueProps == null ? void 0 : getValueProps(_value)) || { value: _value };
+      let curValue = res == null ? void 0 : res.value;
+      if (curValue == null ? void 0 : curValue.every((item) => isEmpty(item))) {
+        curValue = void 0;
       }
-
-      // 如果来源是比对且有names场景, 则不更新表单值
       if (!isOrigin) {
-        _set(form.getFieldsValue(true), fieldName, curValue);
+        set(form.getFieldsValue(true), fieldName, curValue);
       }
-
-      // 如果表单里的值和组合得到的值不全等  更新表单里的值、
-      return {
-        ...res,
-        value: curValue
-      };
+      return { ...res, value: curValue };
     },
     shouldUpdate: (prevValues, curValues) => {
       return diffField(prevValues, curValues, names);
     }
   };
 };
-export default transformValue;
+var transformValue_default = transformValue;
+export {
+  transformValue_default as default,
+  transformValue
+};