@zat-design/sisyphus-react 4.5.8-beta.4 → 4.5.8-beta.6

package/es/ProAction/components/CheckModalContent/index.d.ts

@@ -1,9 +1,8 @@
-/// <reference types="react" />
 import './index.less';
 interface propsWithCheckModal {
     errorTitle?: string;
     list?: string[];
     [key: string]: any;
 }
-declare const CheckModalContent: (props: propsWithCheckModal) => import("react").JSX.Element;
+declare const CheckModalContent: (props: propsWithCheckModal) => import("react/jsx-runtime").JSX.Element;
 export default CheckModalContent;

package/es/ProDownload/index.d.ts

@@ -1,7 +1,6 @@
-/// <reference types="react" />
 import type { ProDownloadType } from './propsType';
 declare const ProDownload: {
-    (props: ProDownloadType): import("react").JSX.Element;
+    (props: ProDownloadType): import("react/jsx-runtime").JSX.Element;
     downLoadRequest: import("./utils").DownloadRequestProps;
 };
 export default ProDownload;

package/es/ProEditTable/components/ActionButton/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const ActionButton: ({ record, index, config, btnConfig }: any) => React.JSX.Element;
+declare const ActionButton: ({ record, index, config, btnConfig }: any) => import("react/jsx-runtime").JSX.Element;
 export default ActionButton;

package/es/ProEditTable/components/RcTable/BaseTable.d.ts

@@ -2,5 +2,5 @@
 declare const _default: import("react").MemoExoticComponent<({ tableProps, ...resetProps }: {
     [x: string]: any;
     tableProps: any;
-}) => import("react").JSX.Element>;
+}) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/es/ProEditTable/components/RcTable/BaseTable.js

@@ -27,6 +27,7 @@ const BaseTable = ({
     isHideCheckBox,
     rowDraggable,
     pagination,
+    paginationValidationEnabled,
     scroll,
     summary,
     page,
@@ -37,7 +38,7 @@ const BaseTable = ({
   const [errorLength] = useEditTableError({
     containerNode: tableRef.current,
     className: 'ant-form-item-explain-error',
-    isEnabled: pagination // 分页时启用
+    isEnabled: paginationValidationEnabled
   });
   const getScroll = useCallback(() => {
     if (!scroll) return null;
@@ -87,17 +88,17 @@ const BaseTable = ({
         });
       },
       itemRender: (index, type, originalElement) => {
-        return type === 'page' && page.pageNum === index && errorLength ? /*#__PURE__*/_jsxs("div", {
+        return paginationValidationEnabled && type === 'page' && page.pageNum === index && errorLength ? /*#__PURE__*/_jsxs("div", {
           className: "pro-edit-table-pagination-item-badge",
           children: [/*#__PURE__*/_jsx(Badge, {
             count: errorLength
           }), originalElement]
         }) : originalElement;
       },
-      onChange: handlePageChange,
-      ...pagination,
-      current: page.pageNum,
-      pageSize: page.pageSize
+      ...(typeof pagination === 'object' ? pagination : {}),
+      current: (typeof pagination === 'object' ? pagination.current : undefined) ?? page.pageNum,
+      pageSize: (typeof pagination === 'object' ? pagination.pageSize : undefined) ?? page.pageSize,
+      onChange: handlePageChange
     } : false,
     scroll: getScroll()
   };

package/es/ProEditTable/components/RcTable/DraggableTable.d.ts

@@ -3,5 +3,5 @@ declare const _default: React.MemoExoticComponent<({ tableProps, draggableProps,
     [x: string]: any;
     tableProps: any;
     draggableProps: any;
-}) => React.JSX.Element>;
+}) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/es/ProEditTable/components/RcTable/DraggableTable.js

@@ -165,8 +165,6 @@ const DraggableTable = ({
     ...resetProps,
     rowKey: tableRowKey,
     pagination: pagination ? {
-      current: page.pageNum,
-      pageSize: page.pageSize,
       showSizeChanger: false,
       showQuickJumper: true,
       total: value?.length,
@@ -176,8 +174,10 @@ const DraggableTable = ({
           total
         });
       },
-      onChange: handlePageChange,
-      ...pagination
+      ...(typeof pagination === 'object' ? pagination : {}),
+      current: (typeof pagination === 'object' ? pagination.current : undefined) ?? page.pageNum,
+      pageSize: (typeof pagination === 'object' ? pagination.pageSize : undefined) ?? page.pageSize,
+      onChange: handlePageChange
     } : false,
     scroll: getScroll(),
     summary

package/es/ProEditTable/components/RenderField/index.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const _default: React.MemoExoticComponent<({ text: value, record, index, column, config }: any) => React.JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ text: value, record, index, column, config }: any) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

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

@@ -25,7 +25,7 @@ import ConfirmWrapper from "../../../ProForm/components/render/ConfirmWrapper";
 import { getDefaultProps } from "../../utils/getDefaultProps";
 import ListChangedWrapper from "./ListChangedWrapper";
 import useShouldUpdateForTable from "../../utils/useShouldUpdateForTable";
-import { OMIT_FORM_ITEM_AND_DOM_KEYS, arePropsEqual } from "./tools";
+import { OMIT_FORM_ITEM_AND_DOM_KEYS, arePropsEqual, hasRowFunctionDependency, mergeOnFieldChangeRow } from "./tools";
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 const RenderField = ({
   text: value,
@@ -237,21 +237,7 @@ const RenderField = ({
   // 因为这些函数依赖行数据，当行数据变化时需要重新计算
   // 扩展到所有模式（single/multiple/cell），统一行为
   // 注意：需要检查原始的 component/editRender，而不是处理后的 lastComponent
-  const hasFunctionDependency = _isFunction(column?.disabled) ||
-  // disabled 是函数
-  _isFunction(fieldProps) ||
-  // fieldProps 是函数
-  _isFunction(required) ||
-  // required 是函数
-  _isFunction(rules) ||
-  // rules 是函数
-  _isFunction(column?.isEditable) ||
-  // isEditable 是函数
-  _isFunction(component) ||
-  // component 是函数
-  _isFunction(editRender) ||
-  // editRender 是函数
-  _isFunction(viewRender); // viewRender 是函数
+  const hasFunctionDependency = hasRowFunctionDependency(column);
 
   // 移除 isSingleMode 限制，让所有模式都支持响应式更新
   // 性能优化已通过 useShouldUpdateForTable hook 的缓存和防抖机制实现
@@ -349,8 +335,8 @@ const RenderField = ({
   if (isView) {
     // 存在viewRender覆盖默认值
     if (typeof viewRender === 'function') {
-      currentValue = column?.dataIndex?.includes('-') ? value : currentValue;
-      const View = viewRender(currentValue, record || {}, options);
+      const latestCurrentValue = dataIndex ? rowData?.[dataIndex] : value;
+      const View = viewRender(latestCurrentValue, rowData || {}, options);
       TargetComponent = /*#__PURE__*/_jsx(Container, {
         viewEmpty: viewEmpty,
         children: View
@@ -438,7 +424,20 @@ const RenderField = ({
         TargetComponent?.props?.onFieldChange && (await TargetComponent.props.onFieldChange(...callArgs));
         onFieldChange && (await onFieldChange(...callArgs));
 
-        // onFieldChange 内已通过 form.setFieldValue(子路径) 或原地改 record 更新 store；此处再整行 setFieldValue(rowPath, rowAfter) 易用滞后快照覆盖 Field 刚写入的新值（如 formType）。仅延后读表做校验与 forceUpdate，不再整行回写。
+        // 原地修改 row 会改变 store 内的对象，但不会通知 Form 和只读单元格重新渲染。
+        // 只通知相对回调前真正变化的子字段，避免整行回写覆盖回调内显式 setFieldValue 的新值。
+        const latestStoreRow = form.getFieldValue(rowPath, true) || {};
+        const nextStoreRow = mergeOnFieldChangeRow(orgRow, row, latestStoreRow);
+        if (nextStoreRow !== latestStoreRow) {
+          // ProEditTable 注册在整个列表路径上，子行写入不会通知该 Form.Item。
+          // 以最新列表为底只替换当前行，确保其他行与显式 store 写入不被覆盖。
+          const latestList = form.getFieldValue(namePath, true) || [];
+          const nextList = [...latestList];
+          nextList[index] = nextStoreRow;
+          form.setFieldValue(namePath, nextList);
+        }
+
+        // 延后读取通知后的最新 store，统一处理联动校验与行刷新。
         setTimeout(() => {
           const rowAfter = form.getFieldValue(rowPath, true) ?? row;
           if (validateTrigger && validateTrigger.includes('onChange')) {
@@ -597,7 +596,9 @@ const RenderField = ({
       source: 'ProEditTable'
     }
   }), [cellName, lastFieldProps, TargetComponent?.props, namePath, index, lastDisabled, handleChange, handleBlur, confirm, lastDesensitization, names, originalName, viewEmpty, lastValueType, isView, otherProps?.desensitizationKey]);
-  componentProps = _omit(componentProps, ['onFieldChange', 'namePath', 'index', ...OMIT_FORM_ITEM_AND_DOM_KEYS]);
+  componentProps = _omit(componentProps, ['onFieldChange', 'namePath', 'index',
+  // precision 是 InputNumber 的有效 fieldProps，仅在真正渲染原生 DOM 时过滤
+  ...OMIT_FORM_ITEM_AND_DOM_KEYS.filter(key => key !== 'precision')]);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     lastFormItemProps.valuePropName = 'checked';
   }
@@ -751,7 +752,7 @@ const RenderField = ({
     // 查看模式
     if (latestIsView) {
       if (typeof viewRender === 'function') {
-        const latestCurrentValue = dataIndex ? latestRowData?.[dataIndex] : null;
+        const latestCurrentValue = dataIndex ? latestRowData?.[dataIndex] : value;
         const View = viewRender(latestCurrentValue, latestRowData || {}, options);
         latestTargetComponent = /*#__PURE__*/_jsx(Container, {
           viewEmpty: viewEmpty,

package/es/ProEditTable/components/RenderField/tools.d.ts

@@ -1,5 +1,12 @@
 import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
 import { GetOriginalValueParams, RenderFieldComparableProps } from './propsType';
+/** 判断列是否包含可能依赖整行数据的函数型配置。 */
+export declare const hasRowFunctionDependency: (column: Record<string, any> | null | undefined) => boolean;
+/**
+ * 将 onFieldChange 中原地修改的字段合并到最新 Form Store 行。
+ * Store 若已将同一字段显式写成其他值，则保留 Store 值。
+ */
+export declare const mergeOnFieldChangeRow: (beforeRow: Record<string, any> | null | undefined, mutatedRow: Record<string, any> | null | undefined, latestStoreRow: Record<string, any> | null | undefined) => Record<string, any>;
 /** 列配置中不应透传到 Form.Item 或 DOM 的字段（与 ProForm Render 保持一致） */
 export declare const OMIT_FORM_ITEM_AND_DOM_KEYS: string[];
 /** 克隆子元素时需从 props 中剔除，避免透传到 div 等 DOM 导致 React 警告 */

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

@@ -4,6 +4,33 @@ import _isEqual from "lodash/isEqual";
 import _get from "lodash/get";
 import { customEqualForFunction } from "../../../utils";
 import { getNamePath, isRecordShallowEqual } from "../../utils/tools";
+const ROW_FUNCTION_DEPENDENCY_KEYS = ['component', 'editRender', 'fieldProps', 'rules', 'required', 'disabled', 'isEditable', 'valueType', 'viewRender'];
+
+/** 判断列是否包含可能依赖整行数据的函数型配置。 */
+export const hasRowFunctionDependency = column => ROW_FUNCTION_DEPENDENCY_KEYS.some(key => _isFunction(column?.[key]));
+
+/**
+ * 将 onFieldChange 中原地修改的字段合并到最新 Form Store 行。
+ * Store 若已将同一字段显式写成其他值，则保留 Store 值。
+ */
+export const mergeOnFieldChangeRow = (beforeRow, mutatedRow, latestStoreRow) => {
+  const before = beforeRow || {};
+  const mutated = mutatedRow || {};
+  const latest = latestStoreRow || {};
+  const changedKeys = Array.from(new Set([...Object.keys(before), ...Object.keys(mutated)])).filter(key => !_isEqual(before[key], mutated[key]));
+  let nextRow = latest;
+  changedKeys.forEach(key => {
+    const storeChangedExplicitly = !_isEqual(latest[key], before[key]) && !_isEqual(latest[key], mutated[key]);
+    if (!storeChangedExplicitly) {
+      nextRow = {
+        ...nextRow,
+        [key]: mutated[key]
+      };
+    }
+  });
+  return nextRow;
+};
+
 /** 列配置中不应透传到 Form.Item 或 DOM 的字段（与 ProForm Render 保持一致） */
 export const OMIT_FORM_ITEM_AND_DOM_KEYS = ['format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames', 'shouldCellUpdate' // 表格内部性能优化属性，不应传递给 Form.Item
 ];
@@ -91,9 +118,9 @@ export const arePropsEqual = (prevProps, nextProps) => {
     config: nextConfig
   } = nextProps;
 
-  // 函数型动态属性（component/editRender/fieldProps/rules/required/disabled/isEditable/valueType）
+  // 函数型动态属性（component/editRender/fieldProps/rules/required/disabled/isEditable/valueType/viewRender）
   // 可能依赖行内兄弟字段；行对象为同引用（原地修改）时，浅比较无法区分，需强制重渲染
-  const hasFunctionDependency = _isFunction(prevColumn?.component) || _isFunction(prevColumn?.editRender) || _isFunction(prevColumn?.fieldProps) || _isFunction(prevColumn?.rules) || _isFunction(prevColumn?.required) || _isFunction(prevColumn?.disabled) || _isFunction(prevColumn?.isEditable) || _isFunction(prevColumn?.valueType) || _isFunction(nextColumn?.component) || _isFunction(nextColumn?.editRender) || _isFunction(nextColumn?.fieldProps) || _isFunction(nextColumn?.rules) || _isFunction(nextColumn?.required) || _isFunction(nextColumn?.disabled) || _isFunction(nextColumn?.isEditable) || _isFunction(nextColumn?.valueType);
+  const hasFunctionDependency = hasRowFunctionDependency(prevColumn) || hasRowFunctionDependency(nextColumn);
   if (hasFunctionDependency && prevRecord === nextRecord) {
     return false;
   }

package/es/ProEditTable/components/RenderToolbar/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const RenderToolbar: (config: any) => React.JSX.Element;
+declare const RenderToolbar: (config: any) => import("react/jsx-runtime").JSX.Element;
 export default RenderToolbar;

package/es/ProEditTable/components/Summary/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ProEditTableSummaryColumnType } from '../../propsType';
 interface SummaryProps<T = any> {
     data: T[];
@@ -9,5 +8,5 @@ interface SummaryProps<T = any> {
     };
     rowSelection: any;
 }
-declare const Summary: ({ data, summary, rowSelection }: SummaryProps) => import("react").JSX.Element;
+declare const Summary: ({ data, summary, rowSelection }: SummaryProps) => import("react/jsx-runtime").JSX.Element;
 export default Summary;

package/es/ProEditTable/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import { ProEditTableType } from './propsType';
-declare const ForwardProEditTable: React.ForwardRefExoticComponent<Omit<ProEditTableType, "ref"> & React.RefAttributes<import("./propsType").ProEditTableRefProps>>;
+declare const ForwardProEditTable: React.ForwardRefExoticComponent<Omit<ProEditTableType<any>, "ref"> & React.RefAttributes<import("./propsType").ProEditTableRefProps>>;
 export default ForwardProEditTable;

package/es/ProEditTable/index.js

@@ -25,6 +25,7 @@ const ProEditTable = ({
   className,
   columns,
   mode = 'multiple',
+  paginationMode = 'normal',
   stripe = true,
   draggable = false,
   disabled = false,
@@ -118,6 +119,14 @@ const ProEditTable = ({
     selectedRows,
     page
   } = state;
+  const paginationEnabled = Boolean(pagination);
+  const paginationValidationEnabled = paginationEnabled && paginationMode === 'validate';
+  const paginationConfig = typeof pagination === 'object' ? pagination : undefined;
+  const resolvedPage = useMemo(() => ({
+    pageNum: paginationConfig?.current ?? page.pageNum,
+    pageSize: paginationConfig?.pageSize ?? page.pageSize
+  }), [page.pageNum, page.pageSize, paginationConfig?.current, paginationConfig?.pageSize]);
+  const mergedSelectedRowKeys = rowSelection?.selectedRowKeys ?? selectedRowKeys;
   const virtualRowName = getNamePath(_isArray(name) ? name : [name], virtualKey);
 
   // 样式处理
@@ -166,31 +175,26 @@ const ProEditTable = ({
 
   // 分页变更
   const handlePageChange = useCallback(async (current, pageSize) => {
-    try {
-      if (pagination) {
-        if (pageSize !== page.pageSize) {
-          setState({
-            page: {
-              pageNum: current,
-              pageSize
-            }
-          });
-          return;
-        }
+    if (!paginationEnabled) return;
+    const isPageSizeChange = pageSize !== resolvedPage.pageSize;
+    if (paginationValidationEnabled && !isPageSizeChange) {
+      try {
         await form.validateFields([name], {
           recursive: true
         });
-        setState({
-          page: {
-            pageNum: current,
-            pageSize: pageSize ?? page.pageSize
-          }
-        });
+      } catch (error) {
+        handleScrollToError();
+        return;
       }
-    } catch (error) {
-      handleScrollToError();
     }
-  }, [pagination, page.pageSize, form, name]);
+    setState({
+      page: {
+        pageNum: current,
+        pageSize: pageSize ?? resolvedPage.pageSize
+      }
+    });
+    paginationConfig?.onChange?.(current, pageSize);
+  }, [form, name, paginationConfig?.onChange, paginationEnabled, paginationValidationEnabled, resolvedPage.pageSize]);
   const config = useMemo(() => ({
     form,
     mode,
@@ -205,7 +209,7 @@ const ProEditTable = ({
     actionProps,
     toolbarProps,
     setState,
-    selectedRowKeys,
+    selectedRowKeys: mergedSelectedRowKeys,
     selectedRows,
     onlyOneLineMsg,
     deletePoConfirmMsg,
@@ -220,7 +224,7 @@ const ProEditTable = ({
     tableRef,
     max,
     tableLength: value?.length,
-    page,
+    page: resolvedPage,
     originalValues,
     errorStore: errorStoreRef.current,
     prefixCls,
@@ -236,7 +240,7 @@ const ProEditTable = ({
     ...resetProps
   }), [actionDirection, actionProps, actionWidth, columns, deletePoConfirmMsg, diffConfig, editingKeys, emptyBtnText, form,
   // forceUpdate 不应该作为依赖项，因为它是触发刷新的信号，而非用于比较的数据
-  getIsNew, handlePageChange, insertType, isView, max, mode, mulDeletePoConfirmMsg, name, namePath, onlyOneLineMsg, originalValues, prefixCls, requiredAlign, resetProps, rowDisabled, selectedRowKeys, selectedRows, shouldUpdateDebounce, tableRef, toolbarProps, value?.length, viewEmpty, virtualKey, page]);
+  getIsNew, handlePageChange, insertType, isView, max, mode, mulDeletePoConfirmMsg, name, namePath, onlyOneLineMsg, originalValues, prefixCls, requiredAlign, resetProps, rowDisabled, mergedSelectedRowKeys, selectedRows, shouldUpdateDebounce, tableRef, toolbarProps, value?.length, viewEmpty, virtualKey, resolvedPage]);
 
   // 编辑行设置下样式
   const _rowClassName = record => {
@@ -267,19 +271,12 @@ const ProEditTable = ({
   }, [toolbarProps]);
 
   // 是否隐藏勾选框
-  const isHideCheckBox = isForbiddenBtn('mulDelete');
+  const isHideCheckBox = !rowSelection && isForbiddenBtn('mulDelete');
 
   // 复选框
   const _rowSelection = {
     fixed: true,
-    selectedRowKeys,
     columnWidth: 48,
-    onChange: (selectedRowKeys, selectedRows) => {
-      setState({
-        selectedRowKeys,
-        selectedRows
-      });
-    },
     getCheckboxProps: record => {
       if (rowDisabled) {
         const _disabled = rowDisabled(record);
@@ -290,7 +287,15 @@ const ProEditTable = ({
       return {};
     },
     hideSelectAll: isHideCheckBox,
-    ...rowSelection
+    ...rowSelection,
+    selectedRowKeys: mergedSelectedRowKeys,
+    onChange: (nextSelectedRowKeys, nextSelectedRows, info) => {
+      setState({
+        selectedRowKeys: nextSelectedRowKeys,
+        selectedRows: nextSelectedRows
+      });
+      rowSelection?.onChange?.(nextSelectedRowKeys, nextSelectedRows, info);
+    }
   };
 
   // 空列表状态
@@ -411,13 +416,14 @@ const ProEditTable = ({
     isHideCheckBox,
     rowDraggable,
     pagination,
+    paginationValidationEnabled,
     scroll,
     summary: _summary,
-    page,
+    page: resolvedPage,
     formatMessage,
     locale,
     handlePageChange
-  }), [_className, _columns, _rowClassName, disabled, editingKeys, formatMessage, handlePageChange, headerRender, isHideCheckBox, locale, page, pagination, renderRowSelection, rowDraggable, rowKey, tableRowKey, scroll, _summary, tableRef, enrichedValue, virtualKey]);
+  }), [_className, _columns, _rowClassName, disabled, editingKeys, formatMessage, handlePageChange, headerRender, isHideCheckBox, locale, pagination, paginationValidationEnabled, renderRowSelection, rowDraggable, rowKey, tableRowKey, scroll, _summary, tableRef, enrichedValue, resolvedPage, virtualKey]);
 
   // 拖拽排序后，enrichedValue 中含 _dragIndex/_rowIndex（内部字段），需清除后再传给外部 onChange
   const handleDragChange = useCallback(newValue => {
@@ -446,20 +452,20 @@ const ProEditTable = ({
       ref: affixRef,
       ..._toolbarSticky,
       children: /*#__PURE__*/_jsx("div", {
-        className: `pro-edit-table-toolbar${pagination ? ' pro-edit-table-toolbar-fixed' : ''}`,
+        className: `pro-edit-table-toolbar${paginationEnabled ? ' pro-edit-table-toolbar-fixed' : ''}`,
         children: /*#__PURE__*/_jsx(RenderToolbar, {
           ...config
         })
       })
     }) : /*#__PURE__*/_jsx("div", {
-      className: `pro-edit-table-toolbar${pagination ? ' pro-edit-table-toolbar-fixed' : ''}`,
+      className: `pro-edit-table-toolbar${paginationEnabled ? ' pro-edit-table-toolbar-fixed' : ''}`,
       children: /*#__PURE__*/_jsx(RenderToolbar, {
         ...config
       })
     }) : null, footerRender ? /*#__PURE__*/_jsx("div", {
       className: "pro-edit-table-footer",
       children: footerRender
-    }) : null, pagination ? /*#__PURE__*/_jsx("div", {
+    }) : null, paginationValidationEnabled ? /*#__PURE__*/_jsx("div", {
       id: `pro-edit-table-pagination-${Array.isArray(config.name) ? config.name.filter(Boolean).join('-') : config.name || 'default'}`,
       onClick: () => {
         onPageCheck({
@@ -467,7 +473,7 @@ const ProEditTable = ({
           name,
           value,
           columns,
-          page,
+          page: resolvedPage,
           pagination,
           isView,
           disabled,

package/es/ProEditTable/propsType.d.ts

@@ -232,6 +232,7 @@ export type ProEditTableRefType = ProEditTableRefProps;
  */
 export type ProEditTableMode = 'single' | 'multiple';
 export type ProEditTableModeType = ProEditTableMode;
+export type ProEditTablePaginationMode = 'normal' | 'validate';
 /**
  * 表格插入类型
  */
@@ -268,6 +269,11 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @default multiple
      */
     mode?: ProEditTableMode;
+    /**
+     * 分页行为模式。normal 仅使用 antd 分页，validate 会在切页前校验当前表格
+     * @default normal
+     */
+    paginationMode?: ProEditTablePaginationMode;
     /**
      * 必填对齐方式, 默认右对齐
      * @default right

package/es/ProEditTable/utils/config.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export declare const defaultBtnNameMap: {
     add: any;
     edit: any;
@@ -10,7 +9,7 @@ export declare const defaultBtnNameMap: {
     custom: any;
 };
 export declare const iconMap: {
-    add: import("react").JSX.Element;
+    add: import("react/jsx-runtime").JSX.Element;
 };
 export declare const defaultSingleActionKeys: string[];
 export declare const defaultMultipleActionKeys: string[];

package/es/ProEditTable/utils/index.js

@@ -12,6 +12,7 @@ import { customValidate, getNamePath, splitNames, handleScrollToError, cloneDeep
 import { filterInternalFields } from "../../ProForm/utils";
 import ProTooltip from "../../ProTooltip";
 import { RenderField, ActionButton } from "../components";
+import { hasRowFunctionDependency } from "../components/RenderField/tools";
 import locale from "../../locale";
 
 /**
@@ -345,7 +346,7 @@ export const transformColumns = (columns = [], config, caches) => {
       const hasComponent = _isFunction(item.component);
       // 函数型动态属性会依赖整行数据（可能是当前列之外的兄弟字段），
       // 这类列在行内任意字段变化时都需重渲染，不能只比对本列 dataIndex
-      const hasFunctionDependency = hasComponent || _isFunction(item.editRender) || _isFunction(item.fieldProps) || _isFunction(item.rules) || _isFunction(item.required) || _isFunction(item.disabled) || _isFunction(item.isEditable) || _isFunction(item.valueType);
+      const hasFunctionDependency = hasRowFunctionDependency(item);
       const columnCacheKey = `${Array.isArray(name) ? name.join('.') : String(name)}::${String(columnName)}`;
 
       // Fix 问题1：用原始列引用（克隆前）比对 dataSource
@@ -399,7 +400,7 @@ export const transformColumns = (columns = [], config, caches) => {
             return true;
           }
         }
-        // 函数型动态属性（component/fieldProps/rules/required/disabled/isEditable/valueType）
+        // 函数型动态属性（component/fieldProps/rules/required/disabled/isEditable/valueType/viewRender）
         // 可能依赖行内其他字段（兄弟字段），需比较整行；
         // 同引用原地修改时 isEqual 恒为 true，无法感知，必须强制重渲染
         if (hasFunctionDependency) {

package/es/ProEditTable/utils/useShouldUpdateForTable.js

@@ -24,7 +24,7 @@ const useShouldUpdateForTable = props => {
   const isInitializedRef = useRef(false);
 
   // 统一处理所有动态属性的更新
-  const processUpdate = params => {
+  const processUpdate = (params, forceFieldPropsUpdate = false) => {
     let hasChange = false;
     // 新格式：params = [values, { form, index, namePath }]
     const [values, reactiveParams] = params;
@@ -65,7 +65,7 @@ const useShouldUpdateForTable = props => {
     // fieldProps 处理
     if (_isFunction(column.fieldProps)) {
       const newFieldProps = column.fieldProps(values, reactiveParams);
-      if (!_isEqualWith(fieldPropsRef.current, newFieldProps, customEqualForFunction)) {
+      if (forceFieldPropsUpdate || !_isEqualWith(fieldPropsRef.current, newFieldProps, customEqualForFunction)) {
         fieldPropsRef.current = newFieldProps;
         hasChange = true;
       }
@@ -131,15 +131,22 @@ const useShouldUpdateForTable = props => {
   // 统一的属性处理逻辑
   // 使用 ref 存储上一次的 rowParams，避免引用变化导致的重复调用
   const prevRowParamsRef = useRef(null);
+  const currentFieldPropsFactory = _isFunction(column.fieldProps) ? column.fieldProps : undefined;
+  const prevFieldPropsFactoryRef = useRef(currentFieldPropsFactory);
+  const fieldPropsFactoryChanged = prevFieldPropsFactoryRef.current !== currentFieldPropsFactory;
+  prevFieldPropsFactoryRef.current = currentFieldPropsFactory;
 
   // 行数据引用 + 行索引均不变时跳过深比较（虚拟滚动常见路径）
   const prevRowParams = prevRowParamsRef.current;
   const rowDataUnchanged = isInitializedRef.current && prevRowParams?.[0] === rowParams[0] && prevRowParams?.[1]?.index === rowParams[1]?.index;
-  const shouldProcess = !isInitializedRef.current || !rowDataUnchanged && !_isEqualWith(prevRowParams, rowParams, customEqualForFunction);
+  const shouldProcess = !isInitializedRef.current || fieldPropsFactoryChanged || !rowDataUnchanged && !_isEqualWith(prevRowParams, rowParams, customEqualForFunction);
   if (shouldProcess) {
     prevRowParamsRef.current = rowParams;
     isInitializedRef.current = true;
-    if (shouldUpdateDebounce > 0 && debouncedUpdateRef.current) {
+    if (fieldPropsFactoryChanged) {
+      // 外部依赖变化会生成新的 fieldProps 函数，需要立即替换旧闭包缓存
+      processUpdate(rowParams, true);
+    } else if (shouldUpdateDebounce > 0 && debouncedUpdateRef.current) {
       // 使用防抖延迟更新
       pendingParamsRef.current = rowParams;
       debouncedUpdateRef.current();

package/es/ProEnum/components/Group.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { ProEnumType } from '../propsType';
 interface Props extends Pick<ProEnumType, 'id' | 'value' | 'onChange' | 'dataSource'> {
     fieldValue: string;
@@ -7,5 +6,5 @@ interface Props extends Pick<ProEnumType, 'id' | 'value' | 'onChange' | 'dataSou
     allowClear?: boolean;
     button?: boolean;
 }
-declare const Group: (props: Props) => import("react").JSX.Element;
+declare const Group: (props: Props) => import("react/jsx-runtime").JSX.Element;
 export default Group;

package/es/ProEnum/components/Tag.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="react" />
 import type { ProEnumType } from '../propsType';
 interface Props extends Pick<ProEnumType, 'id' | 'value' | 'onChange' | 'dataSource'> {
     fieldValue: string;
     fieldLabel: string;
 }
-declare const ProEnumTag: (props: Props) => import("react").JSX.Element;
+declare const ProEnumTag: (props: Props) => import("react/jsx-runtime").JSX.Element;
 export default ProEnumTag;

package/es/ProEnum/index.d.ts

@@ -1,10 +1,9 @@
-import React from 'react';
 import useEnum from './hooks/useEnum';
 import getEnum from './utils/getEnum';
 import type { ProEnumType } from './propsType';
 declare const ProEnum: {
-    (props: ProEnumType): React.JSX.Element;
-    getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => React.JSX.Element;
+    (props: ProEnumType): import("react/jsx-runtime").JSX.Element;
+    getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
     useEnum: typeof useEnum;
     getEnum: typeof getEnum;
 };

package/es/ProEnum/utils/getEnumLabel.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
-declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react").JSX.Element;
+declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
 export default getEnumLabel;

package/es/ProForm/components/base/Input/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Props } from './propsType';
-declare const Input: (props: Props) => React.JSX.Element;
+declare const Input: (props: Props) => import("react/jsx-runtime").JSX.Element;
 export default Input;

package/es/ProForm/components/combination/FormList/components/Empty.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import type { FormInstance, FormListOperation } from 'antd';
 import type { InternalNamePath } from 'antd/es/form/interface';
 import type { ToolbarActionType } from '../propsType';
@@ -10,5 +9,5 @@ interface EmptyProps {
     namePath?: InternalNamePath;
     emptyBtnText?: string;
 }
-declare const Empty: ({ disabled, toolbarProps, operation, form, namePath, emptyBtnText }: EmptyProps) => import("react").JSX.Element;
+declare const Empty: ({ disabled, toolbarProps, operation, form, namePath, emptyBtnText }: EmptyProps) => import("react/jsx-runtime").JSX.Element;
 export default Empty;

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

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import type { ProCascaderType } from './propsType';
-declare const _default: import("react").MemoExoticComponent<(props: ProCascaderType) => import("react").JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<(props: ProCascaderType) => import("react/jsx-runtime").JSX.Element>;
 export default _default;