@zat-design/sisyphus-react 4.1.1 → 4.1.2-beta.1

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

@@ -65,6 +65,8 @@ var ProDrawer = _ref => {
   var _ref3 = drawerProps || {},
     drawerMask = _ref3.mask,
     restDrawerProps = _objectWithoutProperties(_ref3, _excluded);
+  var drawerWidth = width;
+  var drawerSize = restDrawerProps === null || restDrawerProps === void 0 ? void 0 : restDrawerProps.size;
 
   // 使用 useEffect 在 open 变更时延迟捕获 初始DOM 快照
   useEffect(() => {
@@ -241,7 +243,8 @@ var ProDrawer = _ref => {
     return defaultFooter;
   };
   return /*#__PURE__*/_jsxs(Drawer, _objectSpread(_objectSpread({
-    size: parseInt(String(width), 10) || 960,
+    width: drawerWidth,
+    size: drawerSize,
     open: open,
     mask: drawerMask !== null && drawerMask !== void 0 ? drawerMask : {
       blur: false
@@ -252,7 +255,7 @@ var ProDrawer = _ref => {
     closable: false,
     onClose: onCancel,
     zIndex: zIndex
-  }, omit(restDrawerProps, 'width')), {}, {
+  }, omit(restDrawerProps, 'width', 'size')), {}, {
     children: [/*#__PURE__*/_jsx("div", {
       className: "pro-drawer-close",
       onClick: onConfirm,

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

@@ -18,6 +18,7 @@ import ProIcon from "../../../ProIcon";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var Row = props => {
+  var _restProps$className;
   var disabled = props.disabled,
     children = props.children,
     restProps = _objectWithoutProperties(props, _excluded);
@@ -40,13 +41,17 @@ var Row = props => {
     position: 'relative',
     zIndex: 2
   } : {});
+
+  // 检查是否是空状态占位行
+  var isPlaceholderRow = (_restProps$className = restProps.className) === null || _restProps$className === void 0 ? void 0 : _restProps$className.includes('ant-table-placeholder');
   return /*#__PURE__*/_jsx("tr", _objectSpread(_objectSpread(_objectSpread({}, restProps), {}, {
     ref: setNodeRef,
     style: style
   }, attributes), {}, {
     children: React.Children.map(children, (child, index) => {
       // 在第一列（通常是rowSelection列）显示拖拽图标
-      if (index === 0 && !disabled) {
+      // 如果是占位行，不添加拖拽包装器
+      if (index === 0 && !disabled && !isPlaceholderRow) {
         var _restProps$dataRowD;
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,

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

@@ -34,7 +34,8 @@ import useShouldUpdateForTable from "../../utils/useShouldUpdateForTable";
 /** 列配置中不应透传到 Form.Item 或 DOM 的字段（与 ProForm Render 保持一致） */
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
-var OMIT_FORM_ITEM_AND_DOM_KEYS = ['format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames'];
+var OMIT_FORM_ITEM_AND_DOM_KEYS = ['format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames', 'shouldCellUpdate' // 表格内部性能优化属性，不应传递给 Form.Item
+];
 var RenderField = _ref => {
   var _type, _type$replace, _fieldProps2, _fieldProps4, _names, _TargetComponent5, _componentProps;
   var value = _ref.text,
@@ -498,14 +499,16 @@ var RenderField = _ref => {
                         }
                       }
                     }
-                    // 使用startTransition优化状态更新
-                    compatStartTransition(() => {
-                      setState({
-                        forceUpdate: {
-                          d: Date.now()
-                        }
+                    // 仅在存在联动逻辑且行数据实际发生变化时触发强制刷新
+                    if (onFieldChange && !isEqual(orgRow, row)) {
+                      compatStartTransition(() => {
+                        setState({
+                          forceUpdate: {
+                            rowKey: record === null || record === void 0 ? void 0 : record.rowKey
+                          }
+                        });
                       });
-                    });
+                    }
                   case 33:
                   case "end":
                     return _context.stop();
@@ -602,11 +605,11 @@ var RenderField = _ref => {
             cellNamePath: []
           });
         case 22:
-          // 单行编辑时需要 强制更新视图
+          // 单行编辑时需要 强制更新视图，仅对当前行打标记
           compatStartTransition(() => {
             setState({
               forceUpdate: {
-                d: Date.now()
+                rowKey: record === null || record === void 0 ? void 0 : record.rowKey
               }
             });
           });
@@ -825,7 +828,11 @@ export default /*#__PURE__*/memo(RenderField, (prevProps, nextProps) => {
 
   // fieldProps 函数化直接更新，无法比对返回值是否一致
   if (isFunction(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.fieldProps) && isFunction(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.fieldProps)) {
-    return false;
+    var prevFieldProps = prevColumn.fieldProps(prevRecord, prevReactiveParams);
+    var nextFieldProps = nextColumn.fieldProps(nextRecord, nextReactiveParams);
+    if (!isEqualWith(prevFieldProps, nextFieldProps, customEqualForFunction)) {
+      return false;
+    }
   }
 
   // 通用函数比较方法

package/es/ProEditTable/index.js

@@ -31,7 +31,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var ProEditTable = (_ref, ref) => {
-  var _resetProps$id, _resetProps$id$split, _ref2, _formFieldProps$shoul, _themeConfig$data2, _resetProps$otherProp;
+  var _resetProps$id, _resetProps$id$split, _ref2, _formFieldProps$shoul, _themeConfig$data2;
   var _ref$value = _ref.value,
     value = _ref$value === void 0 ? [] : _ref$value,
     onChange = _ref.onChange,
@@ -150,10 +150,13 @@ var ProEditTable = (_ref, ref) => {
   var getRowKey = useCallback(record => {
     var key = record.rowKey || getRandom();
     if (rowKey) {
-      var _ref4;
-      key = (_ref4 = isFunction(rowKey) ? rowKey(record) : record[rowKey]) !== null && _ref4 !== void 0 ? _ref4 : key;
+      var userKey = isFunction(rowKey) ? rowKey(record) : record[rowKey];
+      // 检查用户返回的 key 是否有效（不是 null、undefined、NaN 或空字符串）
+      if (userKey != null && !Number.isNaN(userKey) && userKey !== '') {
+        key = userKey;
+      }
     }
-    return key;
+    return String(key); // 确保返回字符串
   }, [rowKey]);
   var originalValues = useMemo(() => {
     var _originalArr$every, _originalArr$some;
@@ -186,7 +189,7 @@ var ProEditTable = (_ref, ref) => {
 
   // 分页变更
   var handlePageChange = useCallback( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(current, pageSize) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(current, pageSize) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -232,47 +235,50 @@ var ProEditTable = (_ref, ref) => {
       }, _callee, null, [[0, 10]]);
     }));
     return function (_x, _x2) {
-      return _ref5.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }(), [pagination, page.pageSize, form, name]);
-  var config = _objectSpread({
-    form,
-    mode,
-    isView,
-    viewEmpty,
-    disabled,
-    cellNamePath,
-    forceUpdate,
-    insertType,
-    emptyBtnText,
-    editingKeys,
-    actionWidth,
-    actionProps,
-    toolbarProps,
-    setState,
-    selectedRowKeys,
-    selectedRows,
-    onlyOneLineMsg,
-    deletePoConfirmMsg,
-    mulDeletePoConfirmMsg,
-    virtualKey,
-    requiredAlign,
-    name: isArray(name) ? name : [name],
-    // name需要处理成namePath形式，为兼容多路径
-    namePath,
-    tableRef,
-    max,
-    tableLength: value === null || value === void 0 ? void 0 : value.length,
-    page,
-    originalValues,
-    prefixCls,
-    rowDisabled,
-    actionDirection,
-    diffConfig: _objectSpread(_objectSpread({}, resetProps === null || resetProps === void 0 || (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig),
-    shouldUpdateDebounce,
-    getIsNew,
-    handlePageChange
-  }, resetProps);
+  var config = useMemo(() => {
+    var _resetProps$otherProp;
+    return _objectSpread({
+      form,
+      mode,
+      isView,
+      viewEmpty,
+      disabled,
+      cellNamePath,
+      forceUpdate,
+      insertType,
+      emptyBtnText,
+      editingKeys,
+      actionWidth,
+      actionProps,
+      toolbarProps,
+      setState,
+      selectedRowKeys,
+      selectedRows,
+      onlyOneLineMsg,
+      deletePoConfirmMsg,
+      mulDeletePoConfirmMsg,
+      virtualKey,
+      requiredAlign,
+      name: isArray(name) ? name : [name],
+      // name需要处理成namePath形式，为兼容多路径
+      namePath,
+      tableRef,
+      max,
+      tableLength: value === null || value === void 0 ? void 0 : value.length,
+      page,
+      originalValues,
+      prefixCls,
+      rowDisabled,
+      actionDirection,
+      diffConfig: _objectSpread(_objectSpread({}, resetProps === null || resetProps === void 0 || (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig),
+      shouldUpdateDebounce,
+      getIsNew,
+      handlePageChange
+    }, resetProps);
+  }, [actionDirection, actionProps, actionWidth, cellNamePath, deletePoConfirmMsg, disabled, 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 === null || value === void 0 ? void 0 : value.length, viewEmpty, virtualKey, page]);
 
   // 编辑行设置下样式
   var _rowClassName = record => {
@@ -330,7 +336,7 @@ var ProEditTable = (_ref, ref) => {
 
   // 空列表状态
   var emptyDom = useMemo(() => () => {
-    var _filter, _ref6;
+    var _filter, _ref5;
     return /*#__PURE__*/_jsxs("div", {
       className: "com-empty",
       children: [/*#__PURE__*/_jsx("img", {
@@ -341,7 +347,7 @@ var ProEditTable = (_ref, ref) => {
         className: "content",
         children: disabled || isForbiddenBtn('add') ? locale.ProEditTable.noData : /*#__PURE__*/_jsxs(_Fragment, {
           children: [locale.ProEditTable.noData, "\uFF0C", /*#__PURE__*/_jsx(RenderToolbar, _objectSpread({}, _objectSpread(_objectSpread({}, config), {}, {
-            toolbarProps: toolbarProps === null || toolbarProps === void 0 || (_filter = (_ref6 = toolbarProps).filter) === null || _filter === void 0 ? void 0 : _filter.call(_ref6, item => item.type === 'add' || (item === null || item === void 0 ? void 0 : item.persistence)),
+            toolbarProps: toolbarProps === null || toolbarProps === void 0 || (_filter = (_ref5 = toolbarProps).filter) === null || _filter === void 0 ? void 0 : _filter.call(_ref5, item => item.type === 'add' || (item === null || item === void 0 ? void 0 : item.persistence)),
             dataSource: []
           })))]
         })
@@ -367,7 +373,7 @@ var ProEditTable = (_ref, ref) => {
   };
   var _columns = useMemo(() => {
     return transformColumns(columns, config);
-  }, [disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
+  }, [columns, config]);
   var initDataSource = () => {
     var _value$every, _value$some;
     // 检查每一项是否有 rowKey 或通过 rowKey 字段获取的 key
@@ -416,6 +422,28 @@ var ProEditTable = (_ref, ref) => {
     rowSelection: renderRowSelection()
   }) : summary;
   var TableComponent = draggable ? DraggableTable : BaseTable;
+  var tableProps = useMemo(() => ({
+    rowKey,
+    value,
+    headerRender,
+    tableRef,
+    className: _className,
+    columns: _columns,
+    renderRowSelection,
+    rowClassName: _rowClassName,
+    disabled,
+    virtualKey,
+    editingKeys,
+    isHideCheckBox,
+    rowDraggable,
+    pagination,
+    scroll,
+    summary: _summary,
+    page,
+    formatMessage,
+    locale,
+    handlePageChange
+  }), [_className, _columns, _rowClassName, disabled, editingKeys, formatMessage, handlePageChange, headerRender, isHideCheckBox, locale, page, pagination, renderRowSelection, rowDraggable, rowKey, scroll, _summary, tableRef, value, virtualKey]);
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(ConfigProvider, {
       renderEmpty: value !== null && value !== void 0 && value.length ? undefined : emptyDom,
@@ -426,28 +454,7 @@ var ProEditTable = (_ref, ref) => {
           onDragEnd,
           draggable
         },
-        tableProps: {
-          rowKey,
-          value,
-          headerRender,
-          tableRef,
-          className: _className,
-          columns: _columns,
-          renderRowSelection,
-          rowClassName: _rowClassName,
-          disabled,
-          virtualKey,
-          editingKeys,
-          isHideCheckBox,
-          rowDraggable,
-          pagination,
-          scroll,
-          summary: _summary,
-          page,
-          formatMessage,
-          locale,
-          handlePageChange
-        }
+        tableProps: tableProps
       }))
     }), !isView && value !== null && value !== void 0 && value.length ? toolbarSticky ? /*#__PURE__*/_jsx(Affix, _objectSpread(_objectSpread({
       ref: affixRef

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

@@ -16,7 +16,7 @@ export declare const defaultMultipleActionKeys: string[];
 export declare const defaultEditingActionKeys: string[];
 export declare const defaultToolbarKeys: string[];
 export declare const actions: {
-    edit: ({ record, editingKeys, setState, form, virtualRowName, virtualKey, onlyOneLineMsg, }: any) => boolean;
+    edit: ({ record, editingKeys, setState, form, virtualRowName, virtualKey, onlyOneLineMsg }: any) => boolean;
     save: ({ record, editingKeys, setState, form, rowName, virtualRowName, result }: any) => Promise<void>;
     cancel: ({ name, record, editingKeys, setState, form, virtualRowName, virtualKey }: any) => void;
     delete: ({ name, record, editingKeys, setState, form, virtualKey, onlyOneLineMsg }: any) => boolean;

package/es/ProEditTable/utils/config.js

@@ -167,8 +167,8 @@ export var actions = {
   },
   add: function () {
     var _add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
-      var _tableRef$current, _tableRef$current$scr;
-      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, page, handlePageChange, nextData, rowKey, addData, nextPageNum, nextEditingKeys;
+      var _tableRef$current;
+      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, page, handlePageChange, nextData, rowKey, addData, nextPageNum, nextEditingKeys, tableBody;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -228,17 +228,24 @@ export var actions = {
               });
             }
             form.setFieldValue(name, nextData);
-            (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.children[0]) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.querySelector(`.${prefixCls}-table-body`)) === null || _tableRef$current === void 0 || (_tableRef$current$scr = _tableRef$current.scrollTo) === null || _tableRef$current$scr === void 0 || _tableRef$current$scr.call(_tableRef$current, {
-              top: insertType === 'before' ? -10000 : 10000,
-              behavior: 'smooth'
-            });
+            tableBody = (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.children[0]) === null || _tableRef$current === void 0 ? void 0 : _tableRef$current.querySelector(`.${prefixCls}-table-body`);
+            if (tableBody) {
+              // 等待新行渲染完毕再读取 scrollHeight，确保能滚动到真正的底部
+              requestAnimationFrame(() => {
+                var _tableBody$scrollTo;
+                (_tableBody$scrollTo = tableBody.scrollTo) === null || _tableBody$scrollTo === void 0 || _tableBody$scrollTo.call(tableBody, {
+                  top: insertType === 'before' ? 0 : tableBody.scrollHeight,
+                  behavior: 'smooth'
+                });
+              });
+            }
             if (!virtualKey) {
-              _context4.next = 15;
+              _context4.next = 16;
               break;
             }
-            _context4.next = 15;
+            _context4.next = 16;
             return form.validateFields([name]);
-          case 15:
+          case 16:
           case "end":
             return _context4.stop();
         }

package/es/ProEditTable/utils/index.js

@@ -211,7 +211,7 @@ export var transformColumns = function transformColumns() {
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
-  var nextColumns = cloneDeepFilterNode(columns);
+  var nextColumns = columns.map(item => cloneDeepFilterNode(item));
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);
   nextColumns.forEach((item, index) => {
@@ -364,6 +364,19 @@ export var transformColumns = function transformColumns() {
       });
     };
     item.render = _render;
+
+    // 精准控制单元格更新，减少不必要的渲染
+    if (!item.shouldCellUpdate) {
+      var hasComponent = isFunction(item.component);
+      item.shouldCellUpdate = (record, prevRecord) => {
+        if ((record === null || record === void 0 ? void 0 : record.rowKey) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.rowKey)) return true;
+        // 动态 component 可能依赖行内其他字段，需比较整行
+        if (hasComponent) return !isEqual(record, prevRecord);
+        var key = item.dataIndex || item.key;
+        if (!key) return true;
+        return (record === null || record === void 0 ? void 0 : record[key]) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[key]);
+      };
+    }
   });
   if (disabled || isView) {
     // 查看模式下过滤操作栏

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

@@ -49,8 +49,9 @@ var Container = props => {
       diffConfig: diffConfig
     }, otherProps));
     if (type === 'ProCollapse') {
+      var hasFieldChildren = Array.isArray(children) && children.length > 0;
       return /*#__PURE__*/_jsx(ProCollapse, _objectSpread(_objectSpread({}, omit(props, ['otherProps', 'children', 'onBlur', 'onChange', 'placeholder', 'className'])), {}, {
-        children: child
+        children: hasFieldChildren ? child : null
       }));
     }
     if (type === 'Container') {

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

@@ -75,31 +75,29 @@ 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>;
-    trim?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    vertical?: boolean;
     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;
-    status?: "" | "success" | "error" | "warning" | "validating";
-    trigger?: string;
-    colon?: boolean;
     isView?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    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;
     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>;
+    trigger?: string;
     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;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
@@ -110,7 +108,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
-    validateStatus?: "" | "success" | "error" | "warning" | "validating";
+    validateStatus?: "" | "warning" | "error" | "success" | "validating";
     layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
     help?: React.ReactNode;
@@ -123,10 +121,12 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         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]>;
     name: any;
     dependencies: any[];
     tooltip: string | {

package/es/ProLayout/components/ProCollapse/index.js

@@ -3,7 +3,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { useLayoutEffect } from 'react';
+import React, { useLayoutEffect } from 'react';
 import { Collapse, Descriptions, Space } from 'antd';
 import { CaretRightOutlined } from '@ant-design/icons';
 import classNames from 'classnames';
@@ -55,11 +55,12 @@ var ProCollapse = props => {
     'pro-collapse-no-level1-title': !title && level !== '2' && level !== '3',
     [`${className}`]: className
   });
-  var content = /*#__PURE__*/_jsx("div", {
+  var shouldRenderContent = children !== null && children !== undefined;
+  var content = shouldRenderContent ? /*#__PURE__*/_jsx("div", {
     className: "pro-collapse-content",
     style: contentStyle,
     children: children
-  });
+  }) : null;
 
   // 生成 Collapse items 配置
   var getCollapseItems = () => {

package/es/ProSelect/index.js

@@ -424,7 +424,7 @@ export var ProSelect = (props, ref) => {
           return /*#__PURE__*/_jsx(OptGroup, {
             label: item[label],
             children: groupOpts.map(opt => /*#__PURE__*/_jsx(Option, {
-              label: opt[label],
+              label: selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label],
               value: opt[code],
               record: opt,
               disabled: !!opt.disabled,
@@ -440,7 +440,7 @@ export var ProSelect = (props, ref) => {
           }, (_item$label = item[label]) !== null && _item$label !== void 0 ? _item$label : `group-${index}`);
         }
         return /*#__PURE__*/_jsx(Option, {
-          label: item[label],
+          label: selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label],
           value: optionValue,
           record: item,
           disabled: !!item.disabled,

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

@@ -71,6 +71,8 @@ var ProDrawer = _ref => {
   var _ref3 = drawerProps || {},
     drawerMask = _ref3.mask,
     restDrawerProps = _objectWithoutProperties(_ref3, _excluded);
+  var drawerWidth = width;
+  var drawerSize = restDrawerProps === null || restDrawerProps === void 0 ? void 0 : restDrawerProps.size;
 
   // 使用 useEffect 在 open 变更时延迟捕获 初始DOM 快照
   (0, _react.useEffect)(() => {
@@ -247,7 +249,8 @@ var ProDrawer = _ref => {
     return defaultFooter;
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Drawer, _objectSpread(_objectSpread({
-    size: parseInt(String(width), 10) || 960,
+    width: drawerWidth,
+    size: drawerSize,
     open: open,
     mask: drawerMask !== null && drawerMask !== void 0 ? drawerMask : {
       blur: false
@@ -258,7 +261,7 @@ var ProDrawer = _ref => {
     closable: false,
     onClose: onCancel,
     zIndex: zIndex
-  }, (0, _lodash.omit)(restDrawerProps, 'width')), {}, {
+  }, (0, _lodash.omit)(restDrawerProps, 'width', 'size')), {}, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "pro-drawer-close",
       onClick: onConfirm,

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

@@ -26,6 +26,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var Row = props => {
+  var _restProps$className;
   var disabled = props.disabled,
     children = props.children,
     restProps = _objectWithoutProperties(props, _excluded);
@@ -48,13 +49,17 @@ var Row = props => {
     position: 'relative',
     zIndex: 2
   } : {});
+
+  // 检查是否是空状态占位行
+  var isPlaceholderRow = (_restProps$className = restProps.className) === null || _restProps$className === void 0 ? void 0 : _restProps$className.includes('ant-table-placeholder');
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("tr", _objectSpread(_objectSpread(_objectSpread({}, restProps), {}, {
     ref: setNodeRef,
     style: style
   }, attributes), {}, {
     children: _react.default.Children.map(children, (child, index) => {
       // 在第一列（通常是rowSelection列）显示拖拽图标
-      if (index === 0 && !disabled) {
+      // 如果是占位行，不添加拖拽包装器
+      if (index === 0 && !disabled && !isPlaceholderRow) {
         var _restProps$dataRowD;
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,

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

@@ -41,7 +41,8 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-var OMIT_FORM_ITEM_AND_DOM_KEYS = ['format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames'];
+var OMIT_FORM_ITEM_AND_DOM_KEYS = ['format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames', 'shouldCellUpdate' // 表格内部性能优化属性，不应传递给 Form.Item
+];
 var RenderField = _ref => {
   var _type, _type$replace, _fieldProps2, _fieldProps4, _names, _TargetComponent5, _componentProps;
   var value = _ref.text,
@@ -505,14 +506,16 @@ var RenderField = _ref => {
                         }
                       }
                     }
-                    // 使用startTransition优化状态更新
-                    (0, _utils.compatStartTransition)(() => {
-                      setState({
-                        forceUpdate: {
-                          d: Date.now()
-                        }
+                    // 仅在存在联动逻辑且行数据实际发生变化时触发强制刷新
+                    if (onFieldChange && !(0, _lodash.isEqual)(orgRow, row)) {
+                      (0, _utils.compatStartTransition)(() => {
+                        setState({
+                          forceUpdate: {
+                            rowKey: record === null || record === void 0 ? void 0 : record.rowKey
+                          }
+                        });
                       });
-                    });
+                    }
                   case 33:
                   case "end":
                     return _context.stop();
@@ -609,11 +612,11 @@ var RenderField = _ref => {
             cellNamePath: []
           });
         case 22:
-          // 单行编辑时需要 强制更新视图
+          // 单行编辑时需要 强制更新视图，仅对当前行打标记
           (0, _utils.compatStartTransition)(() => {
             setState({
               forceUpdate: {
-                d: Date.now()
+                rowKey: record === null || record === void 0 ? void 0 : record.rowKey
               }
             });
           });
@@ -832,7 +835,11 @@ var _default = exports.default = /*#__PURE__*/(0, _react.memo)(RenderField, (pre
 
   // fieldProps 函数化直接更新，无法比对返回值是否一致
   if ((0, _lodash.isFunction)(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.fieldProps) && (0, _lodash.isFunction)(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.fieldProps)) {
-    return false;
+    var prevFieldProps = prevColumn.fieldProps(prevRecord, prevReactiveParams);
+    var nextFieldProps = nextColumn.fieldProps(nextRecord, nextReactiveParams);
+    if (!(0, _lodash.isEqualWith)(prevFieldProps, nextFieldProps, _utils.customEqualForFunction)) {
+      return false;
+    }
   }
 
   // 通用函数比较方法

package/lib/ProEditTable/index.js

@@ -38,7 +38,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var ProEditTable = (_ref, ref) => {
-  var _resetProps$id, _resetProps$id$split, _ref2, _formFieldProps$shoul, _themeConfig$data2, _resetProps$otherProp;
+  var _resetProps$id, _resetProps$id$split, _ref2, _formFieldProps$shoul, _themeConfig$data2;
   var _ref$value = _ref.value,
     value = _ref$value === void 0 ? [] : _ref$value,
     onChange = _ref.onChange,
@@ -157,10 +157,13 @@ var ProEditTable = (_ref, ref) => {
   var getRowKey = (0, _react.useCallback)(record => {
     var key = record.rowKey || (0, _tools.getRandom)();
     if (rowKey) {
-      var _ref4;
-      key = (_ref4 = (0, _lodash.isFunction)(rowKey) ? rowKey(record) : record[rowKey]) !== null && _ref4 !== void 0 ? _ref4 : key;
+      var userKey = (0, _lodash.isFunction)(rowKey) ? rowKey(record) : record[rowKey];
+      // 检查用户返回的 key 是否有效（不是 null、undefined、NaN 或空字符串）
+      if (userKey != null && !Number.isNaN(userKey) && userKey !== '') {
+        key = userKey;
+      }
     }
-    return key;
+    return String(key); // 确保返回字符串
   }, [rowKey]);
   var originalValues = (0, _react.useMemo)(() => {
     var _originalArr$every, _originalArr$some;
@@ -193,7 +196,7 @@ var ProEditTable = (_ref, ref) => {
 
   // 分页变更
   var handlePageChange = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(current, pageSize) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(current, pageSize) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -239,47 +242,50 @@ var ProEditTable = (_ref, ref) => {
       }, _callee, null, [[0, 10]]);
     }));
     return function (_x, _x2) {
-      return _ref5.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }(), [pagination, page.pageSize, form, name]);
-  var config = _objectSpread({
-    form,
-    mode,
-    isView,
-    viewEmpty,
-    disabled,
-    cellNamePath,
-    forceUpdate,
-    insertType,
-    emptyBtnText,
-    editingKeys,
-    actionWidth,
-    actionProps,
-    toolbarProps,
-    setState,
-    selectedRowKeys,
-    selectedRows,
-    onlyOneLineMsg,
-    deletePoConfirmMsg,
-    mulDeletePoConfirmMsg,
-    virtualKey,
-    requiredAlign,
-    name: (0, _lodash.isArray)(name) ? name : [name],
-    // name需要处理成namePath形式，为兼容多路径
-    namePath,
-    tableRef,
-    max,
-    tableLength: value === null || value === void 0 ? void 0 : value.length,
-    page,
-    originalValues,
-    prefixCls,
-    rowDisabled,
-    actionDirection,
-    diffConfig: _objectSpread(_objectSpread({}, resetProps === null || resetProps === void 0 || (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig),
-    shouldUpdateDebounce,
-    getIsNew,
-    handlePageChange
-  }, resetProps);
+  var config = (0, _react.useMemo)(() => {
+    var _resetProps$otherProp;
+    return _objectSpread({
+      form,
+      mode,
+      isView,
+      viewEmpty,
+      disabled,
+      cellNamePath,
+      forceUpdate,
+      insertType,
+      emptyBtnText,
+      editingKeys,
+      actionWidth,
+      actionProps,
+      toolbarProps,
+      setState,
+      selectedRowKeys,
+      selectedRows,
+      onlyOneLineMsg,
+      deletePoConfirmMsg,
+      mulDeletePoConfirmMsg,
+      virtualKey,
+      requiredAlign,
+      name: (0, _lodash.isArray)(name) ? name : [name],
+      // name需要处理成namePath形式，为兼容多路径
+      namePath,
+      tableRef,
+      max,
+      tableLength: value === null || value === void 0 ? void 0 : value.length,
+      page,
+      originalValues,
+      prefixCls,
+      rowDisabled,
+      actionDirection,
+      diffConfig: _objectSpread(_objectSpread({}, resetProps === null || resetProps === void 0 || (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig),
+      shouldUpdateDebounce,
+      getIsNew,
+      handlePageChange
+    }, resetProps);
+  }, [actionDirection, actionProps, actionWidth, cellNamePath, deletePoConfirmMsg, disabled, 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 === null || value === void 0 ? void 0 : value.length, viewEmpty, virtualKey, page]);
 
   // 编辑行设置下样式
   var _rowClassName = record => {
@@ -337,7 +343,7 @@ var ProEditTable = (_ref, ref) => {
 
   // 空列表状态
   var emptyDom = (0, _react.useMemo)(() => () => {
-    var _filter, _ref6;
+    var _filter, _ref5;
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "com-empty",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
@@ -348,7 +354,7 @@ var ProEditTable = (_ref, ref) => {
         className: "content",
         children: disabled || isForbiddenBtn('add') ? _locale.default.ProEditTable.noData : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
           children: [_locale.default.ProEditTable.noData, "\uFF0C", /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.RenderToolbar, _objectSpread({}, _objectSpread(_objectSpread({}, config), {}, {
-            toolbarProps: toolbarProps === null || toolbarProps === void 0 || (_filter = (_ref6 = toolbarProps).filter) === null || _filter === void 0 ? void 0 : _filter.call(_ref6, item => item.type === 'add' || (item === null || item === void 0 ? void 0 : item.persistence)),
+            toolbarProps: toolbarProps === null || toolbarProps === void 0 || (_filter = (_ref5 = toolbarProps).filter) === null || _filter === void 0 ? void 0 : _filter.call(_ref5, item => item.type === 'add' || (item === null || item === void 0 ? void 0 : item.persistence)),
             dataSource: []
           })))]
         })
@@ -374,7 +380,7 @@ var ProEditTable = (_ref, ref) => {
   };
   var _columns = (0, _react.useMemo)(() => {
     return (0, _utils.transformColumns)(columns, config);
-  }, [disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
+  }, [columns, config]);
   var initDataSource = () => {
     var _value$every, _value$some;
     // 检查每一项是否有 rowKey 或通过 rowKey 字段获取的 key
@@ -423,6 +429,28 @@ var ProEditTable = (_ref, ref) => {
     rowSelection: renderRowSelection()
   }) : summary;
   var TableComponent = draggable ? _RcTable.DraggableTable : _RcTable.BaseTable;
+  var tableProps = (0, _react.useMemo)(() => ({
+    rowKey,
+    value,
+    headerRender,
+    tableRef,
+    className: _className,
+    columns: _columns,
+    renderRowSelection,
+    rowClassName: _rowClassName,
+    disabled,
+    virtualKey,
+    editingKeys,
+    isHideCheckBox,
+    rowDraggable,
+    pagination,
+    scroll,
+    summary: _summary,
+    page,
+    formatMessage: _locale.formatMessage,
+    locale: _locale.default,
+    handlePageChange
+  }), [_className, _columns, _rowClassName, disabled, editingKeys, _locale.formatMessage, handlePageChange, headerRender, isHideCheckBox, _locale.default, page, pagination, renderRowSelection, rowDraggable, rowKey, scroll, _summary, tableRef, value, virtualKey]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ConfigProvider, {
       renderEmpty: value !== null && value !== void 0 && value.length ? undefined : emptyDom,
@@ -433,28 +461,7 @@ var ProEditTable = (_ref, ref) => {
           onDragEnd,
           draggable
         },
-        tableProps: {
-          rowKey,
-          value,
-          headerRender,
-          tableRef,
-          className: _className,
-          columns: _columns,
-          renderRowSelection,
-          rowClassName: _rowClassName,
-          disabled,
-          virtualKey,
-          editingKeys,
-          isHideCheckBox,
-          rowDraggable,
-          pagination,
-          scroll,
-          summary: _summary,
-          page,
-          formatMessage: _locale.formatMessage,
-          locale: _locale.default,
-          handlePageChange
-        }
+        tableProps: tableProps
       }))
     }), !isView && value !== null && value !== void 0 && value.length ? toolbarSticky ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Affix, _objectSpread(_objectSpread({
       ref: affixRef

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

@@ -16,7 +16,7 @@ export declare const defaultMultipleActionKeys: string[];
 export declare const defaultEditingActionKeys: string[];
 export declare const defaultToolbarKeys: string[];
 export declare const actions: {
-    edit: ({ record, editingKeys, setState, form, virtualRowName, virtualKey, onlyOneLineMsg, }: any) => boolean;
+    edit: ({ record, editingKeys, setState, form, virtualRowName, virtualKey, onlyOneLineMsg }: any) => boolean;
     save: ({ record, editingKeys, setState, form, rowName, virtualRowName, result }: any) => Promise<void>;
     cancel: ({ name, record, editingKeys, setState, form, virtualRowName, virtualKey }: any) => void;
     delete: ({ name, record, editingKeys, setState, form, virtualKey, onlyOneLineMsg }: any) => boolean;

package/lib/ProEditTable/utils/config.js

@@ -174,8 +174,8 @@ var actions = exports.actions = {
   },
   add: function () {
     var _add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
-      var _tableRef$current, _tableRef$current$scr;
-      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, page, handlePageChange, nextData, rowKey, addData, nextPageNum, nextEditingKeys;
+      var _tableRef$current;
+      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, page, handlePageChange, nextData, rowKey, addData, nextPageNum, nextEditingKeys, tableBody;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -235,17 +235,24 @@ var actions = exports.actions = {
               });
             }
             form.setFieldValue(name, nextData);
-            (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.children[0]) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.querySelector(`.${prefixCls}-table-body`)) === null || _tableRef$current === void 0 || (_tableRef$current$scr = _tableRef$current.scrollTo) === null || _tableRef$current$scr === void 0 || _tableRef$current$scr.call(_tableRef$current, {
-              top: insertType === 'before' ? -10000 : 10000,
-              behavior: 'smooth'
-            });
+            tableBody = (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.children[0]) === null || _tableRef$current === void 0 ? void 0 : _tableRef$current.querySelector(`.${prefixCls}-table-body`);
+            if (tableBody) {
+              // 等待新行渲染完毕再读取 scrollHeight，确保能滚动到真正的底部
+              requestAnimationFrame(() => {
+                var _tableBody$scrollTo;
+                (_tableBody$scrollTo = tableBody.scrollTo) === null || _tableBody$scrollTo === void 0 || _tableBody$scrollTo.call(tableBody, {
+                  top: insertType === 'before' ? 0 : tableBody.scrollHeight,
+                  behavior: 'smooth'
+                });
+              });
+            }
             if (!virtualKey) {
-              _context4.next = 15;
+              _context4.next = 16;
               break;
             }
-            _context4.next = 15;
+            _context4.next = 16;
             return form.validateFields([name]);
-          case 15:
+          case 16:
           case "end":
             return _context4.stop();
         }

package/lib/ProEditTable/utils/index.js

@@ -215,7 +215,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
-  var nextColumns = (0, _tools.cloneDeepFilterNode)(columns);
+  var nextColumns = columns.map(item => (0, _tools.cloneDeepFilterNode)(item));
   var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
   var firstIndex = _utils.tools.calc(pageNum, '*', page.pageSize);
   nextColumns.forEach((item, index) => {
@@ -368,6 +368,19 @@ var transformColumns = exports.transformColumns = function transformColumns() {
       });
     };
     item.render = _render;
+
+    // 精准控制单元格更新，减少不必要的渲染
+    if (!item.shouldCellUpdate) {
+      var hasComponent = (0, _lodash.isFunction)(item.component);
+      item.shouldCellUpdate = (record, prevRecord) => {
+        if ((record === null || record === void 0 ? void 0 : record.rowKey) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.rowKey)) return true;
+        // 动态 component 可能依赖行内其他字段，需比较整行
+        if (hasComponent) return !(0, _lodash.isEqual)(record, prevRecord);
+        var key = item.dataIndex || item.key;
+        if (!key) return true;
+        return (record === null || record === void 0 ? void 0 : record[key]) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[key]);
+      };
+    }
   });
   if (disabled || isView) {
     // 查看模式下过滤操作栏

package/lib/ProForm/components/combination/Container/index.js

@@ -56,8 +56,9 @@ var Container = props => {
       diffConfig: diffConfig
     }, otherProps));
     if (type === 'ProCollapse') {
+      var hasFieldChildren = Array.isArray(children) && children.length > 0;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProCollapse.default, _objectSpread(_objectSpread({}, (0, _lodash.omit)(props, ['otherProps', 'children', 'onBlur', 'onChange', 'placeholder', 'className'])), {}, {
-        children: child
+        children: hasFieldChildren ? child : null
       }));
     }
     if (type === 'Container') {

package/lib/ProLayout/components/ProCollapse/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -12,6 +12,8 @@ var _fold = _interopRequireDefault(require("../../../assets/fold.svg"));
 var _index = _interopRequireDefault(require("../../../ProIcon/index"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -61,11 +63,12 @@ var ProCollapse = props => {
     'pro-collapse-no-level1-title': !title && level !== '2' && level !== '3',
     [`${className}`]: className
   });
-  var content = /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+  var shouldRenderContent = children !== null && children !== undefined;
+  var content = shouldRenderContent ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: "pro-collapse-content",
     style: contentStyle,
     children: children
-  });
+  }) : null;
 
   // 生成 Collapse items 配置
   var getCollapseItems = () => {

package/lib/ProSelect/index.js

@@ -431,7 +431,7 @@ var ProSelect = (props, ref) => {
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(OptGroup, {
             label: item[label],
             children: groupOpts.map(opt => /*#__PURE__*/(0, _jsxRuntime.jsx)(Option, {
-              label: opt[label],
+              label: selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label],
               value: opt[code],
               record: opt,
               disabled: !!opt.disabled,
@@ -447,7 +447,7 @@ var ProSelect = (props, ref) => {
           }, (_item$label = item[label]) !== null && _item$label !== void 0 ? _item$label : `group-${index}`);
         }
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(Option, {
-          label: item[label],
+          label: selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label],
           value: optionValue,
           record: item,
           disabled: !!item.disabled,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.1.1",
+  "version": "4.1.2-beta.1",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",