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

package/lib/ProForm/index.js

@@ -6,18 +6,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProFormProvider = void 0;
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
-require("antd/es/row/style");
-var _row = _interopRequireDefault(require("antd/es/row"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/col/style");
-var _col = _interopRequireDefault(require("antd/es/col"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _icons = require("@ant-design/icons");
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireWildcard(require("react"));
 var _lodash = require("lodash");
@@ -33,7 +26,7 @@ var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
 var _FormsProvider = _interopRequireWildcard(require("../FormsProvider"));
 var _ProStep = require("../ProStep");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "stopOnFirstError"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize", "stopOnFirstError", "shouldUpdateDebounce"];
 var ProForm = (props, ref) => {
   var _localStorage, _ref3;
   var _props$mode = props.mode,
@@ -79,6 +72,8 @@ var ProForm = (props, ref) => {
     optimize = _props$optimize === void 0 ? false : _props$optimize,
     _props$stopOnFirstErr = props.stopOnFirstError,
     stopOnFirstError = _props$stopOnFirstErr === void 0 ? false : _props$stopOnFirstErr,
+    _props$shouldUpdateDe = props.shouldUpdateDebounce,
+    shouldUpdateDebounce = _props$shouldUpdateDe === void 0 ? 200 : _props$shouldUpdateDe,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var config = (0, _ProConfigProvider.useProConfig)('ProForm');
   // source: 用于区分是哪个组件调用，用于错误提示
@@ -138,12 +133,12 @@ var ProForm = (props, ref) => {
     return !!expand && columns.length > Number(expand) && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "expand-button",
       onClick: expandHandle,
-      children: !openState ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      children: !openState ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "center",
         children: [_locale.default.ProForm.unfold, /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
           className: "rotate-to-bottom"
         })]
-      }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "center",
         children: [_locale.default.ProForm.packUp, /*#__PURE__*/(0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
           className: "rotate-to-top"
@@ -216,9 +211,9 @@ var ProForm = (props, ref) => {
     // 展开折叠按钮
     var expandEle = expandRender();
     var hasElement = footerEle || expandEle;
-    return hasElement ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_col.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+    return hasElement ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Col, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
       className: footerCls,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "center",
         children: [footerEle, expandEle]
       })
@@ -235,7 +230,7 @@ var ProForm = (props, ref) => {
       otherProps.layout = otherProps.layout || 'vertical';
     }
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_form.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Form, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     onKeyPress: event => {
       if (!submitOnEnter) return;
       if (event.key === 'Enter') {
@@ -249,11 +244,7 @@ var ProForm = (props, ref) => {
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,
-    scrollToFirstError: {
-      block: 'center',
-      behavior: 'smooth'
-    },
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_row.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Row, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       gutter: 24
     }, rowProps), {}, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_RenderFields.default, {
@@ -272,7 +263,8 @@ var ProForm = (props, ref) => {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        globalControl: globalControl
+        globalControl: globalControl,
+        shouldUpdateDebounce: shouldUpdateDebounce
       }), footerRender()]
     })), children]
   }));
@@ -314,7 +306,7 @@ var ProFormProvider = props => {
     // @ts-ignore
     onFormChange(formName, info);
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Provider, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Provider, {
     onFormChange: onFormChange ? handleFormChange : undefined,
     onFormFinish: onFormFinish,
     children: children
@@ -326,26 +318,5 @@ ProFormForward.useFieldProps = _useFieldProps.useFieldProps; // 获取每个字
 // 表单实例共享
 ProFormForward.FormsProvider = _FormsProvider.default; // 表单实例共享Provider
 ProFormForward.useForms = _FormsProvider.useForms; // 获取上下文中的共享的表单实例map
-ProFormForward.useFormInstances = _FormsProvider.useForms; // 获取上下文中的共享的表单实例map
 ProFormForward.useContextForms = _FormsProvider.useContextForms; // 获取上下文中的共享的表单实例map
-
-// 内置组合
-ProFormForward.ProCascader = _components.ProCascader;
-ProFormForward.ProCombination = _components.ProCombination;
-ProFormForward.ProNumberRange = _components.ProNumberRange;
-ProFormForward.ProModalSelect = _components.ProModalSelect;
-ProFormForward.ProTimeLimit = _components.ProTimeLimit;
-ProFormForward.ProUpload = _components.ProUpload;
-// ProFormForward.ProTreeSelect = ProTreeSelect;
-ProFormForward.ProTreeModal = _components.ProTreeModal;
-ProFormForward.ProTree = _components.ProTree;
-
-// 待废弃
-ProFormForward.EnumSelect = _components.EnumSelect;
-ProFormForward.ProAddress = _components.ProAddress;
-ProFormForward.InputRange = _components.InputRange;
-ProFormForward.ProRangeBox = _components.ProRangeBox;
-ProFormForward.ProCertValidity = _components.ProCertValidity;
-ProFormForward.ProCertNo = _components.ProCertNo;
-ProFormForward.transferAddressInfoToRegion = _components.transferAddressInfoToRegion;
 var _default = exports.default = ProFormForward;

package/lib/ProForm/propsType.d.ts

@@ -46,6 +46,7 @@ export interface ProFormOtherType {
     formDisabled?: boolean;
     isDiffChange?: boolean;
     diffConfig?: DiffConfigType;
+    shouldUpdateDebounce?: number;
 }
 export interface DiffConfigType<Values = any> {
     /** 比对原始数据源 */
@@ -100,6 +101,8 @@ export interface ProFormType<Values = any> extends FormProps<Values> {
     optimize?: boolean;
     /** 是否在遇到第一个错误时停止验证 */
     stopOnFirstError?: boolean;
+    /** shouldUpdate防抖延迟时间，默认500ms，设置为0则不防抖 */
+    shouldUpdateDebounce?: number;
 }
 export interface TransformType<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

package/lib/ProForm/style/index.less

@@ -1,6 +1,5 @@
-@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 +8,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 +103,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 +133,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 +175,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 +307,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

@@ -5,20 +5,20 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 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"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireWildcard(require("react"));
-var _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _lodash = _interopRequireWildcard(require("lodash"));
+var _react = require("react");
 /* eslint-disable no-restricted-syntax */
 
 var getLayout = params => {
@@ -78,7 +78,7 @@ var isTrim = (type, trim, configData) => {
     _ref$state = _ref.state,
     state = _ref$state === void 0 ? {} : _ref$state;
   var _trim = trim || (state === null || state === 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 = event => {
       var _event$target$value;
       if (Array.isArray(event)) {
@@ -99,7 +99,7 @@ var isTrim = (type, trim, configData) => {
 exports.isTrim = isTrim;
 var isUpperCase = (type, upperCase) => {
   var result = {};
-  if (['Input', 'ProCombination'].includes(type) && upperCase) {
+  if (['Input'].includes(type) && upperCase) {
     result.getValueFromEvent = event => {
       var _event$target;
       if (Array.isArray(event)) {
@@ -152,8 +152,8 @@ var filterInternalFields = (values, optimize) => {
     return values;
   }
   var nextValues = values;
-  // fix: braft-editor对象不可遍历 Moment不过滤
-  if (values !== null && values !== void 0 && values._immutable || _moment.default.isMoment(values)) {
+  // fix: braft-editor对象不可遍历 Dayjs不过滤
+  if (values !== null && values !== void 0 && values._immutable || _dayjs.default.isDayjs(values)) {
     return nextValues;
   }
   if (values instanceof File) {
@@ -325,17 +325,9 @@ function getArrayBeforeNumber(arr) {
   return index !== -1 ? arr.slice(0, index + 1) : arr;
 }
 
-// 自定义深比对 如果两边都是函数类型则认为相等
-var customEqualForFun = (value, other) => {
-  if ((0, _lodash.isFunction)(value) && (0, _lodash.isFunction)(other) || /*#__PURE__*/_react.default.isValidElement(value) && /*#__PURE__*/_react.default.isValidElement(other)) {
-    return true;
-  }
-};
-
 /**
  * 查询数据中是否包含rowKey
  */
-exports.customEqualForFun = customEqualForFun;
 var hasRowKey = obj => {
   if (typeof obj !== 'object' || obj === null) {
     return false;
@@ -485,4 +477,64 @@ function findNamesKeyInArray(arr, key) {
     _iterator.f();
   }
   return null;
-}
+}
+
+// 为内层数组定义一个类型别名，以增加代码清晰度
+
+/**
+ * 根据特定规则合并两个数据源 (TypeScript 版本)
+ * @param data1 第一个数据源
+ * @param data2 第二个数据源
+ * @returns 合并后的结果数组
+ */
+var mergeNames = (data1, data2) => {
+  // 步骤 1: 将 data1 的最后一个元素存入 Set 以便快速查找
+  var baseFields = new Set(data1.map(item => item[item.length - 1]));
+  var finalResult = [];
+  var coveredFields = new Set();
+
+  // 步骤 2 & 3: 处理 data2，找出有效的合并项
+  data2.forEach(item => {
+    // 确保数组有可处理的合并字段，并且该字段是字符串类型
+    var combinedField = item[item.length - 1];
+    if (item.length < 3 || typeof combinedField !== 'string') {
+      return;
+    }
+    var subFields = combinedField.split('-');
+
+    // 检查所有子字段是否都存在于 baseFields 中
+    var allFieldsValid = subFields.every(field => baseFields.has(field));
+
+    // 步骤 4: 如果有效，则添加到结果中，并记录已覆盖的字段
+    if (allFieldsValid) {
+      finalResult.push(item);
+      subFields.forEach(field => coveredFields.add(field));
+    }
+  });
+
+  // 步骤 5: 处理 data1，添加未被覆盖的字段
+  data1.forEach(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。
+ */
+exports.mergeNames = mergeNames;
+var isListForm = str => {
+  if (!str) {
+    return false;
+  }
+  // 正则表达式：查找被逗号或字符串边界包围的数字
+  var regex = /(?:^|,)\s*\d+\s*(?:,|$)/;
+  return regex.test(str);
+};
+exports.isListForm = isListForm;

package/lib/ProForm/utils/useDeepCompareMemo.js

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

package/lib/ProForm/utils/useForm.js

@@ -9,9 +9,8 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
 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");
@@ -32,7 +31,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
 
   // formKey全局共享逻辑
   var forms = (0, _react.useContext)(_FormsProvider.FormsContext);
-  var _ref2 = _form.default.useForm(forms[formKey] || _originForm),
+  var _ref2 = _antd.Form.useForm(forms[formKey] || _originForm),
     _ref3 = (0, _slicedToArray2.default)(_ref2, 1),
     form = _ref3[0];
   if (formKey && forms[formKey] !== form) {
@@ -48,7 +47,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
   if (isModified) return [form];
 
   // @ts-ignore
-  var _getFieldsValue = (nameList, filterFunc) => {
+  var nextGetFieldsValue = (nameList, filterFunc) => {
     // 全部查询
     if (nameList !== true) {
       var values = getFieldsValue(nameList || true, filterFunc);
@@ -56,7 +55,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
     }
     return getFieldsValue(nameList, filterFunc);
   };
-  var _validateFields = /*#__PURE__*/function () {
+  var nextValidateFields = /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
       var _rest$,
         _form$__INTERNAL_CONF,
@@ -76,6 +75,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
         _form$getInternalHook,
         getFields,
         fieldsList,
+        fieldsNames,
         _document,
         tablePagination,
         _tablePagination$clic,
@@ -155,19 +155,24 @@ var useForm = exports.useForm = function useForm(originForm, options) {
             }
             // @ts-ignore
             _form$getInternalHook = form.getInternalHooks('RC_FORM_INTERNAL_HOOKS'), getFields = _form$getInternalHook.getFields;
-            fieldsList = getFields();
-            fieldsList.forEach(item => {
-              var _item$name, _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 && (_item$name2 = _item$name2[0]) !== null && _item$name2 !== void 0 && _item$name2.startsWith(`${nameList[0]}_`)) {
-                validateNames.push(item.name);
-              }
-            });
+            fieldsList = getFields(); // formList& proEditTable 特殊处理
+            if (Array.isArray(nameList) && (0, _index.isListForm)(String(nameList))) {
+              fieldsNames = fieldsList.map(item => item.name);
+              validateNames = (0, _index.mergeNames)(nameList, fieldsNames);
+            } else {
+              // 其他情况
+              fieldsList.forEach(item => {
+                var _item$name, _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 && (_item$name2 = _item$name2[0]) !== null && _item$name2 !== void 0 && _item$name2.startsWith(`${nameList[0]}_`)) {
+                  validateNames.push(item.name);
+                }
+              });
+            }
             if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
               validateNames = [...nameList];
             }
 
             // @ts-ignore
-            // delete rest[0].recursive;
             _context.next = 41;
             return validateFields(validateNames, ...rest).then(values => {
               return (0, _index.filterInternalFields)(values, optimize);
@@ -184,7 +189,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
             }
             _context.next = 45;
             return validateFields(nameList, ...rest).then(values => {
-              return nameList ? values : _getFieldsValue();
+              return nameList ? values : nextGetFieldsValue();
             });
           case 45:
             return _context.abrupt("return", _context.sent);
@@ -205,11 +210,11 @@ var useForm = exports.useForm = function useForm(originForm, options) {
         }
       }, _callee, null, [[0, 48], [7, 26, 29, 32], [11, 18]]);
     }));
-    return function _validateFields(_x) {
+    return function nextValidateFields(_x) {
       return _ref4.apply(this, arguments);
     };
   }();
-  var _setFieldValue = (name, value, info) => {
+  var nextSetFieldValue = (name, value, info) => {
     if (info) {
       setFields([(0, _objectSpread2.default)({
         name,
@@ -224,7 +229,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
       }]);
     }
   };
-  var _setFieldsValue = values => {
+  var nextSetFieldsValue = values => {
     var errors = getFieldsError();
     var errorNames = errors.reduce((acc, entry) => {
       if (entry.errors.length > 0) {
@@ -248,10 +253,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.d.ts

@@ -19,6 +19,7 @@ interface UseShouldUpdateProps<Values> {
     rules?: ProRule[];
     required?: boolean;
     type: string;
+    shouldUpdateDebounce?: number;
     [key: string]: any;
 }
 type HookShouldUpdate<Values = any> = (props: UseShouldUpdateProps<Values>) => Result<Values>;