@zat-design/sisyphus-react 3.13.2 → 3.13.3-beta.1

package/lib/ProForm/index.js

@@ -28,7 +28,7 @@ var _locale = _interopRequireDefault(require("../locale"));
 var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
 var _FormsProvider = _interopRequireWildcard(require("../FormsProvider"));
 var _ProStep = require("../ProStep");
-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", "desensitizationKey"];
+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", "desensitizationKey", "stopOnFirstError"];
 var ProForm = function ProForm(props, ref) {
   var _localStorage, _ref3;
   var _props$mode = props.mode,
@@ -74,6 +74,8 @@ var ProForm = function ProForm(props, ref) {
     optimize = _props$optimize === void 0 ? false : _props$optimize,
     _props$desensitizatio = props.desensitizationKey,
     desensitizationKey = _props$desensitizatio === void 0 ? 'zat-design-pro-component-desensitization' : _props$desensitizatio,
+    _props$stopOnFirstErr = props.stopOnFirstError,
+    stopOnFirstError = _props$stopOnFirstErr === void 0 ? false : _props$stopOnFirstErr,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var config = (0, _ProConfigProvider.useProConfig)('ProForm');
   // source: 用于区分是哪个组件调用，用于错误提示
@@ -92,6 +94,14 @@ var ProForm = function ProForm(props, ref) {
     }),
     _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
     form = _useForm2[0];
+  // 保存内部配置
+  (0, _react.useEffect)(function () {
+    if (!form.__INTERNAL_CONFIG__) {
+      form.__INTERNAL_CONFIG__ = {};
+    }
+    form.__INTERNAL_CONFIG__.fields = (0, _index.getFormFieldPaths)(form);
+    form.__INTERNAL_CONFIG__.stopOnFirstError = stopOnFirstError;
+  }, [stopOnFirstError, form]);
   var _useControlled = (0, _index.useControlled)({
       value: expandOpen,
       onChange: expandOpenChange

package/lib/ProForm/propsType.d.ts

@@ -101,6 +101,8 @@ export interface ProFormType<Values = any> extends FormProps<Values> {
     optimize?: boolean;
     /** 全局脱敏开关的key、默认 zat-design-pro-component-desensitization */
     desensitizationKey?: string;
+    /** 是否在遇到第一个错误时停止验证 */
+    stopOnFirstError?: boolean;
 }
 export interface TransformType<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

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

@@ -1,4 +1,4 @@
-import { ColProps, FormProps } from 'antd';
+import { ColProps, FormProps, FormInstance } from 'antd';
 import { InternalNamePath, NamePath } from 'antd/es/form/interface';
 interface transProps {
     formProps: FormProps;
@@ -95,6 +95,11 @@ export declare const findOptionByValue: (treeData: any[], value: string | number
 export declare const equalDependencies: (dependencies: any, prevValues: any, currentValues: any) => any;
 /** 解析namePath */
 export declare const parseNamePath: (input: string) => any;
-/** 解析namePath */
+/**
+ * 获取表单所有字段路径的简化函数
+ * @param form 表单实例
+ * @returns 所有字段路径数组
+ */
+export declare const getFormFieldPaths: (form: FormInstance) => any[];
 export declare function findNamesKeyInArray(arr: string[], key: string): string | null;
 export {};

package/lib/ProForm/utils/index.js

@@ -9,7 +9,7 @@ exports.filterInternalFields = exports.equalDependencies = exports.diffField = e
 exports.findNamesKeyInArray = findNamesKeyInArray;
 exports.getAllNamePath = exports.findOptionByValue = void 0;
 exports.getArrayBeforeNumber = getArrayBeforeNumber;
-exports.hasRowKey = exports.getLayout = exports.getDecimalDigits = void 0;
+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.toArray = toArray;
@@ -425,7 +425,25 @@ var parseNamePath = exports.parseNamePath = function parseNamePath(input) {
   });
   return [result];
 };
-/** 解析namePath */
+/**
+ * 获取表单所有字段路径的简化函数
+ * @param form 表单实例
+ * @returns 所有字段路径数组
+ */
+var getFormFieldPaths = exports.getFormFieldPaths = function getFormFieldPaths(form) {
+  try {
+    // @ts-ignore
+    var _form$getInternalHook = form.getInternalHooks('RC_FORM_INTERNAL_HOOKS'),
+      getFields = _form$getInternalHook.getFields;
+    var allFields = getFields();
+    return allFields.map(function (field) {
+      return field.name;
+    });
+  } catch (error) {
+    console.error('获取表单字段失败:', error);
+    return [];
+  }
+};
 function findNamesKeyInArray(arr, key) {
   var _iterator = (0, _createForOfIteratorHelper2.default)(arr),
     _step;

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

@@ -1,12 +1,17 @@
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
 import { ValuedNotifyInfo } from 'rc-field-form/es/interface';
-export type ModifiedFormInstance<T> = FormInstance<T> & {
+export type ModifiedFormInstanceType<T> = FormInstance<T> & {
     isModified?: boolean;
     /** 默认清空设置值的报错状态 */
     setFieldValue: (name: NamePath, value: any, info?: ValuedNotifyInfo) => void;
     formKey?: string;
     _init?: boolean;
+    __INTERNAL_CONFIG__?: {
+        fields?: any[];
+        stopOnFirstError?: boolean;
+        [key: string]: any;
+    };
 };
 export interface FormInstanceOption {
     scrollToError?: boolean;
@@ -14,4 +19,4 @@ export interface FormInstanceOption {
     formKey?: string;
     source?: string;
 }
-export declare const useForm: <T>(originForm?: ModifiedFormInstance<T> | FormInstanceOption, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
+export declare const useForm: <T>(originForm?: ModifiedFormInstanceType<T> | FormInstanceOption, options?: FormInstanceOption) => [ModifiedFormInstanceType<T>];

package/lib/ProForm/utils/useForm.js

@@ -5,9 +5,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useForm = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 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"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _antd = require("antd");
@@ -56,10 +57,19 @@ var useForm = exports.useForm = function useForm(originForm, options) {
   var _validateFields = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
       var _rest$,
+        _form$__INTERNAL_CONF,
         _len,
         rest,
         _key,
         isRecursive,
+        stopOnFirstError,
+        allFields,
+        _iterator,
+        _step,
+        field,
+        _options2,
+        _error$errorFields,
+        _error$errorFields$,
         validateNames,
         _form$getInternalHook,
         getFields,
@@ -67,8 +77,8 @@ var useForm = exports.useForm = function useForm(originForm, options) {
         _document,
         tablePagination,
         _tablePagination$clic,
-        _error$errorFields,
-        _error$errorFields$,
+        _error$errorFields2,
+        _error$errorFields$2,
         _args = arguments;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -77,11 +87,68 @@ var useForm = exports.useForm = function useForm(originForm, options) {
             for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               rest[_key - 1] = _args[_key];
             }
-            // @ts-ignore
             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;
+              break;
+            }
+            // 获取所有表单字段
+            allFields = (0, _index.getFormFieldPaths)(form); // 单独验证每个字段
+            // eslint-disable-next-line no-restricted-syntax
+            _iterator = (0, _createForOfIteratorHelper2.default)(allFields);
+            _context.prev = 7;
+            _iterator.s();
+          case 9:
+            if ((_step = _iterator.n()).done) {
+              _context.next = 24;
+              break;
+            }
+            field = _step.value;
+            _context.prev = 11;
+            // 创建不包含 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;
+            return validateFields([field], _options2);
+          case 16:
+            _context.next = 22;
+            break;
+          case 18:
+            _context.prev = 18;
+            _context.t0 = _context["catch"](11);
+            // 遇到错误，滚动到错误位置
+            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, {
+                block: 'center',
+                behavior: 'smooth'
+              });
+            }
+            // 中止验证，抛出错误
+            throw _context.t0;
+          case 22:
+            _context.next = 9;
+            break;
+          case 24:
+            _context.next = 29;
+            break;
+          case 26:
+            _context.prev = 26;
+            _context.t1 = _context["catch"](7);
+            _iterator.e(_context.t1);
+          case 29:
+            _context.prev = 29;
+            _iterator.f();
+            return _context.finish(29);
+          case 32:
+            return _context.abrupt("return", form.getFieldsValue());
+          case 33:
             validateNames = []; // 前缀校验模式
             if (!isRecursive) {
-              _context.next = 12;
+              _context.next = 42;
               break;
             }
             // @ts-ignore
@@ -98,13 +165,13 @@ var useForm = exports.useForm = function useForm(originForm, options) {
             }
             // @ts-ignore
             // delete rest[0].recursive;
-            _context.next = 11;
+            _context.next = 41;
             return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
               return (0, _index.filterInternalFields)(values, optimize);
             });
-          case 11:
+          case 41:
             return _context.abrupt("return", _context.sent);
-          case 12:
+          case 42:
             // 解决，单个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('-'))));
@@ -112,28 +179,28 @@ 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 = 15;
+            _context.next = 45;
             return validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
               return nameList ? values : _getFieldsValue();
             });
-          case 15:
+          case 45:
             return _context.abrupt("return", _context.sent);
-          case 18:
-            _context.prev = 18;
-            _context.t0 = _context["catch"](0);
-            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) && source === 'ProForm') {
-              form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
+          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, {
                 block: 'center',
                 behavior: 'smooth'
               });
             }
             (0, _tools.handleScrollToError)();
-            throw _context.t0;
-          case 23:
+            throw _context.t2;
+          case 53:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 18]]);
+      }, _callee, null, [[0, 48], [7, 26, 29, 32], [11, 18]]);
     }));
     return function _validateFields(_x) {
       return _ref2.apply(this, arguments);
@@ -181,8 +248,8 @@ var useForm = exports.useForm = function useForm(originForm, options) {
   form.getFieldsValue = _getFieldsValue;
   form.setFieldValue = _setFieldValue;
   form.setFieldsValue = _setFieldsValue;
-  form.getFieldsValue = _getFieldsValue;
   form.validateFields = _validateFields;
   form.isModified = true;
+  form.__INTERNAL_CONFIG__ = {};
   return [form];
 };

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

@@ -1,6 +1,11 @@
-import { InternalNamePath, FormInstance, NamePath } from 'rc-field-form/es/interface';
+import { FormInstance, NamePath } from 'rc-field-form/es/interface';
 export declare function toArray<T>(value?: T | T[] | null): T[];
-export declare function getNamePath(path: NamePath | null): InternalNamePath;
-export declare function stringify(value: any): string | number;
+/**
+ * ProForm的useWatch hook，用于监听表单字段变化
+ * @param dependencies 监听的字段路径
+ * @param form 表单实例
+ * @param wait 防抖等待时间
+ * @returns 表单值
+ */
 declare function useWatch(dependencies: string | NamePath[], form?: FormInstance, wait?: number): any;
 export default useWatch;

package/lib/ProForm/utils/useWatch.js

@@ -5,83 +5,163 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-exports.getNamePath = getNamePath;
-exports.stringify = stringify;
 exports.toArray = toArray;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _lodash = require("lodash");
-var _FieldContext = require("rc-field-form/es/FieldContext");
 var _warning = _interopRequireDefault(require("rc-util/lib/warning"));
 var _react = require("react");
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 function toArray(value) {
   if (value === undefined || value === null) {
     return [];
   }
   return Array.isArray(value) ? value : [value];
 }
-function getNamePath(path) {
-  return toArray(path);
+// 从一个对象或Form值中获取特定路径的值
+function get(source, path) {
+  if (!source || path.length === 0) {
+    return source;
+  }
+  var current = source;
+  for (var i = 0; i < path.length; i++) {
+    if (current === undefined || current === null) {
+      return undefined;
+    }
+    current = current[path[i]];
+  }
+  return current;
 }
-function stringify(value) {
-  try {
-    return JSON.stringify(value);
-  } catch (err) {
-    return Math.random();
+/**
+ * 将值设置到指定路径的嵌套对象中
+ * @param obj 目标对象
+ * @param path 路径数组
+ * @param value 要设置的值
+ */
+function setValueByPath(obj, path, value) {
+  if (path.length === 0) return;
+  // 处理单层路径
+  if (path.length === 1) {
+    obj[path[0]] = value;
+    return;
+  }
+  // 处理多层嵌套路径
+  var current = obj;
+  for (var i = 0; i < path.length - 1; i++) {
+    var key = path[i];
+    if (!current[key]) {
+      current[key] = {};
+    }
+    current = current[key];
   }
+  current[path[path.length - 1]] = value;
 }
-// 创建之后namepath就不可变
-var useWatchWarning = process.env.NODE_ENV !== 'production' ? function (namePath) {
-  var fullyStr = JSON.stringify(namePath);
-  var nameStrRef = (0, _react.useRef)(fullyStr);
-  (0, _warning.default)(nameStrRef.current === fullyStr, '`useWatch` is not support dynamic `namePath`. Please provide static instead.');
+// 创建之后namepath就不可变的警告
+var useWatchWarning = process.env.NODE_ENV !== 'production' ? function (dependencies) {
+  var depsStr = JSON.stringify(dependencies);
+  var depsStrRef = (0, _react.useRef)(depsStr);
+  (0, _warning.default)(depsStrRef.current === depsStr, '`useWatch` is not support dynamic `namePath`. Please provide static instead.');
 } : function () {};
+/**
+ * ProForm的useWatch hook，用于监听表单字段变化
+ * @param dependencies 监听的字段路径
+ * @param form 表单实例
+ * @param wait 防抖等待时间
+ * @returns 表单值
+ */
 function useWatch(dependencies, form, wait) {
-  var isSingle = typeof dependencies === 'string';
+  // 处理开发环境警告
+  useWatchWarning(dependencies);
+  // 获取表单实例
+  var formInstance = form;
+  // 用于存储最终结果
   var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    value = _useState2[0],
-    setValue = _useState2[1];
-  var valueStr = (0, _react.useMemo)(function () {
-    return stringify(value);
-  }, [value]);
-  var valueStrRef = (0, _react.useRef)(valueStr);
-  valueStrRef.current = valueStr;
-  var formInstance = form;
-  var isValidForm = formInstance && formInstance._init;
-  var _dependencies = isSingle ? [dependencies] : dependencies;
-  var namePaths = _dependencies === null || _dependencies === void 0 ? void 0 : _dependencies.map(function (item) {
-    return getNamePath(item);
-  });
-  var namePathsRef = (0, _react.useRef)(namePaths);
-  namePathsRef.current = namePaths;
-  useWatchWarning(namePaths);
+    state = _useState2[0],
+    setState = _useState2[1];
+  // 使用ref存储中间状态，避免不必要的渲染
+  var valueRef = (0, _react.useRef)({});
+  var prevStateRef = (0, _react.useRef)({});
+  // 标准化依赖为路径数组的数组
+  var namePaths = (0, _react.useMemo)(function () {
+    // 将依赖标准化为数组的数组形式
+    var paths = [];
+    // 字符串形式: 'fieldName'
+    if (typeof dependencies === 'string') {
+      paths.push(dependencies);
+      // 数组形式
+    } else if (Array.isArray(dependencies)) {
+      // 检查是否是路径数组的集合，例如：[['a', 'number'], 'fieldName']
+      var isPathsCollection = dependencies.length > 0 && (typeof dependencies[0] === 'string' || Array.isArray(dependencies[0]));
+      if (isPathsCollection) {
+        // 每个元素都是一个路径
+        dependencies.forEach(function (path) {
+          paths.push(path);
+        });
+      } else {
+        // 整个数组是一个单一路径
+        paths.push(dependencies);
+      }
+    }
+    return paths;
+  }, [/* dependencies 故意忽略，与原实现一致 */]);
+  // 保存防抖函数引用，避免重复创建
+  var debouncedFn = (0, _react.useMemo)(function () {
+    if (wait) {
+      return (0, _lodash.debounce)(function (value) {
+        // 只在值真正变化时才更新状态
+        if (!(0, _isEqual.default)(prevStateRef.current, value)) {
+          prevStateRef.current = (0, _objectSpread2.default)({}, value);
+          setState(value);
+        }
+      }, wait);
+    }
+    // 非防抖版本
+    return function (value) {
+      if (!(0, _isEqual.default)(prevStateRef.current, value)) {
+        prevStateRef.current = (0, _objectSpread2.default)({}, value);
+        setState(value);
+      }
+    };
+  }, [wait]);
   (0, _react.useEffect)(function () {
-    if (!isValidForm) return;
-    var getFieldsValue = formInstance.getFieldsValue,
-      getInternalHooks = formInstance.getInternalHooks;
-    var _getInternalHooks = getInternalHooks(_FieldContext.HOOK_MARK),
+    if (!formInstance) return undefined;
+    // 创建更新状态的函数
+    var updateState = function updateState() {
+      var values = formInstance.getFieldsValue(true);
+      var newState = {};
+      // 处理每个监听路径
+      namePaths.forEach(function (path) {
+        // 将路径转换为数组形式
+        var namePath = toArray(path);
+        // 获取路径对应的值
+        var value = get(values, namePath);
+        // 将值设置到正确的嵌套结构中
+        setValueByPath(newState, namePath, value);
+      });
+      // 存储并更新状态
+      valueRef.current = newState;
+      debouncedFn(newState);
+    };
+    // 初始调用一次
+    updateState();
+    // 注册表单变化监听
+    var getInternalHooks = formInstance.getInternalHooks;
+    var _getInternalHooks = getInternalHooks('RC_FORM_INTERNAL_HOOKS'),
       registerWatch = _getInternalHooks.registerWatch;
-    var callback = function callback() {
-      var newValue = getFieldsValue(_dependencies);
-      var nextValueStr = stringify(newValue);
-      // Compare stringify in case it's nest object
-      if (valueStrRef.current !== nextValueStr) {
-        valueStrRef.current = nextValueStr;
-        setValue(getFieldsValue(_dependencies));
+    var cancelWatch = registerWatch(function (values) {
+      if (values) {
+        updateState();
+      }
+    });
+    // 清理订阅
+    return function () {
+      if (wait) {
+        debouncedFn.cancel();
       }
+      cancelWatch();
     };
-    // 增加防抖
-    if (wait) {
-      callback = (0, _lodash.debounce)(callback, wait);
-    }
-    var cancelRegister = registerWatch(callback);
-    var initialValue = getFieldsValue(_dependencies);
-    setValue(initialValue);
-    return cancelRegister;
-  },
-  // We do not need re-register since namePath content is the same
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  [isValidForm]);
-  return value;
+  }, [formInstance, namePaths, debouncedFn, wait]);
+  return state;
 }
 var _default = exports.default = useWatch;

package/lib/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -15,14 +15,6 @@ var _DndWrapper = _interopRequireWildcard(require("./components/DndWrapper"));
 var _index = require("../../../index");
 require("../../../../style/index.less");
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
-/*
- * @Author: ''
- * @Date: 2024-08-09 13:48:59
- * @LastEditors: ''
- * @LastEditTime: 2024-08-27 15:27:44
- * @FilePath: /za-material-warehouse/src/ProTable/components/RcTable/components/DraggableTable/index.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 var DraggableTable = function DraggableTable(_ref) {
   var dataSource = _ref.dataSource,
     tableProps = _ref.tableProps,

package/lib/ProTable/components/RenderTabs/index.js

@@ -20,7 +20,8 @@ var RenderTabs = function RenderTabs(props) {
     transformResponse = props.transformResponse,
     tabsProps = props.tabsProps,
     name = props.name,
-    formTableProps = props.formTableProps;
+    formTableProps = props.formTableProps,
+    transformParams = props.transformParams;
   var _ref = formTableProps || {},
     form = _ref.form,
     onSearch = _ref.onSearch;
@@ -71,7 +72,11 @@ var RenderTabs = function RenderTabs(props) {
       var fieldsValues = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {};
       setActiveKey(key);
       form.setFieldValue(name, key);
-      onSearch === null || onSearch === void 0 ? void 0 : onSearch((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldsValues), {}, (0, _defineProperty2.default)({}, name, key)));
+      var params = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldsValues), {}, (0, _defineProperty2.default)({}, name, key));
+      if (transformParams && typeof transformParams === 'function') {
+        params = transformParams(params);
+      }
+      onSearch === null || onSearch === void 0 ? void 0 : onSearch(params);
     },
     type: "card"
   }, tabsProps), {}, {

package/lib/ProTable/hooks/useAntdTable.js

@@ -33,13 +33,12 @@ var useDefaultOptions = function useDefaultOptions(options) {
 };
 var previousSearchValues = null;
 function useAntdTable(service, options, useRequestOptions) {
-  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5;
+  var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5, _result$params;
   var _useSetState = (0, _ahooks.useSetState)({
       data: [],
       total: 0,
       selectedRecords: [],
       selectedRowKeys: [],
-      searchValues: undefined,
       extraFilter: {
         filters: undefined,
         sorter: undefined
@@ -52,7 +51,6 @@ function useAntdTable(service, options, useRequestOptions) {
     total = _useSetState2$.total,
     selectedRecords = _useSetState2$.selectedRecords,
     selectedRowKeys = _useSetState2$.selectedRowKeys,
-    searchValues = _useSetState2$.searchValues,
     extraFilter = _useSetState2$.extraFilter,
     allSelected = _useSetState2$.allSelected,
     setState = _useSetState2[1];
@@ -73,6 +71,9 @@ function useAntdTable(service, options, useRequestOptions) {
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
+  // 搜索表单里的值
+  var _searchValues = _antd.Form.useWatch([], form);
+  var searchValues = (0, _utils.removeEmptyKeys)(_searchValues);
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams;
   var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
@@ -110,12 +111,6 @@ function useAntdTable(service, options, useRequestOptions) {
       allSelected: false
     }, values));
   };
-  var params = (0, _react.useMemo)(function () {
-    var newQueryBean = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, searchValues), extraFilter);
-    return getTransformParams((0, _objectSpread2.default)({
-      page: page
-    }, newQueryBean));
-  }, [page, searchValues, extraFilter]);
   var curService = (0, _react.useMemo)(function () {
     return service.toString();
   }, [service]);
@@ -254,10 +249,9 @@ function useAntdTable(service, options, useRequestOptions) {
       onPageChange(newPage);
     }
     // 减少查询按钮的渲染，只有需要重置值时才需要调用
-    if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values) && !(0, _lodash.isEqual)(previousSearchValues, _values)) {
+    if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values) || !(0, _lodash.isEqual)(previousSearchValues, _values)) {
       previousSearchValues = _values;
       setState({
-        searchValues: _values,
         allSelected: false,
         selectedRecords: [],
         selectedRowKeys: []
@@ -269,7 +263,6 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
   var resetParams = (0, _react.useCallback)(function (page) {
     setState({
-      searchValues: undefined,
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: [],
@@ -484,7 +477,7 @@ function useAntdTable(service, options, useRequestOptions) {
   };
   var useAntdTableProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, result), {}, {
     data: data,
-    params: params,
+    params: (result === null || result === void 0 ? void 0 : (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]) || {},
     rowSelection: rowSelection,
     searchValues: searchValues,
     allSelected: allSelected,