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

package/es/ProForm/utils/useWatch.js

@@ -1,77 +1,159 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { debounce } from 'lodash';
-import { HOOK_MARK } from 'rc-field-form/es/FieldContext';
 import warning from 'rc-util/lib/warning';
 import { useState, useEffect, useRef, useMemo } from 'react';
+import isEqual from 'lodash/isEqual';
 export function toArray(value) {
   if (value === undefined || value === null) {
     return [];
   }
   return Array.isArray(value) ? value : [value];
 }
-export 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;
 }
-export 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 = useRef(fullyStr);
-  warning(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 = useRef(depsStr);
+  warning(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 = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
-    value = _useState2[0],
-    setValue = _useState2[1];
-  var valueStr = useMemo(function () {
-    return stringify(value);
-  }, [value]);
-  var valueStrRef = 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 = useRef(namePaths);
-  namePathsRef.current = namePaths;
-  useWatchWarning(namePaths);
+    state = _useState2[0],
+    setState = _useState2[1];
+  // 使用ref存储中间状态，避免不必要的渲染
+  var valueRef = useRef({});
+  var prevStateRef = useRef({});
+  // 标准化依赖为路径数组的数组
+  var namePaths = 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 = useMemo(function () {
+    if (wait) {
+      return debounce(function (value) {
+        // 只在值真正变化时才更新状态
+        if (!isEqual(prevStateRef.current, value)) {
+          prevStateRef.current = _objectSpread({}, value);
+          setState(value);
+        }
+      }, wait);
+    }
+    // 非防抖版本
+    return function (value) {
+      if (!isEqual(prevStateRef.current, value)) {
+        prevStateRef.current = _objectSpread({}, value);
+        setState(value);
+      }
+    };
+  }, [wait]);
   useEffect(function () {
-    if (!isValidForm) return;
-    var getFieldsValue = formInstance.getFieldsValue,
-      getInternalHooks = formInstance.getInternalHooks;
-    var _getInternalHooks = getInternalHooks(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 = 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;
 }
 export default useWatch;

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

@@ -4,15 +4,6 @@ import _Table from "antd/es/table";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
 import { jsx as _jsx } from "react/jsx-runtime";
-/*
- * @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
- */
-
 import { memo } from 'react';
 import DndWrapper, { Row } from './components/DndWrapper';
 import { RenderEmptyText, RenderSummary } from '../../../index';

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

@@ -16,7 +16,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;
@@ -67,7 +68,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(_objectSpread(_objectSpread({}, fieldsValues), {}, _defineProperty({}, name, key)));
+      var params = _objectSpread(_objectSpread({}, fieldsValues), {}, _defineProperty({}, name, key));
+      if (transformParams && typeof transformParams === 'function') {
+        params = transformParams(params);
+      }
+      onSearch === null || onSearch === void 0 ? void 0 : onSearch(params);
     },
     type: "card"
   }, tabsProps), {}, {

package/es/ProTable/hooks/useAntdTable.js

@@ -4,6 +4,8 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/message/style";
 import _message from "antd/es/message";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["page", "filters", "sorter"];
@@ -26,13 +28,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 = useSetState({
       data: [],
       total: 0,
       selectedRecords: [],
       selectedRowKeys: [],
-      searchValues: undefined,
       extraFilter: {
         filters: undefined,
         sorter: undefined
@@ -45,7 +46,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];
@@ -66,6 +66,9 @@ function useAntdTable(service, options, useRequestOptions) {
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
+  // 搜索表单里的值
+  var _searchValues = _Form.useWatch([], form);
+  var searchValues = removeEmptyKeys(_searchValues);
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams;
   var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
@@ -103,12 +106,6 @@ function useAntdTable(service, options, useRequestOptions) {
       allSelected: false
     }, values));
   };
-  var params = useMemo(function () {
-    var newQueryBean = _objectSpread(_objectSpread({}, searchValues), extraFilter);
-    return getTransformParams(_objectSpread({
-      page: page
-    }, newQueryBean));
-  }, [page, searchValues, extraFilter]);
   var curService = useMemo(function () {
     return service.toString();
   }, [service]);
@@ -247,10 +244,9 @@ function useAntdTable(service, options, useRequestOptions) {
       onPageChange(newPage);
     }
     // 减少查询按钮的渲染，只有需要重置值时才需要调用
-    if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || isNonEmptyObject(_values) && !isEqual(previousSearchValues, _values)) {
+    if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || isNonEmptyObject(_values) || !isEqual(previousSearchValues, _values)) {
       previousSearchValues = _values;
       setState({
-        searchValues: _values,
         allSelected: false,
         selectedRecords: [],
         selectedRowKeys: []
@@ -262,7 +258,6 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
   var resetParams = useCallback(function (page) {
     setState({
-      searchValues: undefined,
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: [],
@@ -477,7 +472,7 @@ function useAntdTable(service, options, useRequestOptions) {
   };
   var useAntdTableProps = _objectSpread(_objectSpread({}, 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,

package/es/ProTable/propsType.d.ts

@@ -337,6 +337,12 @@ export interface ProTableTabsType {
         label: string;
         value: string;
     }[];
+    /**
+     * 转换查询参数
+     * @description 转换查询参数
+     * @default undefined
+     */
+    transformParams?: (params: any) => any;
     /**
      * 枚举数据源转换
      * @description 枚举数据源转换
@@ -729,12 +735,6 @@ export interface ProTableUseAntdTableType<I, R> {
      * @default []
      */
     selectedRowKeys: Key[];
-    /**
-     * 搜索值
-     * @description 当前表单的搜索条件
-     * @default undefined
-     */
-    searchValues: I;
     /**
      * 额外过滤条件
      * @description 表单之外的额外过滤条件

package/es/ProTable/utils/index.d.ts

@@ -6,7 +6,6 @@
 export declare const getDecimalDigits: (num?: number) => number;
 /**
  * @description: 获取初始值
- * @author: xiangchengli
  * @param {any} rowKey
  * @param any value
  * @param any originalObj

package/es/ProTable/utils/index.js

@@ -15,7 +15,6 @@ export var getDecimalDigits = function getDecimalDigits() {
 };
 /**
  * @description: 获取初始值
- * @author: xiangchengli
  * @param {any} rowKey
  * @param any value
  * @param any originalObj

package/es/ProTooltip/index.js

@@ -10,8 +10,15 @@ import { useSize, useSetState, useDebounce } from 'ahooks';
 import { useEffect, useRef } from 'react';
 import classnames from 'classnames';
 import { isEllipsisActive } from '../utils';
+var _findTableParent = function findTableParent(element) {
+  var _element$tagName;
+  var depth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  if (!element || depth >= 3) return false;
+  if (((_element$tagName = element.tagName) === null || _element$tagName === void 0 ? void 0 : _element$tagName.toLowerCase()) === 'td') return true;
+  return _findTableParent(element.parentElement, depth + 1);
+};
 var ProTooltip = function ProTooltip(props) {
-  var _useSize, _parentElement$tagNam;
+  var _useSize;
   var ref = useRef();
   var childRef = useRef();
   var contentWrapRef = useRef();
@@ -58,7 +65,7 @@ var ProTooltip = function ProTooltip(props) {
   });
   var _ref = (_useSize = useSize(localElement)) !== null && _useSize !== void 0 ? _useSize : {},
     _localSizeWidth = _ref.width;
-  var isTable = (parentElement === null || parentElement === void 0 ? void 0 : (_parentElement$tagNam = parentElement.tagName) === null || _parentElement$tagNam === void 0 ? void 0 : _parentElement$tagNam.toLowerCase()) === 'td';
+  var isTable = _findTableParent(ref.current);
   var overlayStyle = mode === 'auto' ? {
     maxWidth: _localSizeWidth
   } : {};

package/es/ProTooltip/propsType.d.ts

@@ -1,4 +1,4 @@
-import { ReactNode, CSSProperties } from 'react';
+import { CSSProperties, ReactNode } from 'react';
 export interface ProTooltipType {
     /**
      * 提示文本内容
@@ -9,9 +9,8 @@ export interface ProTooltipType {
     /**
      * 提示框宽度
      * @description 设置提示框的宽度，支持各种CSS宽度单位
-     * @default 'auto'
      */
-    width?: string;
+    width?: string | number;
     /**
      * 显示的行数
      * @description 当内容超过设定行数时将截断显示

package/es/ProTree/components/AdaptiveTooltip.js

@@ -2,15 +2,6 @@ import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-/*
- * @Author: ''
- * @Date: 2024-09-20 10:26:04
- * @LastEditors: ''
- * @LastEditTime: 2024-09-26 14:12:44
- * @FilePath: /za-material-warehouse/src/ProTree/components/AdaptiveTooltip.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-
 import { useEffect, useState } from 'react';
 var AdaptiveTooltip = function AdaptiveTooltip(_ref) {
   var children = _ref.children;

package/es/ProTree/components/List.js

@@ -4,14 +4,6 @@ import _Checkbox from "antd/es/checkbox";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["checkedValues", "disabled", "treeData", "searchStr", "showCodeName", "mode", "fieldNames", "handleOnChange", "handleFilterClose", "optionRender"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-/*
- * @Author: ''
- * @Date: 2024-07-03 11:02:19
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2025-03-20 10:44:39
- * @FilePath: /za-material-warehouse/src/ProTree/components/List.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import { memo } from 'react';
 import SearchTitle from './SearchTitle';
 import CloseIcon from './CloseIcon';

package/es/ProTree/components/SearchTitle.js

@@ -1,12 +1,4 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/*
- * @Author: ''
- * @Date: 2024-09-26 14:37:00
- * @LastEditors: ''
- * @LastEditTime: 2024-09-26 17:50:59
- * @FilePath: /za-material-warehouse/src/ProTree/components/SearchTitle.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import { memo } from 'react';
 import AdaptiveTooltip from './AdaptiveTooltip';
 function SearchTitle(props) {

package/es/ProTreeModal/index.js

@@ -11,14 +11,6 @@ import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-/*
- * @Author: ''
- * @Date: 2024-06-04 10:01:18
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2025-03-20 11:12:23
- * @FilePath: /za-material-warehouse/src/ProTreeModal/index.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 import React, { useEffect, useMemo, useRef } from 'react';
 import { useDeepCompareEffect, useSetState, useRequest as useRequestFunc, useDebounceFn } from 'ahooks';
 import { cloneDeep, isFunction } from 'lodash';

package/es/ProUpload/components/ImageRender.js

@@ -13,15 +13,6 @@ import _Progress from "antd/es/progress";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-/*
- * @Author: wangshengqiang
- * @Date: 2023-07-27 20:13:07
- * @LastEditors: wangshengqiang
- * @LastEditTime: 2023-11-29 19:33:04
- * @Description: 图片类型
- *
- */
-
 import { useRef, useState } from 'react';
 import { DndContext } from '@dnd-kit/core';
 import { SortableContext, rectSortingStrategy } from '@dnd-kit/sortable';

package/es/ProUpload/index.js

@@ -5,13 +5,6 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerRender", "centerRender", "disabled", "uploadType", "buttonProps", "accept", "extraTipText", "beforeUpload", "onChange", "onDownload", "onPreview", "onRemove", "filterOriginFileObj", "method", "className", "dataParams", "name", "showExampleContent", "showUploadList", "otherProps", "transformResponse", "exampleTitle", "exampleContent", "exampleModalProps", "buttonText", "afterRender", "fieldNames", "isConfirmDelete"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/*
- * @Author: wangshengqiang
- * @Date: 2023-02-03 14:18:59
- * @LastEditTime: 2023-11-14 18:32:13
- * @LastEditors: wangshengqiang
- * @Description: 上传控件
- */
 import React, { useEffect, useState, useImperativeHandle } from 'react';
 import { isFunction, omit } from 'lodash';
 import { PointerSensor, useSensor } from '@dnd-kit/core';

package/es/style/theme/antd.less

@@ -107,6 +107,11 @@
   .@{ant-prefix}-empty-normal {
     margin: calc(var(--zaui-space-size-lg; 32px) * var(--zaui-size; 1)) 0;
   }
+  .@{ant-prefix}-table-tbody{
+    .@{ant-prefix}-table-cell-fix-left-last:after{
+      width: 8px;
+    }
+  }
   &.pro-table-no-stripe {
     .@{ant-prefix}-table-tbody {
       .@{ant-prefix}-table-row {

package/lib/FormsProvider/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { ModifiedFormInstance } from '../ProForm/utils/useForm';
-type Forms = Record<string, ModifiedFormInstance<any>>;
+import { ModifiedFormInstanceType } from '../ProForm/utils/useForm';
+type Forms = Record<string, ModifiedFormInstanceType<any>>;
 export declare const FormsContext: React.Context<Forms>;
 /**
  * @param formKey 表单实例key

package/lib/ProForm/components/FormFooter/index.js

@@ -42,12 +42,25 @@ var FormFooter = function FormFooter(props) {
     }
   }, [formId]);
   var _onOk = function _onOk() {
+    var _modifiedForm$__INTER;
     if (formId) {
       var values = form.getFieldsValue();
       searchCache[formId] = values;
       window.sessionStorage.setItem(PRO_FORM_CACHE, JSON.stringify(searchCache));
     }
-    onOk();
+    // 支持 stopOnFirstError
+    // @ts-ignore 使用类型断言处理自定义属性
+    var modifiedForm = form;
+    if ((_modifiedForm$__INTER = modifiedForm.__INTERNAL_CONFIG__) === null || _modifiedForm$__INTER === void 0 ? void 0 : _modifiedForm$__INTER.stopOnFirstError) {
+      // 使用自定义验证逻辑
+      form.validateFields().then(function () {
+        onOk();
+      }).catch(function () {
+        // 验证失败，不执行 onOk
+      });
+    } else {
+      onOk();
+    }
   };
   var _onCancel = function _onCancel() {
     if (formId && searchCache[formId]) {

package/lib/ProForm/components/FormFooter/propsType.d.ts

@@ -1,4 +1,5 @@
 import { ButtonProps, ColProps, FormInstance } from 'antd';
+import { ModifiedFormInstanceType } from '../../utils/useForm';
 export interface ButtonItem extends ButtonProps {
     children?: any;
 }
@@ -15,7 +16,7 @@ export interface FooterRenderType {
     footer?: FooterButtonType;
     confirmLoading?: boolean;
     formId?: string;
-    form: FormInstance;
+    form: FormInstance | ModifiedFormInstanceType<any>;
 }
 /**
  * 兼容旧命名导出

package/lib/ProForm/components/base/DatePicker/index.js

@@ -18,14 +18,6 @@ var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
 var _excluded = ["className", "format"];
-/*
- * @Author: ''
- * @Date: 2024-01-19 18:27:41
- * @LastEditors: ''
- * @LastEditTime: 2024-06-03 15:33:12
- * @FilePath: /za-material-warehouse/src/ProForm/components/base/DatePicker/index.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 var DatePicker = function DatePicker(props) {
   var className = props.className,
     _props$format = props.format,

package/lib/ProForm/components/base/RangePicker/index.js

@@ -16,16 +16,7 @@ var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
 var _useDateRange = require("./useDateRange");
-var _excluded = ["format", "otherProps", "separator", "range"];
-/*
- * @Author: ''
- * @Date: 2024-04-10 11:39:17
- * @LastEditors: ''
- * @LastEditTime: 2024-05-29 11:50:49
- * @FilePath: /za-material-warehouse/src/ProForm/components/base/RangePicker/index.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-// @ts-check
+var _excluded = ["format", "otherProps", "separator", "range"]; // @ts-check
 var AntRangePicker = _antd.DatePicker.RangePicker;
 var RangePicker = function RangePicker(props) {
   var _props$format = props.format,

package/lib/ProForm/components/render/Render.js

@@ -27,7 +27,7 @@ var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _ConfirmWrapper = _interopRequireDefault(require("./ConfirmWrapper"));
 var _ChangedWrapper = _interopRequireDefault(require("./ChangedWrapper"));
-var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
+var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip", "validateFirst"];
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
@@ -64,6 +64,8 @@ var Render = function Render(props) {
     required = formItemProps.required,
     labelRequired = formItemProps.labelRequired,
     tooltip = formItemProps.tooltip,
+    _formItemProps$valida = formItemProps.validateFirst,
+    validateFirst = _formItemProps$valida === void 0 ? true : _formItemProps$valida,
     otherFormItemProps = (0, _objectWithoutProperties2.default)(formItemProps, _excluded);
   // 更新show & disabled & rules
   var _useShouldUpdate = (0, _useShouldUpdate2.default)({
@@ -156,7 +158,7 @@ var Render = function Render(props) {
     required: false
   } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的，其次取ProConfigProvider配置的
   (0, _objectSpread2.default)({}, (0, _index.isUpperCase)(type, upperCase)), {
-    validateFirst: true
+    validateFirst: validateFirst
   },
   // 当某一规则校验不通过时，是否停止剩下的规则的校验
   {