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

package/es/ProForm/utils/index.js

@@ -2,14 +2,11 @@ import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIt
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _isNaN from "lodash/isNaN";
-import _omit from "lodash/omit";
-import _set from "lodash/set";
-import _get from "lodash/get";
-import _isFunction from "lodash/isFunction";
-import _isObject from "lodash/isObject";
-import React, { useState } from 'react';
-import moment from 'moment';
+/* eslint-disable no-restricted-syntax */
+
+import dayjs from 'dayjs';
+import _, { isObject, get, set, omit, isNaN } from 'lodash';
+import { useState } from 'react';
 export var getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -31,6 +28,7 @@ export var getLayout = function getLayout(params) {
     }
   };
 };
+
 // 受控状态
 export var useControlled = function useControlled(props) {
   var value = props.value,
@@ -49,6 +47,7 @@ export var isSelect = function isSelect(props) {
     type = props.type;
   return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProCascader', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload', 'TimePicker'].includes(type);
 };
+
 /**
  * Input TextArea 移除前后空格
  * @param type 组件类型
@@ -61,8 +60,8 @@ export var isTrim = function isTrim(type, trim, configData) {
   var _ref = configData || {},
     _ref$state = _ref.state,
     state = _ref$state === void 0 ? {} : _ref$state;
-  var _trim = trim || (state === null || state === void 0 ? void 0 : (_state$type = state[type]) === null || _state$type === void 0 ? void 0 : _state$type.trim);
-  if (['Input', 'ProCombination'].includes(type) && _trim) {
+  var _trim = trim || (state === null || state === void 0 || (_state$type = state[type]) === null || _state$type === void 0 ? void 0 : _state$type.trim);
+  if (['Input'].includes(type) && _trim) {
     result.getValueFromEvent = function (event) {
       var _event$target$value;
       if (Array.isArray(event)) {
@@ -75,6 +74,7 @@ export var isTrim = function isTrim(type, trim, configData) {
   }
   return result;
 };
+
 /**
  * Input TextArea 小写自动转大写
  * @param type 组件类型
@@ -83,21 +83,22 @@ export var isTrim = function isTrim(type, trim, configData) {
  */
 export var isUpperCase = function isUpperCase(type, upperCase) {
   var result = {};
-  if (['Input', 'ProCombination'].includes(type) && upperCase) {
+  if (['Input'].includes(type) && upperCase) {
     result.getValueFromEvent = function (event) {
-      var _event$target, _event$target$value2;
+      var _event$target;
       if (Array.isArray(event)) {
         return event.map(function (value) {
           var newValue = value === null || value === void 0 ? void 0 : value.replace(/[^a-zA-Z]/g, '');
           return (newValue === null || newValue === void 0 ? void 0 : newValue.toUpperCase()) || '';
         });
       }
-      var newValue = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : (_event$target$value2 = _event$target.value) === null || _event$target$value2 === void 0 ? void 0 : _event$target$value2.replace(/[^a-zA-Z]/g, '');
+      var newValue = (_event$target = event.target) === null || _event$target === void 0 || (_event$target = _event$target.value) === null || _event$target === void 0 ? void 0 : _event$target.replace(/[^a-zA-Z]/g, '');
       return newValue.toUpperCase() || '';
     };
   }
   return result;
 };
+
 // 剔除otherProps 组成对象返回
 export var weedOutProps = function weedOutProps(data, keys) {
   var obj = {};
@@ -112,26 +113,29 @@ export var weedOutProps = function weedOutProps(data, keys) {
   });
   return [obj, weedOut];
 };
+
 // 对比字段变化
 export var diffField = function diffField(prevValues, curValues, names) {
   return names.some(function (name) {
-    return _get(prevValues, name) !== _get(curValues, name);
+    return _.get(prevValues, name) !== _.get(curValues, name);
   });
 };
+
 // 表单name展开
 export var splitNameStr = function splitNameStr(name) {
   return name.split('-').map(function (keyStr) {
     return keyStr.split('_');
   });
 };
+
 // 过滤掉字段名中包含 '-' 的字段
-var _filterInternalFields = function filterInternalFields(values, optimize) {
+export var filterInternalFields = function filterInternalFields(values, optimize) {
   if (optimize) {
     return values;
   }
   var nextValues = values;
-  // fix: braft-editor对象不可遍历 Moment不过滤
-  if ((values === null || values === void 0 ? void 0 : values._immutable) || moment.isMoment(values)) {
+  // fix: braft-editor对象不可遍历 Dayjs不过滤
+  if (values !== null && values !== void 0 && values._immutable || dayjs.isDayjs(values)) {
     return nextValues;
   }
   if (values instanceof File) {
@@ -139,46 +143,48 @@ var _filterInternalFields = function filterInternalFields(values, optimize) {
   }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
-      return _filterInternalFields(item);
+      return filterInternalFields(item);
     });
   }
-  if (_isObject(nextValues)) {
+  if (isObject(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
-      if (key.includes('-') || key.startsWith('__')) return;
-      result[key] = _filterInternalFields(nextValues[key]);
+      if (key.includes('-')) return;
+      result[key] = filterInternalFields(nextValues[key]);
     });
     return result;
   }
   return nextValues;
 };
-export { _filterInternalFields as filterInternalFields };
-var _getAllNamePath = function getAllNamePath(object) {
+export var getAllNamePath = function getAllNamePath(object) {
   var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var keys = Object.keys(object);
   var resultKeys = [];
   keys.forEach(function (key) {
     var value = object[key];
+
     // 拆开组合key (组合key只可能存在于最外层)
     if (key.includes('-')) {
       resultKeys.concat(key.split('-').map(function (keyStr) {
         return keyStr.split('_');
       }));
     }
+
     // 深度获取对象key
-    if (_isObject(value)) {
-      resultKeys.concat(_getAllNamePath(value, [].concat(_toConsumableArray(currentPath), [key])));
+    if (isObject(value)) {
+      resultKeys.concat(getAllNamePath(value, [].concat(_toConsumableArray(currentPath), [key])));
     }
     resultKeys.push([].concat(_toConsumableArray(currentPath), [key]));
   });
   return resultKeys;
 };
+
 // 判断一个字段值是否算空
-export { _getAllNamePath as getAllNamePath };
 var nullList = [undefined, 'null', '""', '[]'];
 export var isNullValue = function isNullValue(value) {
   return nullList.includes(JSON.stringify(value));
 };
+
 /**
  * 判断数组中是否包含空值 一个为空则为true
  * @param arr 值
@@ -207,6 +213,7 @@ export var isNotFullArray = function isNotFullArray(arr, length, required) {
     return false;
   });
 };
+
 /**
  * 判断数组中值是否都为空 全部为空则为true
  * @param arr 值
@@ -227,6 +234,7 @@ export var isNullArray = function isNullArray(arr) {
     return false;
   });
 };
+
 /**
  * 判断数组中值是否全部为空  如果值不是数组返回false
  * @param arr 值
@@ -253,6 +261,7 @@ export function toArray(value) {
   }
   return Array.isArray(value) ? value : [value];
 }
+
 /**
  * 初始化值names值合并
  * @param obj AnyObject
@@ -268,26 +277,28 @@ export function initialValuesToNames() {
   columns.forEach(function (item) {
     if (Array.isArray(item === null || item === void 0 ? void 0 : item.names)) {
       var _item$names;
-      var key = (_item$names = item.names) === null || _item$names === void 0 ? void 0 : _item$names.map(function (name) {
+      var _key = (_item$names = item.names) === null || _item$names === void 0 ? void 0 : _item$names.map(function (name) {
         return Array.isArray(name) ? name.join('_') : name;
       }).join('-');
       var formInitialValue = item.names.map(function (name, index) {
         if (item.initialValue) {
-          _set(values, name, item.initialValue[index]);
+          set(values, name, item.initialValue[index]);
         }
-        return _get(values, name);
+        return get(values, name);
       });
+
       // 过滤掉不存在的初始值  防止names字段值为空数组
       var namesInitialValue = formInitialValue.filter(function (item) {
         return item !== undefined;
       });
       if (namesInitialValue.length) {
-        values[key] = formInitialValue;
+        values[_key] = formInitialValue;
       }
     }
   });
   return values;
 }
+
 /**
  * 获取数组含数字的新数组
  * @returns ['group-7x19no', 0, 'abc'] =>['group-7x19no', 0]
@@ -298,16 +309,11 @@ export function getArrayBeforeNumber(arr) {
   });
   return index !== -1 ? arr.slice(0, index + 1) : arr;
 }
-// 自定义深比对 如果两边都是函数类型则认为相等
-export var customEqualForFun = function customEqualForFun(value, other) {
-  if (_isFunction(value) && _isFunction(other) || /*#__PURE__*/React.isValidElement(value) && /*#__PURE__*/React.isValidElement(other)) {
-    return true;
-  }
-};
+
 /**
  * 查询数据中是否包含rowKey
  */
-var _hasRowKey = function hasRowKey(obj) {
+export var hasRowKey = function hasRowKey(obj) {
   if (_typeof(obj) !== 'object' || obj === null) {
     return false;
   }
@@ -317,13 +323,13 @@ var _hasRowKey = function hasRowKey(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return _hasRowKey(obj[key]);
+    return hasRowKey(obj[key]);
   });
 };
+
 /**
  * 查询数据中是否包含rowKey
  */
-export { _hasRowKey as hasRowKey };
 export var view = function view(obj) {
   if (_typeof(obj) !== 'object' || obj === null) {
     return false;
@@ -334,9 +340,10 @@ export var view = function view(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return _hasRowKey(obj[key]);
+    return hasRowKey(obj[key]);
   });
 };
+
 /**
  * 获取小数点后的位数
  * @param num 数字
@@ -364,56 +371,59 @@ export var deleteForPath = function deleteForPath(values, namePath) {
   }
   delete values[namePath];
 };
+
 /**
  * 获取树状结构option
  * @param treeData 树数据源
  * @param value 选中值
  * @returns {}
  */
-var _findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
-  if (_isObject(value)) {
+export var findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
+  if (isObject(value)) {
     return value;
   }
   for (var i = 0; i < (treeData === null || treeData === void 0 ? void 0 : treeData.length); i++) {
     var node = treeData[i];
     if (node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value'] === value) {
-      return _omit(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
+      return omit(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = _findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
+      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
-        return _omit(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
+        return omit(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
     }
   }
 };
+
 /**
  * 对比依赖列表中的 值是否变更
  */
-export { _findOptionByValue as findOptionByValue };
 export var equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
-  if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
+  if (dependencies !== null && dependencies !== void 0 && dependencies.length) {
     return dependencies.some(function (namePath) {
-      var prevValue = _get(prevValues, namePath);
-      var currentValue = _get(currentValues, namePath);
+      var prevValue = get(prevValues, namePath);
+      var currentValue = get(currentValues, namePath);
       return prevValue !== currentValue;
     });
   }
   return false;
 };
+
 /** 解析namePath */
 export var parseNamePath = function parseNamePath(input) {
   var parts = input.split('_');
   if (parts.every(function (item) {
-    return _isNaN(Number(item));
+    return isNaN(Number(item));
   })) {
     return [input];
   }
   var result = parts.map(function (item) {
-    return _isNaN(Number(item)) ? item : Number(item);
+    return isNaN(Number(item)) ? item : Number(item);
   });
   return [result];
 };
+
 /**
  * 获取表单所有字段路径的简化函数
  * @param form 表单实例
@@ -452,4 +462,68 @@ export function findNamesKeyInArray(arr, key) {
     _iterator.f();
   }
   return null;
-}
+}
+
+// 为内层数组定义一个类型别名，以增加代码清晰度
+
+/**
+ * 根据特定规则合并两个数据源 (TypeScript 版本)
+ * @param data1 第一个数据源
+ * @param data2 第二个数据源
+ * @returns 合并后的结果数组
+ */
+export var mergeNames = function mergeNames(data1, data2) {
+  // 步骤 1: 将 data1 的最后一个元素存入 Set 以便快速查找
+  var baseFields = new Set(data1.map(function (item) {
+    return item[item.length - 1];
+  }));
+  var finalResult = [];
+  var coveredFields = new Set();
+
+  // 步骤 2 & 3: 处理 data2，找出有效的合并项
+  data2.forEach(function (item) {
+    // 确保数组有可处理的合并字段，并且该字段是字符串类型
+    var combinedField = item[item.length - 1];
+    if (item.length < 3 || typeof combinedField !== 'string') {
+      return;
+    }
+    var subFields = combinedField.split('-');
+
+    // 检查所有子字段是否都存在于 baseFields 中
+    var allFieldsValid = subFields.every(function (field) {
+      return baseFields.has(field);
+    });
+
+    // 步骤 4: 如果有效，则添加到结果中，并记录已覆盖的字段
+    if (allFieldsValid) {
+      finalResult.push(item);
+      subFields.forEach(function (field) {
+        return coveredFields.add(field);
+      });
+    }
+  });
+
+  // 步骤 5: 处理 data1，添加未被覆盖的字段
+  data1.forEach(function (item) {
+    var field = item[item.length - 1];
+    if (!coveredFields.has(field)) {
+      finalResult.push(item);
+    }
+  });
+  return finalResult;
+};
+
+/**
+ * 是否 formlist或者pro-edit-table 场景
+ * 使用正则表达式判断一个由逗号分隔的字符串中，是否包含一个纯数字的片段。
+ * @param {string} str - 输入的字符串。
+ * @returns {boolean} - 如果匹配成功，返回 true；否则返回 false。
+ */
+export var isListForm = function isListForm(str) {
+  if (!str) {
+    return false;
+  }
+  // 正则表达式：查找被逗号或字符串边界包围的数字
+  var regex = /(?:^|,)\s*\d+\s*(?:,|$)/;
+  return regex.test(str);
+};

package/es/ProForm/utils/processDependencies.js

@@ -1,4 +1,12 @@
 import _typeof from "@babel/runtime/helpers/esm/typeof";
+/**
+ * 定义支持多字段依赖的类型
+ */
+
+/**
+ * dependencies支持的类型
+ */
+
 /**
  * 处理表单依赖项
  *
@@ -19,6 +27,7 @@ export function processDependencies(dependencies) {
    * 1、没有 dependencies，直接返回
    */
   if (!dependencies) return undefined;
+
   /**
    * 2、如果是数组，处理可能包含多种类型的元素
    */
@@ -37,6 +46,7 @@ export function processDependencies(dependencies) {
       return item;
     });
   }
+
   /**
    * 3、如果是单个namesPaths对象，转换为特定的字符串形式
    * 例如：[['a','b','c'], ['a','b','d']] => 'a_b_c-a_b_d'
@@ -47,6 +57,7 @@ export function processDependencies(dependencies) {
       return Array.isArray(path) ? path.join('_') : String(path);
     }).join('-')];
   }
+
   /**
    * 4、如果是普通的 dependencies，直接返回
    */

package/es/ProForm/utils/rulesCreator.js

@@ -1,13 +1,12 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _isNumber from "lodash/isNumber";
-import _isString from "lodash/isString";
 import { validate, regExp } from '@zat-design/utils';
-import { isNullValue } from './index';
-import locale, { formatMessage } from '../../locale';
+import { isString, isNumber } from 'lodash';
+import { isNullValue } from "./index";
+import locale, { formatMessage } from "../../locale";
 var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, valueArray) {
   var result = [];
   required.forEach(function (item, index) {
-    if (item && !(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index]) && !_isNumber(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index])) {
+    if (item && !(valueArray !== null && valueArray !== void 0 && valueArray[index]) && !isNumber(valueArray === null || valueArray === void 0 ? void 0 : valueArray[index])) {
       result.push(index + 1);
     }
   });
@@ -21,7 +20,7 @@ export var rulesCreator = function rulesCreator(_ref) {
     isSelect = _ref.isSelect,
     names = _ref.names,
     required = _ref.required;
-  var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(_isString(label) ? label : '');
+  var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(isString(label) ? label : '');
   var result = [];
   if (Array.isArray(rules)) {
     result = rules.map(function (ruleItem) {
@@ -47,7 +46,7 @@ export var rulesCreator = function rulesCreator(_ref) {
       return rule;
     });
   }
-  if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
+  if (names !== null && names !== void 0 && names.length && required !== null && required !== void 0 && required.length) {
     var customRequired = {
       validator: function validator(rules, value) {
         var _errorValues3;
@@ -56,17 +55,17 @@ export var rulesCreator = function rulesCreator(_ref) {
           var _errorValues;
           errorValues = errorValues.map(function (item) {
             var _locale$ProForm;
-            return locale === null || locale === void 0 ? void 0 : (_locale$ProForm = locale.ProForm) === null || _locale$ProForm === void 0 ? void 0 : _locale$ProForm.ruleStartEndText[item - 1];
+            return locale === null || locale === void 0 || (_locale$ProForm = locale.ProForm) === null || _locale$ProForm === void 0 ? void 0 : _locale$ProForm.ruleStartEndText[item - 1];
           });
-          if ((_errorValues = errorValues) === null || _errorValues === void 0 ? void 0 : _errorValues.length) {
+          if ((_errorValues = errorValues) !== null && _errorValues !== void 0 && _errorValues.length) {
             var _locale$ProForm2, _errorValues2;
-            return Promise.reject(new Error("".concat(locale === null || locale === void 0 ? void 0 : (_locale$ProForm2 = locale.ProForm) === null || _locale$ProForm2 === void 0 ? void 0 : _locale$ProForm2.inputPlaceholder).concat((_errorValues2 = errorValues) === null || _errorValues2 === void 0 ? void 0 : _errorValues2.join(','))));
+            return Promise.reject(new Error("".concat(locale === null || locale === void 0 || (_locale$ProForm2 = locale.ProForm) === null || _locale$ProForm2 === void 0 ? void 0 : _locale$ProForm2.inputPlaceholder).concat((_errorValues2 = errorValues) === null || _errorValues2 === void 0 ? void 0 : _errorValues2.join(','))));
           }
         }
         // 校验为true的值是否存在
-        if (Array.isArray(value) && ((_errorValues3 = errorValues) === null || _errorValues3 === void 0 ? void 0 : _errorValues3.length)) {
+        if (Array.isArray(value) && (_errorValues3 = errorValues) !== null && _errorValues3 !== void 0 && _errorValues3.length) {
           var _locale$ProForm3, _errorValues4;
-          return Promise.reject(new Error("".concat(formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProForm3 = locale.ProForm) === null || _locale$ProForm3 === void 0 ? void 0 : _locale$ProForm3.halfRuleText, {
+          return Promise.reject(new Error("".concat(formatMessage(locale === null || locale === void 0 || (_locale$ProForm3 = locale.ProForm) === null || _locale$ProForm3 === void 0 ? void 0 : _locale$ProForm3.halfRuleText, {
             total: (_errorValues4 = errorValues) === null || _errorValues4 === void 0 ? void 0 : _errorValues4.join(',')
           }))));
         }
@@ -75,7 +74,7 @@ export var rulesCreator = function rulesCreator(_ref) {
     };
     result.push(customRequired);
   }
-  if (!((_result = result) === null || _result === void 0 ? void 0 : _result.length)) {
+  if (!((_result = result) !== null && _result !== void 0 && _result.length)) {
     result = [{
       required: false
     }];

package/es/ProForm/utils/transformNames.js

@@ -1,15 +1,16 @@
-import _union from "lodash/union";
-import { transformValue } from './transformValue';
+import { union } from 'lodash';
+import { transformValue } from "./transformValue";
 var transformNames = function transformNames(formItem, form, names, fieldName, type) {
   var _ref = formItem || {},
     normalize = _ref.normalize,
     getValueProps = _ref.getValueProps,
     _shouldUpdate2 = _ref.shouldUpdate;
-  if (!(names === null || names === void 0 ? void 0 : names.length)) {
+  if (!(names !== null && names !== void 0 && names.length)) {
     return {};
   }
+
   // 当在formList场景下，给transformValue函数的setFiledProps的name, 需要全namePath
-  var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? _union(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
+  var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? union(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
   var _transformValue = transformValue(names, form, _fieldName, normalize, getValueProps),
     _normalize = _transformValue.normalize,
     _getValueProps = _transformValue.getValueProps,

package/es/ProForm/utils/transformValue.js

@@ -1,11 +1,12 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _set from "lodash/set";
-import { diffField } from '../utils';
-import { isEmpty } from '../../utils';
+import { set } from 'lodash';
+import { diffField } from "../utils";
+import { isEmpty } from "../../utils";
 export var transformValue = function transformValue(names, form, fieldName, _normalize, _getValueProps) {
   return {
     normalize: function normalize(value) {
       var _value = value;
+
       // 支持外部传入转换函数
       if (_normalize) {
         for (var _len = arguments.length, res = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -15,7 +16,7 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       }
       names.forEach(function (name, index) {
         var _value2;
-        _set(form.getFieldsValue(true), name, (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2[index]);
+        set(form.getFieldsValue(true), name, (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2[index]);
       });
       return _value;
     },
@@ -35,18 +36,22 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       var res = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
         value: _value
       };
+
       // 如果数组中值都为空, 则值置为空
       var curValue = res === null || res === void 0 ? void 0 : res.value;
+
       // @ts-ignore
-      if ((_curValue = curValue) === null || _curValue === void 0 ? void 0 : _curValue.every(function (item) {
+      if ((_curValue = curValue) !== null && _curValue !== void 0 && _curValue.every(function (item) {
         return isEmpty(item);
       })) {
         curValue = undefined;
       }
+
       // 如果来源是比对且有names场景, 则不更新表单值
       if (!isOrigin) {
-        _set(form.getFieldsValue(true), fieldName, curValue);
+        set(form.getFieldsValue(true), fieldName, curValue);
       }
+
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
       return _objectSpread(_objectSpread({}, res), {}, {
         value: curValue

package/es/ProForm/utils/useDeepCompareMemo.js

@@ -1,13 +1,15 @@
-import _isEqualWith from "lodash/isEqualWith";
 import { useRef } from 'react';
-import { customEqualForFun } from '.';
+import { isEqualWith } from 'lodash';
+import { customEqualForFunction } from "../../utils";
+
 /** 深度比较依赖变化memo */
 export var useDeepCompareMemo = function useDeepCompareMemo(fun, changedCb, depList) {
-  var lastDependency = useRef(); // 上一次的依赖
-  var lastRes = useRef(); // 上一次的结果
-  if (!_isEqualWith(depList, lastDependency.current, customEqualForFun)) {
+  var lastDependency = useRef({}); // 上一次的依赖
+  var lastRes = useRef({}); // 上一次的结果
+
+  if (!isEqualWith(depList, lastDependency === null || lastDependency === void 0 ? void 0 : lastDependency.current, customEqualForFunction)) {
     var res = fun();
-    changedCb === null || changedCb === void 0 ? void 0 : changedCb(lastRes.current, res);
+    changedCb === null || changedCb === void 0 || changedCb(lastRes.current, res);
     lastRes.current = res;
   }
   lastDependency.current = depList;