@zat-design/sisyphus-react 4.1.2-beta.2 → 4.1.2-beta.3

package/es/ProEditTable/components/RenderField/index.js

@@ -208,7 +208,7 @@ var RenderField = _ref => {
     label: label,
     labelRequired,
     required: !isView && _required,
-    rules: _isEditing ? _rules : [],
+    rules: !isView ? _rules : [],
     isSelect: isSelect({
       dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
       type
@@ -709,18 +709,35 @@ var RenderField = _ref => {
     if (shouldUpdateMode) {
       // 重新获取最新的行数据
       var latestRowData = form.getFieldValue([...namePath, index]) || record || {};
-      var latestOptions = {
-        index,
+      var latestReactiveParams = {
         form,
-        name: column === null || column === void 0 ? void 0 : column.name,
+        index,
         namePath: [...namePath, index]
       };
-      var latestRowParams = [latestRowData, latestOptions];
+      var latestRowParams = [latestRowData, latestReactiveParams];
 
-      // 重新计算 fieldProps
+      // ⭐ 关键修改：shouldUpdate 模式下，跳过缓存，直接重新计算所有响应式属性
       var latestFieldProps = fieldProps || formItemProps || {};
       if (isFunction(fieldProps)) {
-        latestFieldProps = fieldProps(...latestRowParams);
+        latestFieldProps = fieldProps(latestRowData, latestReactiveParams);
+      }
+
+      // 重新计算 required（用于可能的后续逻辑）
+      var latestRequired = required;
+      if (isFunction(required)) {
+        latestRequired = required(latestRowData, latestReactiveParams);
+      }
+
+      // 重新计算 rules（用于可能的后续逻辑）
+      var latestRules = rules;
+      if (isFunction(rules)) {
+        latestRules = rules(latestRowData, latestReactiveParams);
+      }
+
+      // 重新计算 desensitization
+      var latestDesensitization = desensitization || [];
+      if (isFunction(desensitization)) {
+        latestDesensitization = desensitization(latestRowData, latestReactiveParams);
       }
 
       // 重新计算 disabled
@@ -733,10 +750,12 @@ var RenderField = _ref => {
         params: latestRowParams
       });
 
-      // 更新 componentProps 中的 disabled 和 fieldProps
-      finalComponentProps = _objectSpread(_objectSpread({}, componentProps), {}, {
+      // 更新 componentProps 中的所有响应式属性
+      finalComponentProps = _objectSpread(_objectSpread(_objectSpread({}, componentProps), {}, {
         disabled: latestDisabled
-      }, latestFieldProps);
+      }, latestFieldProps), {}, {
+        desensitization: latestDesensitization
+      });
     }
     var FormItem = null;
     // 当 viewRender 存在时，需要排除 finalComponentProps 中的 children，避免覆盖 Container 的 children
@@ -843,20 +862,26 @@ export default /*#__PURE__*/memo(RenderField, (prevProps, nextProps) => {
   }
 
   // fieldProps 函数化直接更新，无法比对返回值是否一致
+  // 优化：不直接调用函数，而是比较输入参数（record 和 reactiveParams）
+  // 如果输入参数相同，fieldProps 的返回值应该相同（纯函数假设）
   if (isFunction(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.fieldProps) && isFunction(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.fieldProps)) {
-    var prevFieldProps = prevColumn.fieldProps(prevRecord, prevReactiveParams);
-    var nextFieldProps = nextColumn.fieldProps(nextRecord, nextReactiveParams);
-    if (!isEqualWith(prevFieldProps, nextFieldProps, customEqualForFunction)) {
+    // 比较 record 数据是否变化
+    if (!isEqualWith(prevRecord, nextRecord, customEqualForFunction)) {
       return false;
     }
+    // reactiveParams 中的 form、index、namePath 已经在外层比较过了，无需重复比较
   }
 
   // 通用函数比较方法
+  // 优化：不直接调用函数，而是比较输入参数
+  // 对于纯函数，如果输入相同则输出相同
   var compareFunctionResult = (prevColumn, nextColumn, prevValues, nextValues, prevReactiveParams, nextReactiveParams, functionName) => {
     var prevFunc = prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn[functionName];
     var nextFunc = nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn[functionName];
     if (isFunction(prevFunc) && isFunction(nextFunc)) {
-      return isEqualWith(prevFunc(prevValues, prevReactiveParams), nextFunc(nextValues, nextReactiveParams), customEqualForFunction);
+      // 比较输入参数而不是调用函数
+      // 如果 values 相同，则函数结果应该相同（纯函数假设）
+      return isEqualWith(prevValues, nextValues, customEqualForFunction);
     }
     return true; // 如果不是函数或只有一个是函数，认为相等
   };

package/es/ProEditTable/utils/index.js

@@ -41,7 +41,8 @@ var getActionColumn = config => {
     actionProps = _cloneDeepWith.actionProps,
     page = _cloneDeepWith.page,
     rowDisabled = _cloneDeepWith.rowDisabled,
-    actionDirection = _cloneDeepWith.actionDirection;
+    actionDirection = _cloneDeepWith.actionDirection,
+    editingKeys = _cloneDeepWith.editingKeys;
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);
   // actionProps配置为false 默认不插入
@@ -89,7 +90,7 @@ var getActionColumn = config => {
     action.onEvent = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, _ref) {
         var _form$getFieldValue;
-        var index, form, name, namePath, tableLength, selectedRows, rowName, lastRecord, onEvent, result, actionHandler;
+        var index, form, name, namePath, tableLength, selectedRows, rowName, _isEditing, lastRecord, onEvent, result, actionHandler;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -97,33 +98,39 @@ var getActionColumn = config => {
               index = tools.calc(firstIndex, '+', index);
               rowName = [...virtualRowName, index];
               if (!(type === 'save')) {
-                _context.next = 13;
+                _context.next = 15;
                 break;
               }
-              _context.prev = 4;
-              _context.next = 7;
+              // 判断该行是否处于编辑状态
+              _isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record._addFlag; // 只有编辑中的行才需要校验
+              if (!_isEditing) {
+                _context.next = 15;
+                break;
+              }
+              _context.prev = 6;
+              _context.next = 9;
               return customValidate(validateKeys, form, rowName);
-            case 7:
-              _context.next = 13;
-              break;
             case 9:
-              _context.prev = 9;
-              _context.t0 = _context["catch"](4);
+              _context.next = 15;
+              break;
+            case 11:
+              _context.prev = 11;
+              _context.t0 = _context["catch"](6);
               handleScrollToError();
               return _context.abrupt("return", Promise.reject(_context.t0));
-            case 13:
+            case 15:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               lastRecord = filterInternalFields((_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record); // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
               if (onEvent) {
-                _context.next = 19;
+                _context.next = 21;
                 break;
               }
               result = true;
-              _context.next = 22;
+              _context.next = 24;
               break;
-            case 19:
-              _context.next = 21;
+            case 21:
+              _context.next = 23;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(lastRecord, {
                 form,
                 index,
@@ -132,9 +139,9 @@ var getActionColumn = config => {
                 namePath,
                 selectedRows
               });
-            case 21:
+            case 23:
               result = _context.sent;
-            case 22:
+            case 24:
               if (result !== false && type !== 'custom') {
                 actionHandler = actions[type];
                 actionHandler(_objectSpread(_objectSpread({}, config), {}, {
@@ -145,11 +152,11 @@ var getActionColumn = config => {
                   validateKeys
                 }));
               }
-            case 23:
+            case 25:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[4, 9]]);
+        }, _callee, null, [[6, 11]]);
       }));
       return function (_x, _x2) {
         return _ref2.apply(this, arguments);

package/es/ProEditTable/utils/useShouldUpdateForTable.js

@@ -25,6 +25,7 @@ var useShouldUpdateForTable = props => {
     reRender = _useState2[1];
   var debouncedUpdateRef = useRef(null);
   var pendingParamsRef = useRef(null);
+  var isInitializedRef = useRef(false);
 
   // 统一处理所有动态属性的更新
   var processUpdate = params => {
@@ -121,13 +122,23 @@ var useShouldUpdateForTable = props => {
   }, [shouldUpdateDebounce, column]);
 
   // 统一的属性处理逻辑
-  if (shouldUpdateDebounce > 0 && debouncedUpdateRef.current) {
-    // 使用防抖延迟更新
-    pendingParamsRef.current = rowParams;
-    debouncedUpdateRef.current();
-  } else {
-    // 立即更新（shouldUpdateDebounce = 0 或无防抖函数）
-    processUpdate(rowParams);
+  // 使用 ref 存储上一次的 rowParams，避免引用变化导致的重复调用
+  var prevRowParamsRef = useRef(null);
+
+  // 只有当 rowParams 内容真正变化时才处理更新
+  // 或者是第一次初始化
+  var shouldProcess = !isInitializedRef.current || !isEqualWith(prevRowParamsRef.current, rowParams, customEqualForFunction);
+  if (shouldProcess) {
+    prevRowParamsRef.current = rowParams;
+    isInitializedRef.current = true;
+    if (shouldUpdateDebounce > 0 && debouncedUpdateRef.current) {
+      // 使用防抖延迟更新
+      pendingParamsRef.current = rowParams;
+      debouncedUpdateRef.current();
+    } else {
+      // 立即更新（shouldUpdateDebounce = 0 或无防抖函数）
+      processUpdate(rowParams);
+    }
   }
   return {
     isEditable: (_isEditableRef$curren = isEditableRef.current) !== null && _isEditableRef$curren !== void 0 ? _isEditableRef$curren : column.isEditable,

package/es/ProForm/components/combination/Group/component/ComRender.d.ts

@@ -20,6 +20,8 @@ interface Props {
     formItemClassName?: string;
     formItemStyle?: React.CSSProperties;
     dependencies?: NamePath[];
+    required?: boolean;
+    rules?: any[];
 }
 /** 渲染组件 */
 declare const ComRender: React.FC<Props>;

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -89,6 +89,16 @@ var ComRender = props => {
   // 传统模式 compact 模式：需要 Form.Item 包装并应用宽度样式
   // 通过 formItemClassName 和 formItemStyle 来判断是否需要 Form.Item 包装
   if (formItemClassName && name) {
+    // 从 rest 中提取 required 和 rules，在非编辑态时移除校验
+    var formItemProps = _objectSpread({
+      name,
+      className: formItemClassName,
+      style: formItemStyle
+    }, isView ? {} : {
+      required: rest === null || rest === void 0 ? void 0 : rest.required,
+      rules: rest === null || rest === void 0 ? void 0 : rest.rules
+    });
+
     // 如果有依赖字段，使用 shouldUpdate 来实时更新错误状态
     if (dependencies && dependencies.length > 0) {
       return /*#__PURE__*/_jsx(Form.Item, {
@@ -102,7 +112,7 @@ var ComRender = props => {
           });
           var hasChanged = currentFieldChanged || dependenciesChanged;
           // 当检测到变化时，触发字段校验以更新错误状态
-          if (hasChanged && contextProps !== null && contextProps !== void 0 && contextProps.form && name) {
+          if (hasChanged && contextProps !== null && contextProps !== void 0 && contextProps.form && name && !isView) {
             setTimeout(() => {
               contextProps.form.validateFields([name]).catch(() => {});
             }, 0);
@@ -110,10 +120,7 @@ var ComRender = props => {
           return hasChanged;
         },
         noStyle: true,
-        children: () => /*#__PURE__*/_jsx(Form.Item, {
-          name: name,
-          className: formItemClassName,
-          style: formItemStyle,
+        children: () => /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, formItemProps), {}, {
           children: /*#__PURE__*/_jsx(FieldProvider, {
             value: _objectSpread(_objectSpread({}, contextProps), {}, {
               valueType,
@@ -122,14 +129,11 @@ var ComRender = props => {
             }),
             children: renderComponent
           })
-        })
+        }))
       });
     }
     // 没有依赖字段，直接渲染 Form.Item
-    return /*#__PURE__*/_jsx(Form.Item, {
-      name: name,
-      className: formItemClassName,
-      style: formItemStyle,
+    return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, formItemProps), {}, {
       children: /*#__PURE__*/_jsx(FieldProvider, {
         value: _objectSpread(_objectSpread({}, contextProps), {}, {
           valueType,
@@ -138,7 +142,7 @@ var ComRender = props => {
         }),
         children: renderComponent
       })
-    });
+    }));
   }
 
   // 非传统模式 compact 模式：直接渲染组件

package/es/ProForm/components/combination/Group/component/FlexibleGroup.js

@@ -118,16 +118,16 @@ var FlexibleGroupRender = props => {
     var childDisabled = typeof child.disabled === 'function' ? false : child.disabled;
     var finalDisabled = groupDisabled || childDisabled;
 
-    // 构建 formItemProps
+    // 构建 formItemProps - 在非编辑态时移除校验规则
     var formItemProps = {
       name: fullName,
       label: child.label,
-      rules: child.rules,
+      rules: isView ? undefined : child.rules,
       dependencies: processedDependencies,
       extra: child.extra,
       before: child.before,
       after: child.after,
-      required: child.required,
+      required: isView ? undefined : child.required,
       disabled: finalDisabled,
       validateFirst: child.validateFirst
     };
@@ -148,13 +148,40 @@ var FlexibleGroupRender = props => {
       formItemProps.tooltip = child.tooltip;
     }
 
+    // 在ProEditTable场景下，如果同组其他字段有值，则当前字段空值不显示 -
+    var childViewEmpty = otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty;
+    if (isView && (otherProps === null || otherProps === void 0 ? void 0 : otherProps.source) === 'ProEditTable' && form && children.length > 1) {
+      // 检查同组其他字段是否有值
+      var hasOtherValues = children.some(otherChild => {
+        if (otherChild === child) return false; // 跳过当前字段
+
+        var otherChildNamePath = otherChild.namePath || contextProps.namePath;
+        var otherFullName = (() => {
+          if (otherChildNamePath && Array.isArray(otherChild.name) && otherChild.name.length > 1) {
+            return [...otherChildNamePath, ...otherChild.name];
+          }
+          if (otherChildNamePath) {
+            return [...otherChildNamePath, otherChild.name];
+          }
+          return otherChild.name;
+        })();
+        var value = form.getFieldValue(otherFullName);
+        return value !== undefined && value !== null && value !== '';
+      });
+
+      // 如果有其他字段有值，当前字段空值显示为空字符串
+      if (hasOtherValues) {
+        childViewEmpty = '';
+      }
+    }
+
     // 构建 otherProps
     var renderOtherProps = {
       label: child.label,
       name: fullName,
       disabled: finalDisabled,
       isView,
-      viewEmpty: otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty,
+      viewEmpty: childViewEmpty,
       valueType: child.valueType,
       form,
       type,
@@ -268,12 +295,16 @@ var FlexibleGroupRender = props => {
       elements.push(formElement);
 
       // 添加分隔符
-      if (index < visibleChildren.length - 1 && space !== null && space !== void 0 && space.separator) {
+      // 查看模式下，如果没有配置separator，使用默认的 finalSeparator
+      var separatorToUse = isView ? (space === null || space === void 0 ? void 0 : space.separator) || finalSeparator : space === null || space === void 0 ? void 0 : space.separator;
+      if (index < visibleChildren.length - 1 && separatorToUse) {
         var shouldAddSeparator = space.separatorIndex ? Array.isArray(space.separatorIndex) ? space.separatorIndex.includes(originalIndex) : space.separatorIndex === originalIndex : true;
         if (shouldAddSeparator) {
+          // 查看模式下使用不同的className，避免显示边框
+          var separatorClassName = isView ? 'pro-group-separator-compact pro-group-separator-view' : 'pro-group-separator-compact';
           elements.push( /*#__PURE__*/_jsx("span", {
-            className: "pro-group-separator-compact",
-            children: space.separator
+            className: separatorClassName,
+            children: separatorToUse
           }, child.name ? `separator-${child.name}` : `separator-${originalIndex}`));
         }
       }
@@ -303,6 +334,29 @@ var FlexibleGroupRender = props => {
     return (otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty) || '-';
   }
 
+  // 查看模式下，检查所有children的值是否都为空
+  if (isView && form && children.length > 0) {
+    var allValuesEmpty = children.every(child => {
+      var childNamePath = child.namePath || contextProps.namePath;
+      var fullName = (() => {
+        if (childNamePath && Array.isArray(child.name) && child.name.length > 1) {
+          return [...childNamePath, ...child.name];
+        }
+        if (childNamePath) {
+          return [...childNamePath, child.name];
+        }
+        return child.name;
+      })();
+      var value = form.getFieldValue(fullName);
+      return value === undefined || value === null || value === '';
+    });
+
+    // 如果所有值都为空，显示一个 -
+    if (allValuesEmpty) {
+      return (otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty) || '-';
+    }
+  }
+
   // 渲染内容
   var renderContent = () => {
     return /*#__PURE__*/_jsx("div", {

package/es/ProForm/components/combination/Group/style/index.less

@@ -4,6 +4,15 @@
   display: flex;
   width: unset !important;
 
+  &.pro-group-view {
+    .pro-group-form-item {
+      flex: 0 0 auto !important;
+   
+    }
+    .@{ant-prefix}-space-compact .pro-group-separator-compact{
+      color: #333 !important;
+    }
+  }
 
 
   &.pro-group-view {
@@ -385,6 +394,13 @@
       // margin: 0 !important;
     }
 
+    // 查看模式下，Form.Item不平分空间，而是根据内容自适应
+    &.pro-group-view {
+      .pro-group-form-item {
+        flex: 0 0 auto;
+      }
+    }
+
     // 当有自定义宽度时，只有设置了宽度的 Form.Item 不使用 flex:1
     &.pro-group-diy-width {
       // 覆盖 Space.Compact 内设置了宽度的 Form.Item
@@ -430,7 +446,7 @@
         }
 
         .@{ant-prefix}-input-number-input {
-          border-left: 1px solid #ff4d4f !important;
+          border-left: 0 !important;
         }
       }
 
@@ -467,6 +483,15 @@
     margin-left: -1px;
   }
 
+  // 查看模式下的分隔符样式 - 移除边框，使用简洁样式
+  .pro-group-separator-view {
+    border: none !important;
+    background: transparent !important;
+    padding: 0 2px !important;
+    margin-inline-start: 0 !important;
+    color: #999 !important;
+  }
+
 
   /* 1. 处理第一个子元素：左上、左下圆角 */
   > .pro-group-form-item:first-child{

package/es/ProForm/components/combination/Group/utils/index.d.ts

@@ -75,21 +75,13 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
-    id?: string;
-    className?: string;
-    hidden?: boolean;
-    style?: React.CSSProperties;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    onReset?: () => void;
-    prefixCls?: string;
-    status?: "" | "warning" | "error" | "success" | "validating";
-    rootClassName?: string;
-    isView?: boolean;
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     colon?: boolean;
     htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
     vertical?: boolean;
+    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
     normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
@@ -97,36 +89,44 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     messageVariables?: Record<string, string>;
     initialValue?: any;
+    onReset?: () => void;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
     preserve?: boolean;
     isListField?: boolean;
     isList?: boolean;
+    prefixCls?: string;
     noStyle?: boolean;
+    style?: React.CSSProperties;
+    className?: string;
+    rootClassName?: string;
+    id?: string;
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
-    validateStatus?: "" | "warning" | "error" | "success" | "validating";
+    validateStatus?: "" | "success" | "warning" | "error" | "validating";
+    hidden?: boolean;
     layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
+    status?: "" | "success" | "warning" | "error" | "validating";
     help?: React.ReactNode;
     fieldId?: string;
-    valueType?: import("../../../render/propsType").ProFormValueType;
+    toISOString?: boolean;
+    toCSTString?: boolean;
     switchValue?: [any, any];
+    clearNotShow?: boolean;
+    valueType?: import("../../../render/propsType").ProFormValueType;
     viewRender?: (value: any, record: any, { form, index, namePath, }: {
         [key: string]: any;
         form: FormInstance<any>;
         index?: number;
     }) => string | React.ReactElement<any, any>;
-    viewType?: import("../../../render/propsType").ViewType;
     trim?: boolean;
-    upperCase?: boolean;
-    toISOString?: boolean;
-    toCSTString?: boolean;
-    clearNotShow?: boolean;
     desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
+    isView?: boolean;
+    upperCase?: boolean;
+    viewType?: import("../../../render/propsType").ViewType;
     name: any;
     dependencies: any[];
     tooltip: string | {
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
  * 创建组件属性
  */
 export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
-    componentProps: import("lodash").Omit<any, "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
+    componentProps: import("lodash").Omit<any, "format" | "toISOString" | "toCSTString" | "switchValue" | "precision" | "clearNotShow" | "dependNames" | "valueType">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/es/ProForm/components/combination/ProCascader/propsType.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { DefaultOptionType } from 'rc-select/lib/Select';
+import { DefaultOptionType } from '@rc-component/select/es/Select';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 export interface FieldNamesType {
     label: string;

package/es/ProForm/propsType.d.ts

@@ -1,9 +1,9 @@
+import React, { ReactNode } from 'react';
 import { ButtonProps, ColProps, RowProps } from 'antd';
 import { FormProps, FormInstance } from 'antd/es/form/Form';
 import { NamePath } from 'antd/es/form/interface';
-import { StoreValue, Store } from 'rc-field-form/es/interface.d';
-import { ShouldUpdate } from 'rc-field-form/es/Field.d';
-import React, { ReactNode } from 'react';
+import type { StoreValue, Store } from '@rc-component/form/es/interface';
+import type { ShouldUpdate } from '@rc-component/form/es/Field';
 import type { ProFormColumnType, ViewType } from './components/render/propsType';
 import type { ProFormComponentType } from './components';
 export interface ButtonType extends ButtonProps {

package/es/ProForm/utils/transformValue.d.ts

@@ -1,6 +1,6 @@
 import { FormInstance, FormItemProps } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
-import { StoreValue, Store } from 'rc-field-form/es/interface.d';
+import type { StoreValue, Store } from '@rc-component/form/es/interface';
 import type { TransformType } from '../propsType';
 export declare const transformValue: (names: NamePath[], form: FormInstance, fieldName: NamePath, normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue, getValueProps?: FormItemProps['getValueProps']) => TransformType;
 export default transformValue;

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

@@ -1,6 +1,6 @@
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
-import { ValuedNotifyInfo } from 'rc-field-form/es/interface';
+import type { ValuedNotifyInfo } from '@rc-component/form/es/interface';
 export type ModifiedFormInstanceType<T> = FormInstance<T> & {
     isModified?: boolean;
     /** 默认清空设置值的报错状态 */

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

@@ -1,4 +1,5 @@
-import { FormInstance, NamePath } from 'rc-field-form/es/interface';
+import { FormInstance } from 'antd/es/form/Form';
+import { NamePath } from 'antd/es/form/interface';
 export declare function toArray<T>(value?: T | T[] | null): T[];
 /**
  * ProForm的useWatch hook，用于监听表单字段变化

package/es/ProForm/utils/useWatch.js

@@ -112,7 +112,9 @@ function useWatch(dependencies, form, wait) {
       }
     }
     return paths;
-  }, [/* dependencies 故意忽略，与原实现一致 */]);
+  }, [
+    /* dependencies 故意忽略，与原实现一致 */
+  ]);
 
   // 保存防抖函数引用，避免重复创建
   var debouncedFn = useMemo(() => {

package/es/ProUpload/propsType.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { UploadFile } from 'antd/es/upload/interface';
-import { UploadRequestOption } from 'rc-upload/lib/interface';
+import type { UploadRequestOption } from '@rc-component/upload/es/interface';
 export type UploadType = 'drag' | 'button' | 'image';
 export interface UploadFileResType {
     /**