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

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,52 @@ 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 +338,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 +349,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 +375,7 @@ var ProEditTable = (_ref, ref) => {
   };
   var _columns = useMemo(() => {
     return transformColumns(columns, config);
-  }, [disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
+  }, [disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath, config]);
   var initDataSource = () => {
     var _value$every, _value$some;
     // 检查每一项是否有 rowKey 或通过 rowKey 字段获取的 key
@@ -416,6 +424,36 @@ var ProEditTable = (_ref, ref) => {
     rowSelection: renderRowSelection()
   }) : summary;
   var TableComponent = draggable ? DraggableTable : BaseTable;
+
+  // 给每个 record 附加编辑状态标识，让 shouldCellUpdate 能检测到状态变化
+  var enrichedValue = useMemo(() => {
+    if (!virtualKey) return value;
+    return value === null || value === void 0 ? void 0 : value.map(record => _objectSpread(_objectSpread({}, record), {}, {
+      _isEditing: editingKeys.includes(record.rowKey) || record._addFlag
+    }));
+  }, [value, virtualKey, editingKeys]);
+  var tableProps = useMemo(() => ({
+    rowKey,
+    value: enrichedValue,
+    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, enrichedValue, virtualKey]);
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(ConfigProvider, {
       renderEmpty: value !== null && value !== void 0 && value.length ? undefined : emptyDom,
@@ -426,28 +464,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/propsType.d.ts

@@ -130,6 +130,11 @@ export type RequiredFn<T = any> = ReactiveFunction<T, boolean | boolean[]>;
  * @template T 记录类型
  */
 export type viewRenderFn<T = any> = (text?: any, record?: T, options?: OptionsProps) => string | number | ReactNode | void;
+/**
+ * 组件渲染函数类型（与 ReactiveFunction 保持一致）
+ * @template T 记录类型
+ */
+export type ComponentRenderFn<T = any> = ReactiveFunction<T, string | number | ReactNode | void>;
 /**
  * 表格列属性接口
  * @template Values 值类型
@@ -153,7 +158,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
         icon?: string | ReactNode;
     } & TooltipProps);
     /** 组件 */
-    component?: string | number | ReactNode | viewRenderFn<T>;
+    component?: string | number | ReactNode | ComponentRenderFn<T>;
     /** 视图渲染 */
     viewRender?: string | number | ReactNode | viewRenderFn<T>;
     /** 隐藏的字段名 */

package/es/ProEditTable/style/index.less

@@ -425,4 +425,12 @@
   table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-start{
     text-align: right;
   }
+  table .@{ant-prefix}-table-thead{
+    th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-start{
+      text-align: left;
+      .@{ant-prefix}-table-selection{
+        padding-left: 27px;
+      }
+    }
+  }
 }

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

@@ -22,10 +22,13 @@ import { filterInternalFields } from "../../ProForm/utils";
 import ProTooltip from "../../ProTooltip";
 import { RenderField, ActionButton } from "../components";
 import locale from "../../locale";
-
-// 渲染操作栏
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+var columnDataSourceRefCache = new Map();
+/** 追踪 component 函数引用，用于检测外部状态（如异步 list）变化导致的闭包更新 */
+var columnComponentRefCache = new Map();
+
+// 渲染操作栏
 var getActionColumn = config => {
   var _cloneDeepWith = cloneDeepWith(config, value => {
       if ( /*#__PURE__*/React.isValidElement(value)) {
@@ -41,7 +44,8 @@ var getActionColumn = config => {
     actionProps = _cloneDeepWith.actionProps,
     page = _cloneDeepWith.page,
     rowDisabled = _cloneDeepWith.rowDisabled,
-    actionDirection = _cloneDeepWith.actionDirection;
+    actionDirection = _cloneDeepWith.actionDirection,
+    editingKeys = _cloneDeepWith.editingKeys;
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);
   // actionProps配置为false 默认不插入
@@ -89,7 +93,7 @@ var getActionColumn = config => {
     action.onEvent = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, _ref) {
         var _form$getFieldValue;
-        var index, form, name, namePath, tableLength, selectedRows, rowName, lastRecord, onEvent, result, actionHandler;
+        var index, form, name, namePath, tableLength, selectedRows, rowName, _isEditing, lastRecord, onEvent, result, actionHandler;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -97,33 +101,39 @@ var getActionColumn = config => {
               index = tools.calc(firstIndex, '+', index);
               rowName = [...virtualRowName, index];
               if (!(type === 'save')) {
-                _context.next = 13;
+                _context.next = 15;
                 break;
               }
-              _context.prev = 4;
-              _context.next = 7;
+              // 判断该行是否处于编辑状态
+              _isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record._addFlag; // 只有编辑中的行才需要校验
+              if (!_isEditing) {
+                _context.next = 15;
+                break;
+              }
+              _context.prev = 6;
+              _context.next = 9;
               return customValidate(validateKeys, form, rowName);
-            case 7:
-              _context.next = 13;
-              break;
             case 9:
-              _context.prev = 9;
-              _context.t0 = _context["catch"](4);
+              _context.next = 15;
+              break;
+            case 11:
+              _context.prev = 11;
+              _context.t0 = _context["catch"](6);
               handleScrollToError();
               return _context.abrupt("return", Promise.reject(_context.t0));
-            case 13:
+            case 15:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               lastRecord = filterInternalFields((_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record); // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
               if (onEvent) {
-                _context.next = 19;
+                _context.next = 21;
                 break;
               }
               result = true;
-              _context.next = 22;
+              _context.next = 24;
               break;
-            case 19:
-              _context.next = 21;
+            case 21:
+              _context.next = 23;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(lastRecord, {
                 form,
                 index,
@@ -132,9 +142,9 @@ var getActionColumn = config => {
                 namePath,
                 selectedRows
               });
-            case 21:
+            case 23:
               result = _context.sent;
-            case 22:
+            case 24:
               if (result !== false && type !== 'custom') {
                 actionHandler = actions[type];
                 actionHandler(_objectSpread(_objectSpread({}, config), {}, {
@@ -145,11 +155,11 @@ var getActionColumn = config => {
                   validateKeys
                 }));
               }
-            case 23:
+            case 25:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[4, 9]]);
+        }, _callee, null, [[6, 11]]);
       }));
       return function (_x, _x2) {
         return _ref2.apply(this, arguments);
@@ -211,7 +221,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 +374,51 @@ export var transformColumns = function transformColumns() {
       });
     };
     item.render = _render;
+
+    // 精准控制单元格更新，减少不必要的渲染
+    if (!item.shouldCellUpdate) {
+      var hasComponent = isFunction(item.component);
+      var columnCacheKey = `${Array.isArray(name) ? name.join('.') : String(name)}::${String(columnName)}`;
+      item.shouldCellUpdate = (record, prevRecord) => {
+        var _item$fieldProps;
+        var currentDataSourceRef = !isFunction(item === null || item === void 0 ? void 0 : item.fieldProps) ? item === null || item === void 0 || (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.dataSource : undefined;
+        if (currentDataSourceRef !== undefined) {
+          var prevDataSourceRef = columnDataSourceRefCache.get(columnCacheKey);
+          if (prevDataSourceRef !== currentDataSourceRef) {
+            columnDataSourceRefCache.set(columnCacheKey, currentDataSourceRef);
+            return true;
+          }
+        }
+        if ((record === null || record === void 0 ? void 0 : record.rowKey) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.rowKey)) {
+          return true;
+        }
+        // 单行编辑模式下，需要检测编辑状态变化
+        if (virtualKey && (record === null || record === void 0 ? void 0 : record._isEditing) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._isEditing)) {
+          return true;
+        }
+        // 动态 component 可能依赖行内其他字段，需比较整行
+        if (hasComponent) {
+          // component 函数引用变化说明外部依赖（如异步 list）已更新，必须重渲染
+          // 即使行数据未变，旧闭包仍持有过时的外部状态
+          var prevComponentRef = columnComponentRefCache.get(columnCacheKey);
+          var currentComponentRef = item.component;
+          if (prevComponentRef !== currentComponentRef) {
+            columnComponentRefCache.set(columnCacheKey, currentComponentRef);
+            return true;
+          }
+          // 同引用时 isEqual 恒为 true，无法感知原地修改，必须重渲染
+          if (record === prevRecord) {
+            return true;
+          }
+          var rowChanged = !isEqual(record, prevRecord);
+          return rowChanged;
+        }
+        var key = item.dataIndex || item.key;
+        if (!key) return true;
+        var keyChanged = (record === null || record === void 0 ? void 0 : record[key]) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[key]);
+        return keyChanged;
+      };
+    }
   });
   if (disabled || isView) {
     // 查看模式下过滤操作栏

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

@@ -10,6 +10,7 @@ interface Result {
     fieldProps: any;
     desensitization: any;
     valueType: any;
+    component: any;
 }
 declare const useShouldUpdateForTable: (props: UseShouldUpdateForTableProps) => Result;
 export default useShouldUpdateForTable;

package/es/ProEditTable/utils/useShouldUpdateForTable.js

@@ -8,7 +8,7 @@ import { useRef, useState, useEffect } from 'react';
 import { isFunction, isEqualWith, debounce } from 'lodash';
 import { customEqualForFunction } from "../../utils";
 var useShouldUpdateForTable = props => {
-  var _isEditableRef$curren, _requiredRef$current, _rulesRef$current, _fieldPropsRef$curren, _desensitizationRef$c, _valueTypeRef$current;
+  var _isEditableRef$curren, _requiredRef$current, _rulesRef$current, _fieldPropsRef$curren, _desensitizationRef$c, _valueTypeRef$current, _componentRef$current;
   var rowParams = props.rowParams,
     column = props.column,
     shouldUpdateDebounce = props.shouldUpdateDebounce;
@@ -20,11 +20,13 @@ var useShouldUpdateForTable = props => {
   var fieldPropsRef = useRef();
   var desensitizationRef = useRef();
   var valueTypeRef = useRef();
+  var componentRef = useRef();
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     reRender = _useState2[1];
   var debouncedUpdateRef = useRef(null);
   var pendingParamsRef = useRef(null);
+  var isInitializedRef = useRef(false);
 
   // 统一处理所有动态属性的更新
   var processUpdate = params => {
@@ -99,6 +101,19 @@ var useShouldUpdateForTable = props => {
     } else {
       valueTypeRef.current = column.valueType;
     }
+
+    // component 处理（注意：component 是 editRender 的别名）
+    var componentOrEditRender = column.component || column.editRender;
+    if (isFunction(componentOrEditRender)) {
+      var newComponent = componentOrEditRender(values, reactiveParams);
+      // 对于 ReactNode 类型的返回值，使用深度比较
+      if (!isEqualWith(componentRef.current, newComponent, customEqualForFunction)) {
+        componentRef.current = newComponent;
+        hasChange = true;
+      }
+    } else {
+      componentRef.current = componentOrEditRender;
+    }
     if (hasChange) {
       reRender({});
     }
@@ -106,7 +121,8 @@ var useShouldUpdateForTable = props => {
 
   // 创建防抖函数（统一处理所有动态属性）
   useEffect(() => {
-    if (shouldUpdateDebounce > 0 && (isFunction(column.isEditable) || isFunction(column.required) || isFunction(column.rules) || isFunction(column.fieldProps) || isFunction(column.desensitization) || isFunction(column.valueType))) {
+    var componentOrEditRender = column.component || column.editRender;
+    if (shouldUpdateDebounce > 0 && (isFunction(column.isEditable) || isFunction(column.required) || isFunction(column.rules) || isFunction(column.fieldProps) || isFunction(column.desensitization) || isFunction(column.valueType) || isFunction(componentOrEditRender))) {
       debouncedUpdateRef.current = debounce(() => {
         if (pendingParamsRef.current) {
           processUpdate(pendingParamsRef.current);
@@ -121,13 +137,23 @@ var useShouldUpdateForTable = props => {
   }, [shouldUpdateDebounce, column]);
 
   // 统一的属性处理逻辑
-  if (shouldUpdateDebounce > 0 && debouncedUpdateRef.current) {
-    // 使用防抖延迟更新
-    pendingParamsRef.current = rowParams;
-    debouncedUpdateRef.current();
-  } else {
-    // 立即更新（shouldUpdateDebounce = 0 或无防抖函数）
-    processUpdate(rowParams);
+  // 使用 ref 存储上一次的 rowParams，避免引用变化导致的重复调用
+  var prevRowParamsRef = useRef(null);
+
+  // 只有当 rowParams 内容真正变化时才处理更新
+  // 或者是第一次初始化
+  var shouldProcess = !isInitializedRef.current || !isEqualWith(prevRowParamsRef.current, rowParams, customEqualForFunction);
+  if (shouldProcess) {
+    prevRowParamsRef.current = rowParams;
+    isInitializedRef.current = true;
+    if (shouldUpdateDebounce > 0 && debouncedUpdateRef.current) {
+      // 使用防抖延迟更新
+      pendingParamsRef.current = rowParams;
+      debouncedUpdateRef.current();
+    } else {
+      // 立即更新（shouldUpdateDebounce = 0 或无防抖函数）
+      processUpdate(rowParams);
+    }
   }
   return {
     isEditable: (_isEditableRef$curren = isEditableRef.current) !== null && _isEditableRef$curren !== void 0 ? _isEditableRef$curren : column.isEditable,
@@ -135,7 +161,8 @@ var useShouldUpdateForTable = props => {
     rules: (_rulesRef$current = rulesRef.current) !== null && _rulesRef$current !== void 0 ? _rulesRef$current : column.rules,
     fieldProps: (_fieldPropsRef$curren = fieldPropsRef.current) !== null && _fieldPropsRef$curren !== void 0 ? _fieldPropsRef$curren : column.fieldProps,
     desensitization: (_desensitizationRef$c = desensitizationRef.current) !== null && _desensitizationRef$c !== void 0 ? _desensitizationRef$c : column.desensitization,
-    valueType: (_valueTypeRef$current = valueTypeRef.current) !== null && _valueTypeRef$current !== void 0 ? _valueTypeRef$current : column.valueType
+    valueType: (_valueTypeRef$current = valueTypeRef.current) !== null && _valueTypeRef$current !== void 0 ? _valueTypeRef$current : column.valueType,
+    component: (_componentRef$current = componentRef.current) !== null && _componentRef$current !== void 0 ? _componentRef$current : column.component || column.editRender
   };
 };
 export default useShouldUpdateForTable;

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

@@ -87,13 +87,7 @@ var DatePicker = props => {
     restProps.showTime = true;
   }
 
-  // onChange 输出格式化字符串，表单直接存储
-  var handleChange = (date, dateString) => {
-    var _rest$onChange;
-    var valueToStore = date && typeof nextFormat === 'string' ? date.format(nextFormat) : date;
-    (_rest$onChange = rest.onChange) === null || _rest$onChange === void 0 || _rest$onChange.call(rest, valueToStore, dateString);
-  };
-  restProps.onChange = handleChange;
+  // 直接透传 onChange，保持 dayjs 对象类型（与 RangePicker 一致）
 
   // 字符串时间格式兼容，使用 nextFormat 解析 quarter/week 等格式
   if (isString(restProps.value)) {