@zat-design/sisyphus-react 4.5.0 → 4.5.2

package/es/ProDrawerForm/components/ProDrawer/index.js

@@ -1,17 +1,17 @@
 import _omit from "lodash/omit";
 import _isArray from "lodash/isArray";
-import { Button, Drawer, Modal } from 'antd';
-import React, { useCallback, useState, useRef, useEffect } from 'react';
+import { Button, Drawer } from 'antd';
+import React, { useCallback, useState, useRef } from 'react';
 import { useScroll } from 'ahooks';
 import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import closeSvg from "../../../assets/close.svg";
-import locale from "../../../locale";
+import { useConfirmClose } from "../../hooks/useConfirmClose";
 
 /**
  * 抽屉组件
  */
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const ProDrawer = ({
   form,
   title,
@@ -31,67 +31,32 @@ const ProDrawer = ({
   children,
   className,
   zIndex,
+  destroyOnHidden,
   drawerProps
 }) => {
   const ref = useRef(null);
-  const modalRef = useRef(null);
   const {
     top
   } = useScroll(ref) || {};
   const [loading, toggleLoading] = useState(false);
-  const [initialSnapshot, setInitialSnapshot] = useState('');
   const noRenderFooter = isView || footer === false || footer === null;
   const {
     mask: drawerMask,
     ...restDrawerProps
   } = drawerProps || {};
-  const drawerWidth = width;
-  const drawerSize = restDrawerProps?.size;
-
-  // 使用 useEffect 在 open 变更时延迟捕获 初始DOM 快照
-  useEffect(() => {
-    if (open) {
-      // 延迟到下一个事件循环，确保 Drawer 已经渲染
-      const timeoutId = setTimeout(() => {
-        if (ref.current) {
-          setInitialSnapshot(ref.current.innerHTML); // 捕获 DOM 快照
-        }
-      }, 100); // 使用 setTimeout 让 DOM 渲染完成后再执行
-
-      return () => clearTimeout(timeoutId); // 清理定时器
-    }
-    setInitialSnapshot('');
-  }, [open]); // 当 open 变化时执行
-
-  // 快照对比
-  const compareSnapshots = () => {
-    if (!ref.current) return false;
-    return ref.current.innerHTML === initialSnapshot;
-  };
-  const onConfirm = useCallback(async () => {
-    // 如果当前是查看状态，或者不需要确认关闭，或者快照对比一致，则直接关闭
-    if (isView || !isConfirmClose || compareSnapshots()) {
-      onCancel && onCancel();
-    } else if (!modalRef.current) {
-      modalRef.current = Modal.confirm({
-        className: 'width430',
-        title: locale?.ProDrawerForm?.isSureClose,
-        okText: locale?.ProDrawerForm?.confirm,
-        cancelText: locale?.ProDrawerForm?.cancel,
-        content: locale?.ProDrawerForm?.secondTipsWhenSave,
-        mask: {
-          blur: false
-        },
-        onOk: () => {
-          onCancel && onCancel();
-        },
-        onCancel: () => {
-          modalRef.current = null;
-        },
-        ...isConfirmCloseModalProps
-      });
-    }
-  }, [onCancel, modalRef.current, ref.current]);
+  // 抽屉宽度统一走 size（antd v6 width 已废弃）；数字优先，自定义 width 兜底
+  const drawerSize = restDrawerProps?.size ?? width;
+  const {
+    markInteracted,
+    onConfirm,
+    contextHolder
+  } = useConfirmClose({
+    open,
+    isView,
+    isConfirmClose,
+    isConfirmCloseModalProps,
+    onCancel
+  });
   const handleFinish = useCallback(async () => {
     try {
       if (open) {
@@ -164,40 +129,47 @@ const ProDrawer = ({
     }
     return defaultFooter;
   };
-  return /*#__PURE__*/_jsxs(Drawer, {
-    width: drawerWidth,
-    size: drawerSize,
-    open: open,
-    mask: drawerMask ?? {
-      blur: false
-    },
-    maskClosable: maskClosable,
-    placement: "right",
-    rootClassName: classNames(className, 'pro-drawer'),
-    closable: false,
-    onClose: onCancel,
-    zIndex: zIndex,
-    ..._omit(restDrawerProps, 'width', 'size'),
-    children: [/*#__PURE__*/_jsx("div", {
-      className: "pro-drawer-close",
-      onClick: onConfirm,
-      children: /*#__PURE__*/_jsx(ReactSVG, {
-        className: "close-icon",
-        src: closeSvg
-      })
-    }), title ? /*#__PURE__*/_jsx("div", {
-      className: `pro-drawer-title ${top > 0 ? 'pro-drawer-scrolling' : ''}`,
-      children: title
-    }) : null, /*#__PURE__*/_jsx("div", {
-      ref: ref,
-      className: "pro-drawer-content",
-      style: {
-        marginTop: title ? 64 : 0,
-        paddingBottom: noRenderFooter ? 0 : 64,
-        height: `calc(100% - ${title ? 64 : 0}px)`
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [contextHolder, /*#__PURE__*/_jsxs(Drawer, {
+      size: drawerSize,
+      open: open,
+      mask: typeof drawerMask === 'object' ? {
+        closable: maskClosable,
+        ...drawerMask
+      } : drawerMask ?? {
+        blur: false,
+        closable: maskClosable
       },
-      children: children
-    }), renderFooter()]
+      placement: "right",
+      rootClassName: classNames(className, 'pro-drawer'),
+      closable: false,
+      onClose: onConfirm,
+      zIndex: zIndex,
+      destroyOnHidden: destroyOnHidden,
+      ..._omit(restDrawerProps, 'width', 'size'),
+      children: [/*#__PURE__*/_jsx("div", {
+        className: "pro-drawer-close",
+        onClick: onConfirm,
+        children: /*#__PURE__*/_jsx(ReactSVG, {
+          className: "close-icon",
+          src: closeSvg
+        })
+      }), title ? /*#__PURE__*/_jsx("div", {
+        className: `pro-drawer-title ${top > 0 ? 'pro-drawer-scrolling' : ''}`,
+        children: title
+      }) : null, /*#__PURE__*/_jsx("div", {
+        ref: ref,
+        className: "pro-drawer-content",
+        onInput: markInteracted,
+        onChange: markInteracted,
+        style: {
+          marginTop: title ? 64 : 0,
+          paddingBottom: noRenderFooter ? 0 : 64,
+          height: `calc(100% - ${title ? 64 : 0}px)`
+        },
+        children: children
+      }), renderFooter()]
+    })]
   });
 };
 export default ProDrawer;

package/es/ProDrawerForm/components/ProModal/index.js

@@ -3,10 +3,12 @@ import React, { useCallback, useState, useRef } from 'react';
 import { Space, Button, Modal } from 'antd';
 import { useScroll, useSize } from 'ahooks';
 import classnames from 'classnames';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useConfirmClose } from "../../hooks/useConfirmClose";
+
 /**
  * 弹窗组件
  */
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const ProModal = ({
   form,
   title,
@@ -15,6 +17,8 @@ const ProModal = ({
   footer,
   isView,
   maskClosable,
+  isConfirmClose,
+  isConfirmCloseModalProps,
   okText,
   cancelText,
   okLoading,
@@ -25,6 +29,7 @@ const ProModal = ({
   className,
   extraLeft,
   zIndex,
+  destroyOnHidden,
   modalProps
 }) => {
   const ref = useRef(null);
@@ -40,6 +45,17 @@ const ProModal = ({
     ...restModalProps
   } = modalProps || {};
   const [loading, toggleLoading] = useState(false);
+  const {
+    markInteracted,
+    onConfirm,
+    contextHolder
+  } = useConfirmClose({
+    open,
+    isView,
+    isConfirmClose,
+    isConfirmCloseModalProps,
+    onCancel
+  });
   const _className = classnames(['pro-modal', className, {
     'pro-modal-scrolling': top > 0,
     'pro-modal-no-footer': noRenderFooter,
@@ -122,25 +138,33 @@ const ProModal = ({
     }
     return defaultFooter;
   };
-  return /*#__PURE__*/_jsx(Modal, {
-    className: _className,
-    title: title,
-    width: width,
-    open: open,
-    mask: modalMask ?? {
-      blur: false
-    },
-    maskClosable: maskClosable,
-    onCancel: onCancel,
-    footer: renderFooter(),
-    okText: okText,
-    cancelText: cancelText,
-    zIndex: zIndex,
-    ...restModalProps,
-    children: /*#__PURE__*/_jsx("div", {
-      ref: ref,
-      children: children
-    })
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [contextHolder, /*#__PURE__*/_jsx(Modal, {
+      className: _className,
+      title: title,
+      width: width,
+      open: open,
+      mask: typeof modalMask === 'object' ? {
+        closable: maskClosable,
+        ...modalMask
+      } : modalMask ?? {
+        blur: false,
+        closable: maskClosable
+      },
+      onCancel: onConfirm,
+      footer: renderFooter(),
+      okText: okText,
+      cancelText: cancelText,
+      zIndex: zIndex,
+      destroyOnHidden: destroyOnHidden,
+      ...restModalProps,
+      children: /*#__PURE__*/_jsx("div", {
+        ref: ref,
+        onInput: markInteracted,
+        onChange: markInteracted,
+        children: children
+      })
+    })]
   });
 };
 export default ProModal;

package/es/ProDrawerForm/hooks/useConfirmClose.js

@@ -0,0 +1,70 @@
+import { useCallback, useEffect, useRef } from 'react';
+import { Modal } from 'antd';
+import { shouldConfirmClose } from "../utils";
+import locale from "../../locale";
+/**
+ * 关闭抽屉/弹窗时的二次确认逻辑
+ *
+ * - markInteracted：绑定到内容容器的 input / change 事件，标记用户真实交互过。
+ *   setFieldsValue 等程序回填不会派发用户输入事件，因此异步回填不会误触发二次确认。
+ * - onConfirm：组件自带关闭入口（右上角 × / 遮罩）的关闭处理。未交互、查看模式或
+ *   未开启二次确认时直接关闭；否则弹出二次确认。底部取消按钮不走此逻辑。
+ * - contextHolder：Modal.useModal 的上下文占位，需渲染进组件，使二次确认弹框能继承
+ *   ConfigProvider 的主题 / 国际化（替代静态 Modal.confirm，消除上下文告警）。
+ */
+export const useConfirmClose = ({
+  open,
+  isView,
+  isConfirmClose,
+  isConfirmCloseModalProps,
+  onCancel
+}) => {
+  const [modal, contextHolder] = Modal.useModal();
+  // 记录用户是否真实交互过表单内容（区别于 setFieldsValue 等程序回填）
+  const userInteractedRef = useRef(false);
+  const confirmingRef = useRef(false);
+
+  // open 变化时重置用户交互标记
+  useEffect(() => {
+    userInteractedRef.current = false;
+  }, [open]);
+  const markInteracted = useCallback(() => {
+    userInteractedRef.current = true;
+  }, []);
+  const onConfirm = useCallback(() => {
+    // 用户真实交互过才弹二次确认；查看模式、未开启确认、或仅程序回填均直接关闭
+    if (!shouldConfirmClose({
+      isView,
+      isConfirmClose,
+      userInteracted: userInteractedRef.current
+    })) {
+      onCancel?.();
+      return;
+    }
+    if (confirmingRef.current) return;
+    confirmingRef.current = true;
+    modal.confirm({
+      className: 'width430',
+      title: locale?.ProDrawerForm?.isSureClose,
+      okText: locale?.ProDrawerForm?.confirm,
+      cancelText: locale?.ProDrawerForm?.cancel,
+      content: locale?.ProDrawerForm?.secondTipsWhenSave,
+      mask: {
+        blur: false
+      },
+      onOk: () => {
+        confirmingRef.current = false;
+        onCancel?.();
+      },
+      onCancel: () => {
+        confirmingRef.current = false;
+      },
+      ...isConfirmCloseModalProps
+    });
+  }, [isView, isConfirmClose, isConfirmCloseModalProps, onCancel, modal]);
+  return {
+    markInteracted,
+    onConfirm,
+    contextHolder
+  };
+};

package/es/ProDrawerForm/index.js

@@ -1,7 +1,7 @@
 import React, { createContext, forwardRef, useContext, useImperativeHandle, useMemo } from 'react';
 import { ProDrawer, ProModal } from "./components";
 import ProForm from "../ProForm";
-import { transformBySize } from "./utils";
+import { resolveDrawerSize } from "./utils";
 import locale from "../locale";
 import { jsx as _jsx } from "react/jsx-runtime";
 const ProDrawerFormContext = /*#__PURE__*/createContext(null);
@@ -26,17 +26,13 @@ const ProDrawerForm = /*#__PURE__*/forwardRef((props, ref) => {
   } = props;
   const nextIsView = isView || disabled;
   const nextOkText = okText ?? (mode === 'Drawer' ? locale?.ProDrawerForm?.save : locale?.ProDrawerForm?.confirm);
-  let {
-    width
+  const {
+    width: deprecatedWidth,
+    ...restPropsWithoutWidth
   } = restProps;
-  if (!width && size) {
-    width = transformBySize(size);
-  }
 
-  // 强转string 类型
-  if (!Number.isNaN(+width)) {
-    width = `${width}px`;
-  }
+  // size 优先；显式传入（已废弃的）width 仍兼容生效并告警
+  const width = resolveDrawerSize(size, deprecatedWidth);
   const [form] = ProForm.useForm(originalForm);
   const handleCancel = () => {
     onCloseClean && form.resetFields();
@@ -56,7 +52,7 @@ const ProDrawerForm = /*#__PURE__*/forwardRef((props, ref) => {
       source: 'ProDrawerForm'
     },
     children: open ? /*#__PURE__*/_jsx(DrawerModal, {
-      ...restProps,
+      ...restPropsWithoutWidth,
       isView: nextIsView,
       open: open,
       form: form,

package/es/ProDrawerForm/utils/index.js

@@ -13,4 +13,40 @@ export const transformBySize = size => {
     default:
       return 960;
   }
+};
+const SIZE_PRESETS = ['small', 'middle', 'large'];
+
+/**
+ * 解析最终尺寸
+ *
+ * - 显式传入（已废弃的）`width` 时打印警告并优先生效，保证向后兼容。
+ * - `size` 命中三档枚举走 `transformBySize`；否则视为自定义数字 / 像素 / 百分比直接返回。
+ */
+export const resolveDrawerSize = (size, width) => {
+  if (width !== undefined && width !== '') {
+    // eslint-disable-next-line no-console
+    console.warn('[ProDrawerForm] `width` 已废弃，请改用 `size`');
+    return width;
+  }
+  if (SIZE_PRESETS.includes(size)) {
+    return transformBySize(size);
+  }
+  return size;
+};
+
+/**
+ * 关闭抽屉时是否需要弹出二次确认
+ *
+ * 判定「用户是否真实改动过」依据 userInteracted —— 它由抽屉内容容器上监听到的
+ * 真实用户输入事件（input / change）置位。打开后通过 setFieldsValue 异步回填
+ * 详情数据属于程序行为，不会派发这些用户事件，因此不会误触发二次确认。
+ */
+export const shouldConfirmClose = params => {
+  const {
+    isView,
+    isConfirmClose,
+    userInteracted
+  } = params;
+  if (isView || !isConfirmClose) return false;
+  return userInteracted;
 };

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

@@ -2,7 +2,11 @@ import _isFunction from "lodash/isFunction";
 import { memo, useCallback } from 'react';
 import { Badge, Table } from 'antd';
 import useEditTableError from "../../utils/useEditTableError";
+
+// 可编辑表格虚拟滚动的固定行高（px）。值取自单元格编辑态实际行高，
+// 透传给内部 rc-virtual-list 用于高度计算，减少滚动时的行测量开销。
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+const VIRTUAL_ROW_HEIGHT = 65;
 const BaseTable = ({
   tableProps,
   ...resetProps
@@ -62,6 +66,12 @@ const BaseTable = ({
       'data-row-draggable': rowDraggable,
       onClick: () => {}
     }),
+    // 虚拟滚动场景下，透传固定行高给内部 rc-virtual-list，帮助其准确计算高度、
+    // 减少滚动时的行测量开销（antd 未导出该属性，但会透传到内部虚拟滚动）。
+    // 行高 65px 为可编辑表格单元格的固定高度；外部显式传入时以外部为准。
+    ...(resetProps?.virtual && resetProps?.listItemHeight == null ? {
+      listItemHeight: VIRTUAL_ROW_HEIGHT
+    } : {}),
     ...resetProps,
     rowKey: tableRowKey,
     summary,

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

@@ -70,7 +70,8 @@ const Summary = ({
         const {
           index,
           colSpan,
-          prefix
+          prefix,
+          key: columnKey
         } = item;
         return /*#__PURE__*/_jsx(Table.Summary.Cell, {
           index: index,
@@ -80,7 +81,7 @@ const Summary = ({
               children: renderCell(item)
             })]
           })
-        }, index);
+        }, columnKey ?? `summary-col-${index}`);
       })
     })
   });

package/es/ProEditTable/utils/tools.js

@@ -16,7 +16,7 @@ import { tools, validate } from '@zat-design/utils';
  * @returns 随机字符串
  */
 export const getRandom = () => {
-  return Math.random().toString(36).slice(-6);
+  return crypto.randomUUID().replace(/-/g, '').slice(0, 6);
 };
 
 /**

package/es/ProEnum/index.js

@@ -137,14 +137,17 @@ const ProEnum = props => {
     let list = [];
 
     // 优先使用组件内部自己传入的数据源或者请求得到的数据
-    list = _cloneDeep(dataList && dataList.length ? dataList : enumLists);
-    // 对数据进行一系列的过滤等操作
+    const sourceList = dataList && dataList.length ? dataList : enumLists;
+    // 仅在需要走 transformResponse 时才克隆，避免污染原始字典；
+    // 否则直接传引用（下游 ProSelect 等仅只读消费），减少滚动重挂载时的 cloneDeep 开销
     if (!useRequest?.service && transformResponse) {
-      list = transformResponse(list);
+      list = transformResponse(_cloneDeep(sourceList));
       if (!Array.isArray(list)) {
         console.error(locale.ProEnum?.errorArrayMessage);
         list = [];
       }
+    } else {
+      list = sourceList;
     }
     if ( /*#__PURE__*/React.isValidElement(component)) {
       const Component = component;

package/es/ProForm/components/combination/FormList/components/ActionButton.js

@@ -182,13 +182,14 @@ const ActionButton = props => {
     align: "start",
     className: "pro-form-list-action",
     children: actionProps?.map(item => {
-      if (item.show === false) return /*#__PURE__*/_jsx("span", {}, `${item?.type}${index}`);
+      const actionKey = `${field.key}-${item?.type ?? item?.label ?? 'action'}`;
+      if (item.show === false) return /*#__PURE__*/_jsx("span", {}, actionKey);
       if (_isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath,
         index,
         form
       })) {
-        return /*#__PURE__*/_jsx("span", {}, `${item?.type}${index}`);
+        return /*#__PURE__*/_jsx("span", {}, actionKey);
       }
       const {
         label,
@@ -295,7 +296,7 @@ const ActionButton = props => {
             onClick: e => e.stopPropagation(),
             children: label || defaultLabel
           })
-        }, `${item?.type}${index}`) : /*#__PURE__*/_jsx(Button, {
+        }, actionKey) : /*#__PURE__*/_jsx(Button, {
           className: classNames({
             'pro-form-list-tool-btn': mode === 'line',
             'pro-form-list-tool-btn-block': mode === 'block',
@@ -313,7 +314,7 @@ const ActionButton = props => {
             }
           },
           children: label || defaultLabel
-        }, `${item?.type}${index}`);
+        }, actionKey);
       }
       return needConfirm ? /*#__PURE__*/_jsx(Popconfirm, {
         title: title ?? `${locale.ProForm.formListConfirmMessage}`,
@@ -326,9 +327,9 @@ const ActionButton = props => {
           onClick: e => e.stopPropagation(),
           children: label
         })
-      }, `${item?.type}${index}`) : /*#__PURE__*/_createElement(Button, {
+      }, actionKey) : /*#__PURE__*/_createElement(Button, {
         ..._omit(rest, filterKeys),
-        key: `${item?.type}${index}`,
+        key: actionKey,
         type: "text",
         onClick: e => {
           e.stopPropagation();

package/es/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -108,7 +108,7 @@ const ToolbarButton = props => {
   return /*#__PURE__*/_jsx(Space, {
     align: "start",
     className: "pro-form-list-toolbar",
-    children: toolbarProps?.map((item, index) => {
+    children: toolbarProps?.map(item => {
       if (item.show === false) return /*#__PURE__*/_jsx(_Fragment, {});
       if (_isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath,
@@ -123,6 +123,7 @@ const ToolbarButton = props => {
         type,
         ...rest
       } = item;
+      const toolbarKey = `${namePath.join('.')}-${type ?? 'custom'}-${label ?? ''}`;
       const _onClick = onClick || onHandle;
       if (type === 'add') {
         if (disabled || isView) return /*#__PURE__*/_jsx(_Fragment, {});
@@ -141,14 +142,14 @@ const ToolbarButton = props => {
           type: "link",
           onClick: () => handleClick(internalOnClick, _onClick, item),
           children: label || defaultLabel
-        }, `${type}${index}`);
+        }, toolbarKey);
       }
       return /*#__PURE__*/_jsx(Button, {
         ..._omit(rest, filterKeys),
         type: "link",
         onClick: () => customClick(onClick, item),
         children: label
-      }, `${type}${index}`);
+      }, toolbarKey);
     })
   });
 };

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -16,6 +16,7 @@ import viewSvg from "../../../../assets/view.svg";
 import useRequestList from "./hooks/useRequestList";
 import locale from "../../../../locale";
 import { hideTooltipIfOpen } from "./utils";
+import { mergeSelectedRows } from "./utils/mergeSelectedRows";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const ProModalSelect = (props, ref) => {
   const {
@@ -80,7 +81,7 @@ const ProModalSelect = (props, ref) => {
   const isMultiple = type === 'checkbox';
 
   // 生成一个唯一id，用于满足tooltip功能
-  const uuid = Math.random().toString(36).slice(-6);
+  const uuid = crypto.randomUUID().slice(0, 8);
 
   // 全局配置fieldNames指定 value与label的key
   const {
@@ -335,10 +336,14 @@ const ProModalSelect = (props, ref) => {
   };
   const _rowSelection = {
     type,
+    // 多选时开启，保证翻页/筛选后不丢弃不在当前页的已选 key
+    preserveSelectedRowKeys: isMultiple,
     onChange: (rowKeys, rows) => {
+      // 多选时合并跨页已选行：antd 回传的 rows 中不在当前页的为 undefined，用历史 selectedRows 补全
+      const nextSelectedRows = isMultiple ? mergeSelectedRows(selectedRows, rowKeys, rows, getRowKey) : rows;
       setState({
         selectedRowKeys: rowKeys,
-        selectedRows: rows
+        selectedRows: nextSelectedRows
       });
     },
     getCheckboxProps: record => ({

package/es/ProForm/components/combination/ProModalSelect/utils/mergeSelectedRows.js

@@ -0,0 +1,26 @@
+/**
+ * 合并跨页/筛选场景下的多选行数据
+ *
+ * antd Table 开启 preserveSelectedRowKeys 后，onChange 回传的 rowKeys 是全量（含不在当前页的 key），
+ * 但 rows 中不在当前 dataSource 的行对象会是 undefined。此函数用历史已选行（prevRows）补全这些缺失的行对象，
+ * 保证返回的 rows 与 rowKeys 全量对齐，从而避免翻页/精准筛选后丢失已选数据。
+ *
+ * @param prevRows 历史已选行（累积缓存）
+ * @param nextRowKeys antd 回传的全量选中 key
+ * @param nextRows antd 回传的行对象（不在当前页的为 undefined）
+ * @param getRowKey 取行 key 的方法
+ * @returns 与 nextRowKeys 对齐的全量行对象（无法找到行对象的 key 会被过滤）
+ */
+export const mergeSelectedRows = (prevRows, nextRowKeys, nextRows, getRowKey) => {
+  // 用 key -> row 建立查找表：当前页最新行覆盖历史行
+  const rowMap = new Map();
+  prevRows?.forEach(row => {
+    if (row) rowMap.set(getRowKey(row), row);
+  });
+  nextRows?.forEach(row => {
+    if (row) rowMap.set(getRowKey(row), row);
+  });
+
+  // 按 nextRowKeys 顺序取行对象，取不到的（无缓存）过滤掉
+  return nextRowKeys.map(key => rowMap.get(key)).filter(Boolean);
+};

package/es/ProForm/components/render/RenderFields.js

@@ -184,6 +184,8 @@ const RenderFields = props => {
       ...defaultColProps,
       ...colProps
     };
+    const columnName = _formItemProps.name;
+    const fieldKey = (Array.isArray(columnName) ? columnName.join('.') : columnName) ?? _formItemProps.label ?? _type;
 
     // 其余参数收进对象里传给子组件 componentProps只包含子组件参数
     const otherProps = {
@@ -228,7 +230,7 @@ const RenderFields = props => {
         viewRender: viewRender,
         desensitization: desensitization
       })
-    }, `${_formItemProps.name || _formItemProps.label}${index}`);
+    }, fieldKey != null && fieldKey !== '' ? String(fieldKey) : `column-${index}`);
   });
   return /*#__PURE__*/_jsx(_Fragment, {
     children: comList