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

package/lib/ProForm/style/index.less

@@ -1,6 +1,7 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 @import '../components/base/SwitchCheckbox/style/index.less';
+@import '../components/base/TimePicker/style/index.less';
 @import '../components/base/TextArea/index.less';
 @import '../components/combination/FormList/style/index.less';
 @import '../components/combination/ProTimeLimit/style/index.less';
@@ -9,8 +10,6 @@
 @import '../components/combination/ProModalSelect/style/index.less';
 @import '../components/combination/Group/style/index.less';
 @import '../components/combination/Container/style/index.less';
-@import '../components/old/EnumSelect/style/index.less';
-@import '../components/old/EnumSelect/style/index.less';
 
 .pro-form {
   &.@{ant-prefix}-form-vertical {
@@ -106,7 +105,6 @@
   }
 
   .@{ant-prefix}-form-item {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1)) !important;
 
     &.pro-form-item-width-auto {
       .@{ant-prefix}-form-item-control-input {
@@ -137,13 +135,6 @@
       display: none;
     }
 
-    .@{ant-prefix}-form-item-explain {
-      height: auto;
-
-      .@{ant-prefix}-form-item-explain-error {
-        font-size: var(--zaui-font-size, 14px);
-      }
-    }
 
     .@{ant-prefix}-input-number {
       width: 100%;
@@ -186,8 +177,8 @@
 
   .@{ant-prefix}-form-item-has-error {
     .group-separator {
-      color: var(--ant-error-color);
-      border-color: var(--ant-error-color);
+      color: #ff4d4f;
+      border-color: #ff4d4f;
     }
 
     .site-input-split {
@@ -318,8 +309,7 @@
     width: 18px;
   }
   .pro-form-list-tool-btn {
-    margin-left: 8px;
-    padding: 0;
+    padding: 0 4px;
     cursor: pointer;
     .anticon {
       color: var(--zaui-text-weak, #a0a0a0);

package/lib/ProForm/utils/index.d.ts

@@ -61,7 +61,6 @@ export declare function initialValuesToNames(values: AnyObject, columns: AnyObje
  * @returns ['group-7x19no', 0, 'abc'] =>['group-7x19no', 0]
  */
 export declare function getArrayBeforeNumber(arr: (string | number)[]): (string | number)[];
-export declare const customEqualForFun: (value: any, other: any) => boolean;
 /**
  * 查询数据中是否包含rowKey
  */
@@ -102,4 +101,19 @@ export declare const parseNamePath: (input: string) => any;
  */
 export declare const getFormFieldPaths: (form: FormInstance) => any[];
 export declare function findNamesKeyInArray(arr: string[], key: string): string | null;
+type DataItem = (string | number)[];
+/**
+ * 根据特定规则合并两个数据源 (TypeScript 版本)
+ * @param data1 第一个数据源
+ * @param data2 第二个数据源
+ * @returns 合并后的结果数组
+ */
+export declare const mergeNames: (data1: DataItem[], data2: DataItem[]) => DataItem[];
+/**
+ * 是否 formlist或者pro-edit-table 场景
+ * 使用正则表达式判断一个由逗号分隔的字符串中，是否包含一个纯数字的片段。
+ * @param {string} str - 输入的字符串。
+ * @returns {boolean} - 如果匹配成功，返回 true；否则返回 false。
+ */
+export declare const isListForm: (str: string) => boolean;
 export {};

package/lib/ProForm/utils/index.js

@@ -1,17 +1,16 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.filterInternalFields = exports.equalDependencies = exports.diffField = exports.deleteForPath = exports.customEqualForFun = void 0;
+exports.filterInternalFields = exports.equalDependencies = exports.diffField = exports.deleteForPath = void 0;
 exports.findNamesKeyInArray = findNamesKeyInArray;
 exports.getAllNamePath = exports.findOptionByValue = void 0;
 exports.getArrayBeforeNumber = getArrayBeforeNumber;
 exports.hasRowKey = exports.getLayout = exports.getFormFieldPaths = exports.getDecimalDigits = void 0;
 exports.initialValuesToNames = initialValuesToNames;
-exports.splitNameStr = exports.parseNamePath = exports.isUpperCase = exports.isTrim = exports.isSelect = exports.isNullValue = exports.isNullArray = exports.isNotFullArray = exports.isEmptyArray = void 0;
+exports.splitNameStr = exports.parseNamePath = exports.mergeNames = exports.isUpperCase = exports.isTrim = exports.isSelect = exports.isNullValue = exports.isNullArray = exports.isNotFullArray = exports.isListForm = exports.isEmptyArray = void 0;
 exports.toArray = toArray;
 exports.weedOutProps = exports.view = exports.useControlled = void 0;
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
@@ -22,10 +21,9 @@ var _isNaN2 = _interopRequireDefault(require("lodash/isNaN"));
 var _omit2 = _interopRequireDefault(require("lodash/omit"));
 var _set2 = _interopRequireDefault(require("lodash/set"));
 var _get2 = _interopRequireDefault(require("lodash/get"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
-var _react = _interopRequireWildcard(require("react"));
-var _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _react = require("react");
 var getLayout = exports.getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -78,7 +76,7 @@ var isTrim = exports.isTrim = function isTrim(type, trim, 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) {
+  if (['Input'].includes(type) && _trim) {
     result.getValueFromEvent = function (event) {
       var _event$target$value;
       if (Array.isArray(event)) {
@@ -99,7 +97,7 @@ var isTrim = exports.isTrim = function isTrim(type, trim, configData) {
  */
 var isUpperCase = exports.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;
       if (Array.isArray(event)) {
@@ -146,8 +144,8 @@ var _filterInternalFields = exports.filterInternalFields = function filterIntern
     return values;
   }
   var nextValues = values;
-  // fix: braft-editor对象不可遍历 Moment不过滤
-  if ((values === null || values === void 0 ? void 0 : values._immutable) || _moment.default.isMoment(values)) {
+  // fix: braft-editor对象不可遍历 Dayjs不过滤
+  if ((values === null || values === void 0 ? void 0 : values._immutable) || _dayjs.default.isDayjs(values)) {
     return nextValues;
   }
   if (values instanceof File) {
@@ -299,10 +297,6 @@ function initialValuesToNames() {
         values[key] = formInitialValue;
       }
     }
-    // 给FormList默认增加一行
-    if (item.type === 'FormList' && !item.initialValue && !(0, _get2.default)(values, item.name)) {
-      item.initialValue = [{}];
-    }
   });
   return values;
 }
@@ -316,12 +310,6 @@ function getArrayBeforeNumber(arr) {
   });
   return index !== -1 ? arr.slice(0, index + 1) : arr;
 }
-// 自定义深比对 如果两边都是函数类型则认为相等
-var customEqualForFun = exports.customEqualForFun = function customEqualForFun(value, other) {
-  if ((0, _isFunction2.default)(value) && (0, _isFunction2.default)(other) || /*#__PURE__*/_react.default.isValidElement(value) && /*#__PURE__*/_react.default.isValidElement(other)) {
-    return true;
-  }
-};
 /**
  * 查询数据中是否包含rowKey
  */
@@ -468,4 +456,60 @@ function findNamesKeyInArray(arr, key) {
     _iterator.f();
   }
   return null;
-}
+}
+/**
+ * 根据特定规则合并两个数据源 (TypeScript 版本)
+ * @param data1 第一个数据源
+ * @param data2 第二个数据源
+ * @returns 合并后的结果数组
+ */
+var mergeNames = exports.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。
+ */
+var isListForm = exports.isListForm = function isListForm(str) {
+  if (!str) {
+    return false;
+  }
+  // 正则表达式：查找被逗号或字符串边界包围的数字
+  var regex = /(?:^|,)\s*\d+\s*(?:,|$)/;
+  return regex.test(str);
+};

package/lib/ProForm/utils/useDeepCompareMemo.js

@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.useDeepCompareMemo = void 0;
 var _isEqualWith2 = _interopRequireDefault(require("lodash/isEqualWith"));
 var _react = require("react");
-var _ = require(".");
+var _utils = require("../../utils");
 /** 深度比较依赖变化memo */
 var useDeepCompareMemo = exports.useDeepCompareMemo = function useDeepCompareMemo(fun, changedCb, depList) {
-  var lastDependency = (0, _react.useRef)(); // 上一次的依赖
-  var lastRes = (0, _react.useRef)(); // 上一次的结果
-  if (!(0, _isEqualWith2.default)(depList, lastDependency.current, _.customEqualForFun)) {
+  var lastDependency = (0, _react.useRef)({}); // 上一次的依赖
+  var lastRes = (0, _react.useRef)({}); // 上一次的结果
+  if (!(0, _isEqualWith2.default)(depList, lastDependency === null || lastDependency === void 0 ? void 0 : lastDependency.current, _utils.customEqualForFunction)) {
     var res = fun();
     changedCb === null || changedCb === void 0 ? void 0 : changedCb(lastRes.current, res);
     lastRes.current = res;

package/lib/ProForm/utils/useForm.js

@@ -5,18 +5,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useForm = void 0;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _antd = require("antd");
 var _react = require("react");
 var _index = require("./index");
 var _tools = require("../../ProEditTable/utils/tools");
 var _FormsProvider = require("../../FormsProvider");
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
 var useForm = exports.useForm = function useForm(originForm, options) {
   // 如果没有form实例可以直接把options放在第一个参数位置
   // @ts-ignore
@@ -32,7 +32,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
     source = _ref.source;
   // formKey全局共享逻辑
   var forms = (0, _react.useContext)(_FormsProvider.FormsContext);
-  var _Form$useForm = _form.default.useForm(forms[formKey] || _originForm),
+  var _Form$useForm = _antd.Form.useForm(forms[formKey] || _originForm),
     _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
     form = _Form$useForm2[0];
   if (formKey && forms[formKey] !== form) {
@@ -47,7 +47,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
     setFieldsValue = form.setFieldsValue;
   if (isModified) return [form];
   // @ts-ignore
-  var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
+  var nextGetFieldsValue = function nextGetFieldsValue(nameList, filterFunc) {
     // 全部查询
     if (nameList !== true) {
       var values = getFieldsValue(nameList || true, filterFunc);
@@ -55,8 +55,8 @@ var useForm = exports.useForm = function useForm(originForm, options) {
     }
     return getFieldsValue(nameList, filterFunc);
   };
-  var _validateFields = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
+  var nextValidateFields = /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee(nameList) {
       var _rest$,
         _form$__INTERNAL_CONF,
         _len,
@@ -75,104 +75,115 @@ var useForm = exports.useForm = function useForm(originForm, options) {
         _form$getInternalHook,
         getFields,
         fieldsList,
+        fieldsNames,
         _document,
         tablePagination,
         _tablePagination$clic,
         _error$errorFields2,
         _error$errorFields$2,
-        _args = arguments;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+        _args = arguments,
+        _t,
+        _t2,
+        _t3;
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.p = _context.n) {
           case 0:
-            _context.prev = 0;
+            _context.p = 0;
             for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               rest[_key - 1] = _args[_key];
             }
             isRecursive = rest === null || rest === void 0 ? void 0 : (_rest$ = rest[0]) === null || _rest$ === void 0 ? void 0 : _rest$.recursive;
             stopOnFirstError = form === null || form === void 0 ? void 0 : (_form$__INTERNAL_CONF = form.__INTERNAL_CONFIG__) === null || _form$__INTERNAL_CONF === void 0 ? void 0 : _form$__INTERNAL_CONF.stopOnFirstError; // 如果启用了 stopOnFirstError 且没有指定字段列表
             if (!(stopOnFirstError && !nameList)) {
-              _context.next = 33;
+              _context.n = 11;
               break;
             }
             // 获取所有表单字段
             allFields = (0, _index.getFormFieldPaths)(form); // 单独验证每个字段
             // eslint-disable-next-line no-restricted-syntax
             _iterator = (0, _createForOfIteratorHelper2.default)(allFields);
-            _context.prev = 7;
+            _context.p = 1;
             _iterator.s();
-          case 9:
+          case 2:
             if ((_step = _iterator.n()).done) {
-              _context.next = 24;
+              _context.n = 7;
               break;
             }
             field = _step.value;
-            _context.prev = 11;
+            _context.p = 3;
             // 创建不包含 stopOnFirstError 的选项
             // @ts-ignore
             _options2 = (rest === null || rest === void 0 ? void 0 : rest[0]) ? (0, _objectSpread2.default)({}, rest[0]) : {};
             delete _options2.stopOnFirstError;
             // 验证单个字段
             // eslint-disable-next-line no-await-in-loop
-            _context.next = 16;
+            _context.n = 4;
             return validateFields([field], _options2);
-          case 16:
-            _context.next = 22;
+          case 4:
+            _context.n = 6;
             break;
-          case 18:
-            _context.prev = 18;
-            _context.t0 = _context["catch"](11);
+          case 5:
+            _context.p = 5;
+            _t = _context.v;
             // 遇到错误，滚动到错误位置
-            if (scrollToError && (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
-              form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
+            if (scrollToError && (_t === null || _t === void 0 ? void 0 : (_error$errorFields = _t.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
+              form.scrollToField((_error$errorFields$ = _t.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
                 behavior: 'smooth'
               });
             }
             // 中止验证，抛出错误
-            throw _context.t0;
-          case 22:
-            _context.next = 9;
+            throw _t;
+          case 6:
+            _context.n = 2;
             break;
-          case 24:
-            _context.next = 29;
+          case 7:
+            _context.n = 9;
             break;
-          case 26:
-            _context.prev = 26;
-            _context.t1 = _context["catch"](7);
-            _iterator.e(_context.t1);
-          case 29:
-            _context.prev = 29;
+          case 8:
+            _context.p = 8;
+            _t2 = _context.v;
+            _iterator.e(_t2);
+          case 9:
+            _context.p = 9;
             _iterator.f();
-            return _context.finish(29);
-          case 32:
-            return _context.abrupt("return", form.getFieldsValue());
-          case 33:
+            return _context.f(9);
+          case 10:
+            return _context.a(2, form.getFieldsValue());
+          case 11:
             validateNames = []; // 前缀校验模式
             if (!isRecursive) {
-              _context.next = 42;
+              _context.n = 13;
               break;
             }
             // @ts-ignore
             _form$getInternalHook = form.getInternalHooks('RC_FORM_INTERNAL_HOOKS'), getFields = _form$getInternalHook.getFields;
-            fieldsList = getFields();
-            fieldsList.forEach(function (item) {
-              var _item$name, _item$name2, _item$name2$;
-              if (nameList[0] === ((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name[0]) || ((_item$name2 = item.name) === null || _item$name2 === void 0 ? void 0 : (_item$name2$ = _item$name2[0]) === null || _item$name2$ === void 0 ? void 0 : _item$name2$.startsWith("".concat(nameList[0], "_")))) {
-                validateNames.push(item.name);
-              }
-            });
+            fieldsList = getFields(); // formList& proEditTable 特殊处理
+            if (Array.isArray(nameList) && (0, _index.isListForm)(String(nameList))) {
+              fieldsNames = fieldsList.map(function (item) {
+                return item.name;
+              });
+              validateNames = (0, _index.mergeNames)(nameList, fieldsNames);
+            } else {
+              // 其他情况
+              fieldsList.forEach(function (item) {
+                var _item$name, _item$name2, _item$name2$;
+                if (nameList[0] === ((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name[0]) || ((_item$name2 = item.name) === null || _item$name2 === void 0 ? void 0 : (_item$name2$ = _item$name2[0]) === null || _item$name2$ === void 0 ? void 0 : _item$name2$.startsWith("".concat(nameList[0], "_")))) {
+                  validateNames.push(item.name);
+                }
+              });
+            }
             if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
               validateNames = (0, _toConsumableArray2.default)(nameList);
             }
             // @ts-ignore
-            // delete rest[0].recursive;
-            _context.next = 41;
+            _context.n = 12;
             return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
               return (0, _index.filterInternalFields)(values, optimize);
             });
-          case 41:
-            return _context.abrupt("return", _context.sent);
-          case 42:
+          case 12:
+            return _context.a(2, _context.v);
+          case 13:
             // 解决，单个pro-edit-table的表单校验
             if ((nameList === null || nameList === void 0 ? void 0 : nameList.length) && !nameList.join('-').includes(',')) {
               tablePagination = document && ((_document = document) === null || _document === void 0 ? void 0 : _document.querySelector("#pro-edit-table-pagination-".concat(nameList.join('-'))));
@@ -180,34 +191,33 @@ var useForm = exports.useForm = function useForm(originForm, options) {
                 tablePagination === null || tablePagination === void 0 ? void 0 : (_tablePagination$clic = tablePagination.click) === null || _tablePagination$clic === void 0 ? void 0 : _tablePagination$clic.call(tablePagination);
               }
             }
-            _context.next = 45;
+            _context.n = 14;
             return validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
-              return nameList ? values : _getFieldsValue();
+              return nameList ? values : nextGetFieldsValue();
             });
-          case 45:
-            return _context.abrupt("return", _context.sent);
-          case 48:
-            _context.prev = 48;
-            _context.t2 = _context["catch"](0);
-            if (scrollToError && (_context.t2 === null || _context.t2 === void 0 ? void 0 : (_error$errorFields2 = _context.t2.errorFields) === null || _error$errorFields2 === void 0 ? void 0 : _error$errorFields2.length) && source === 'ProForm') {
-              form.scrollToField((_error$errorFields$2 = _context.t2.errorFields[0]) === null || _error$errorFields$2 === void 0 ? void 0 : _error$errorFields$2.name, {
+          case 14:
+            return _context.a(2, _context.v);
+          case 15:
+            _context.p = 15;
+            _t3 = _context.v;
+            if (scrollToError && (_t3 === null || _t3 === void 0 ? void 0 : (_error$errorFields2 = _t3.errorFields) === null || _error$errorFields2 === void 0 ? void 0 : _error$errorFields2.length) && source === 'ProForm') {
+              form.scrollToField((_error$errorFields$2 = _t3.errorFields[0]) === null || _error$errorFields$2 === void 0 ? void 0 : _error$errorFields$2.name, {
                 block: 'center',
                 behavior: 'smooth'
               });
             }
             (0, _tools.handleScrollToError)();
-            throw _context.t2;
-          case 53:
-          case "end":
-            return _context.stop();
+            throw _t3;
+          case 16:
+            return _context.a(2);
         }
-      }, _callee, null, [[0, 48], [7, 26, 29, 32], [11, 18]]);
+      }, _callee, null, [[3, 5], [1, 8, 9, 10], [0, 15]]);
     }));
-    return function _validateFields(_x) {
+    return function nextValidateFields(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
-  var _setFieldValue = function _setFieldValue(name, value, info) {
+  var nextSetFieldValue = function nextSetFieldValue(name, value, info) {
     if (info) {
       setFields([(0, _objectSpread2.default)({
         name: name,
@@ -222,7 +232,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
       }]);
     }
   };
-  var _setFieldsValue = function _setFieldsValue(values) {
+  var nextSetFieldsValue = function nextSetFieldsValue(values) {
     var errors = getFieldsError();
     var errorNames = errors.reduce(function (acc, entry) {
       if (entry.errors.length > 0) {
@@ -246,10 +256,10 @@ var useForm = exports.useForm = function useForm(originForm, options) {
       setFieldsValue(values);
     }
   };
-  form.getFieldsValue = _getFieldsValue;
-  form.setFieldValue = _setFieldValue;
-  form.setFieldsValue = _setFieldsValue;
-  form.validateFields = _validateFields;
+  form.getFieldsValue = nextGetFieldsValue;
+  form.setFieldValue = nextSetFieldValue;
+  form.setFieldsValue = nextSetFieldsValue;
+  form.validateFields = nextValidateFields;
   form.isModified = true;
   form.__INTERNAL_CONFIG__ = {};
   return [form];

package/lib/ProForm/utils/useShouldUpdate.js

@@ -10,7 +10,7 @@ var _get2 = _interopRequireDefault(require("lodash/get"));
 var _isEqualWith2 = _interopRequireDefault(require("lodash/isEqualWith"));
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _react = require("react");
-var _index = require("./index");
+var _utils = require("../../utils");
 /** FormList中被删除的行也会再触发一次响应式函数 排除这种场景 */
 var isDeleteLine = function isDeleteLine(form, namePath) {
   if (namePath) {
@@ -39,16 +39,16 @@ var useShouldUpdate = function useShouldUpdate(props) {
     namePath = formItemProps.namePath,
     names = formItemProps.names,
     dependNames = formItemProps.dependNames;
-  var timerRef = (0, _react.useRef)();
-  var needClear = (0, _react.useRef)(); // 是否需要执行清值操作
-  var showRef = (0, _react.useRef)();
-  var disabledRef = (0, _react.useRef)();
-  var requiredRef = (0, _react.useRef)();
-  var rulesRef = (0, _react.useRef)();
-  var fieldPropsRef = (0, _react.useRef)();
-  var originComponentRef = (0, _react.useRef)();
-  var dependNamesRef = (0, _react.useRef)();
-  var desensitizationRef = (0, _react.useRef)();
+  var timerRef = (0, _react.useRef)(null); // 清值防抖
+  var needClear = (0, _react.useRef)(false); // 是否需要执行清值操作
+  var showRef = (0, _react.useRef)(false);
+  var disabledRef = (0, _react.useRef)(false);
+  var requiredRef = (0, _react.useRef)(false);
+  var rulesRef = (0, _react.useRef)([]);
+  var fieldPropsRef = (0, _react.useRef)(null);
+  var originComponentRef = (0, _react.useRef)(null);
+  var dependNamesRef = (0, _react.useRef)([]);
+  var desensitizationRef = (0, _react.useRef)([0, 0]);
   var newComponent = originComponent || component; // 解决component默认赋值污染问题，需要使用originComponent
   var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -161,7 +161,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
         var curDependNamesValue = dependNames.map(function (name) {
           return (0, _get2.default)(currentValues, name);
         });
-        var dependNamesChanged = !(0, _isEqualWith2.default)(dependNamesRef.current, curDependNamesValue, _index.customEqualForFun);
+        var dependNamesChanged = !(0, _isEqualWith2.default)(dependNamesRef.current, curDependNamesValue, _utils.customEqualForFunction);
         dependNamesRef.current = curDependNamesValue;
         if (!dependNamesChanged) return false;
       }
@@ -225,8 +225,8 @@ 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 equalRes = (0, _isEqualWith2.default)(rulesRef.current, _rules, _utils.customEqualForFunction);
+      var proEqualRes = (0, _isEqualWith2.default)(fieldPropsRef.current, _fieldProps, _utils.customEqualForFunction);
       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新值无法触发更新
       ) {

package/lib/ProForm/utils/valueType.js

@@ -287,9 +287,9 @@ var _default = exports.default = {
     });
   },
   /** 百分比 */
-  percentage: function percentage(_ref10) {
-    var type = _ref10.type,
-      valueType = _ref10.valueType;
+  percentage: function percentage(_ref0) {
+    var type = _ref0.type,
+      valueType = _ref0.valueType;
     return transformRatio({
       type: type,
       valueType: valueType,
@@ -297,9 +297,9 @@ var _default = exports.default = {
     });
   },
   /** 千分比 */
-  permillage: function permillage(_ref11) {
-    var type = _ref11.type,
-      valueType = _ref11.valueType;
+  permillage: function permillage(_ref1) {
+    var type = _ref1.type,
+      valueType = _ref1.valueType;
     return transformRatio({
       type: type,
       valueType: valueType,
@@ -307,8 +307,8 @@ var _default = exports.default = {
     });
   },
   /**  开关 YN转换 */
-  switch: function _switch(_ref12) {
-    var switchValue = _ref12.switchValue;
+  switch: function _switch(_ref10) {
+    var switchValue = _ref10.switchValue;
     return switchTransform(switchValue);
   }
 };