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

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

@@ -37,7 +37,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 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 _type, _type$replace, _fieldProps2, _fieldProps4, _names, _TargetComponent5, _componentProps2;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -93,9 +93,7 @@ var RenderField = _ref => {
   var _valueType = valueType;
   var _disabled = false;
   var _desensitization = desensitization || [];
-
-  // editRender弃用使用component同ProForm
-  var _editRender = component || editRender;
+  var _component = component || editRender;
   var isCell = mode === 'cell';
   var isSingleMode = mode === 'single';
   if (isCell) {
@@ -184,6 +182,15 @@ var RenderField = _ref => {
     isEditable = (_dynamicProps$isEdita = dynamicProps.isEditable) !== null && _dynamicProps$isEdita !== void 0 ? _dynamicProps$isEdita : isEditable(rowData, reactiveParams);
   }
 
+  // component 处理 - 优先使用 hook 返回的值
+  if (isFunction(_component)) {
+    var _dynamicProps$compone;
+    _component = (_dynamicProps$compone = dynamicProps.component) !== null && _dynamicProps$compone !== void 0 ? _dynamicProps$compone : _component(rowData, reactiveParams);
+  }
+
+  // 更新 _editRender 为处理后的 _component
+  var _editRender = _component;
+
   // 是否只读文本
   var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || getDisabled({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
@@ -208,7 +215,7 @@ var RenderField = _ref => {
     label: label,
     labelRequired,
     required: !isView && _required,
-    rules: _isEditing ? _rules : [],
+    rules: !isView ? _rules : [],
     isSelect: isSelect({
       dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
       type
@@ -230,10 +237,13 @@ var RenderField = _ref => {
   // 允许formItem的属性放在column最外层 - 使用useMemo优化（剔除会透传到 DOM 的字段）
   var _formItemProps = useMemo(() => _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), omit(resetProps, OMIT_FORM_ITEM_AND_DOM_KEYS)), internalRule), {}, {
     validateTrigger
+    // 注意：当 hasFunctionDependency 时会设置 shouldUpdate，shouldUpdate 与 dependencies 互斥，不透传 dependencies
   }), [defaultProps, resetProps, internalRule, validateTrigger]);
 
-  // 只在 single 模式下，当这些函数类型存在时，自动添加 shouldUpdate
+  // 当这些函数类型存在时，自动添加 shouldUpdate
   // 因为这些函数依赖行数据，当行数据变化时需要重新计算
+  // 扩展到所有模式（single/multiple/cell），统一行为
+  // 注意：需要检查原始的 component/editRender，而不是处理后的 _component
   var hasFunctionDependency = isFunction(column === null || column === void 0 ? void 0 : column.disabled) ||
   // disabled 是函数
   isFunction(fieldProps) ||
@@ -244,12 +254,16 @@ var RenderField = _ref => {
   // rules 是函数
   isFunction(isEditable) ||
   // isEditable 是函数
-  isFunction(_editRender) ||
-  // component/editRender 是函数
+  isFunction(component) ||
+  // component 是函数
+  isFunction(editRender) ||
+  // editRender 是函数
   isFunction(viewRender); // viewRender 是函数
 
-  if (isSingleMode && hasFunctionDependency && !(column !== null && column !== void 0 && column.dependencies)) {
-    // 使用 shouldUpdate 监听同一行的数据变化
+  // 移除 isSingleMode 限制，让所有模式都支持响应式更新
+  // 性能优化已通过 useShouldUpdateForTable hook 的缓存和防抖机制实现
+  if (hasFunctionDependency) {
+    // 使用 shouldUpdate 监听同一行的数据变化；shouldUpdate 与 dependencies 互斥，始终优先 shouldUpdate
     _formItemProps.shouldUpdate = (prevValues, currentValues) => {
       var prevRow = get(prevValues, [...namePath, index]);
       var currentRow = get(currentValues, [...namePath, index]);
@@ -327,11 +341,14 @@ var RenderField = _ref => {
     TargetComponent = (_componentMap$type = componentMap[type]) !== null && _componentMap$type !== void 0 ? _componentMap$type : /*#__PURE__*/_jsx(_Fragment, {});
   }
   if (isEditable && _isEditing) {
-    if (typeof _editRender === 'function') {
-      TargetComponent = _editRender(...rowParams);
-    }
+    // _editRender 已经是处理后的值（通过 dynamicProps.component 或直接计算）
+    // 如果原本是函数，此时 _editRender 已经是执行后的 ReactNode
+    // 如果原本是 ReactElement，_editRender 就是 ReactElement
     if ( /*#__PURE__*/React.isValidElement(_editRender)) {
       TargetComponent = _editRender;
+    } else if (_editRender) {
+      // 其他情况（可能是字符串或其他类型的 ReactNode）
+      TargetComponent = _editRender;
     }
   }
 
@@ -360,25 +377,25 @@ var RenderField = _ref => {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    var _args = args === null || args === void 0 ? void 0 : args[0];
+    var rawArgs = (args === null || args === void 0 ? void 0 : args.length) === 1 && Array.isArray(args === null || args === void 0 ? void 0 : args[0]) ? args === null || args === void 0 ? void 0 : args[0] : args;
     var nextArgs = [];
-    nextArgs[0] = _args[0];
+    nextArgs[0] = rawArgs === null || rawArgs === void 0 ? void 0 : rawArgs[0];
     // 返回表单元素默认值
     nextArgs[2] = _objectSpread(_objectSpread({}, options), {}, {
-      extra: _args
+      extra: rawArgs
     });
     switch (type) {
       case 'ProSelect':
       case 'ProModalSelect':
       case 'ProEnum':
-        nextArgs[2].option = _args[1];
+        nextArgs[2].option = rawArgs === null || rawArgs === void 0 ? void 0 : rawArgs[1];
         break;
       case 'ProCascader':
-        nextArgs[2].selectedOptions = _args[1];
+        nextArgs[2].selectedOptions = rawArgs === null || rawArgs === void 0 ? void 0 : rawArgs[1];
         break;
       case 'DatePicker':
       case 'RangePicker':
-        nextArgs[2].dateString = _args[1];
+        nextArgs[2].dateString = rawArgs === null || rawArgs === void 0 ? void 0 : rawArgs[1];
         break;
       default:
         break;
@@ -401,13 +418,13 @@ var RenderField = _ref => {
 
   // 使用 useCallback 创建稳定的 onChange 函数
   var _onChange = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var _args3 = arguments;
+    var executeChange,
+      _args3 = arguments;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          // 如果防抖函数不存在，创建一个新的防抖函数
-          if (!debounceRef.current) {
-            debounceRef.current = debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          executeChange = /*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
               var _len2,
                 innerArgs,
                 _key2,
@@ -419,10 +436,11 @@ var RenderField = _ref => {
                 orgRow,
                 _TargetComponent,
                 _TargetComponent2,
-                _Object$keys,
-                _Object$keys$map,
+                rowAfter,
+                _Object$keys2,
+                _Object$keys2$map,
                 diff,
-                _validateFieldKeys,
+                _validateFieldKeys2,
                 _args2 = arguments;
               return _regeneratorRuntime().wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {
@@ -447,7 +465,7 @@ var RenderField = _ref => {
                     row = form.getFieldValue(rowPath, true);
                     orgRow = cloneDeep(row);
                     if (!onFieldChange) {
-                      _context.next = 21;
+                      _context.next = 22;
                       break;
                     }
                     _args = formatArgs(innerArgs);
@@ -468,58 +486,88 @@ var RenderField = _ref => {
                     _context.next = 19;
                     return onFieldChange(..._args);
                   case 19:
-                    _context.next = 30;
+                    // onFieldChange 内已通过 form.setFieldValue(子路径) 或原地改 record 更新 store；此处再整行 setFieldValue(rowPath, rowAfter) 易用滞后快照覆盖 Field 刚写入的新值（如 formType）。仅延后读表做校验与 forceUpdate，不再整行回写。
+                    setTimeout(() => {
+                      var _form$getFieldValue;
+                      var rowAfter = (_form$getFieldValue = form.getFieldValue(rowPath, true)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : row;
+                      if (validateTrigger && validateTrigger.includes('onChange')) {
+                        if (!isEqual(orgRow, rowAfter)) {
+                          var _Object$keys, _Object$keys$map;
+                          var diff = difference(rowAfter, orgRow) || {};
+                          var _validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 || (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, key => [...rowPath, key]).concat(dependencies || []);
+                          if (_validateFieldKeys !== null && _validateFieldKeys !== void 0 && _validateFieldKeys.length) {
+                            debounceValidate(_validateFieldKeys);
+                          }
+                        }
+                      }
+                      if (!isEqual(orgRow, rowAfter)) {
+                        compatStartTransition(() => {
+                          setState({
+                            forceUpdate: {
+                              rowKey: record === null || record === void 0 ? void 0 : record.rowKey
+                            }
+                          });
+                        });
+                      }
+                    }, 0);
+                    _context.next = 34;
                     break;
-                  case 21:
+                  case 22:
                     _args = _args.concat([row, index, form]);
                     _context.t2 = (_TargetComponent2 = TargetComponent) === null || _TargetComponent2 === void 0 || (_TargetComponent2 = _TargetComponent2.props) === null || _TargetComponent2 === void 0 ? void 0 : _TargetComponent2.onChange;
                     if (!_context.t2) {
-                      _context.next = 26;
+                      _context.next = 27;
                       break;
                     }
-                    _context.next = 26;
+                    _context.next = 27;
                     return TargetComponent.props.onChange(..._args);
-                  case 26:
+                  case 27:
                     _context.t3 = onChange;
                     if (!_context.t3) {
-                      _context.next = 30;
+                      _context.next = 31;
                       break;
                     }
-                    _context.next = 30;
+                    _context.next = 31;
                     return onChange(..._args);
-                  case 30:
-                    // 判断属性是否变动
-                    form.setFieldValue(rowPath, row);
+                  case 31:
+                    rowAfter = row;
+                    form.setFieldValue(rowPath, rowAfter);
                     if (validateTrigger && validateTrigger.includes('onChange')) {
-                      if (!isEqual(orgRow, row)) {
-                        diff = difference(row, orgRow) || {};
-                        _validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 || (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, key => [...rowPath, key]).concat(dependencies || []);
-                        if (_validateFieldKeys !== null && _validateFieldKeys !== void 0 && _validateFieldKeys.length) {
-                          debounceValidate(_validateFieldKeys);
+                      if (!isEqual(orgRow, rowAfter)) {
+                        diff = difference(rowAfter, orgRow) || {};
+                        _validateFieldKeys2 = (_Object$keys2 = Object.keys(diff)) === null || _Object$keys2 === void 0 || (_Object$keys2$map = _Object$keys2.map) === null || _Object$keys2$map === void 0 ? void 0 : _Object$keys2$map.call(_Object$keys2, key => [...rowPath, key]).concat(dependencies || []);
+                        if (_validateFieldKeys2 !== null && _validateFieldKeys2 !== void 0 && _validateFieldKeys2.length) {
+                          debounceValidate(_validateFieldKeys2);
                         }
                       }
                     }
-                    // 仅在存在联动逻辑且行数据实际发生变化时触发强制刷新
-                    if (onFieldChange && !isEqual(orgRow, row)) {
-                      compatStartTransition(() => {
-                        setState({
-                          forceUpdate: {
-                            rowKey: record === null || record === void 0 ? void 0 : record.rowKey
-                          }
-                        });
-                      });
-                    }
-                  case 33:
+                  case 34:
                   case "end":
                     return _context.stop();
                 }
               }, _callee);
-            })), 300);
+            }));
+            return function executeChange() {
+              return _ref3.apply(this, arguments);
+            };
+          }(); // onFieldChange 立即执行，不走防抖
+          // 表格行数据变化会导致组件卸载重建，防抖回调会在 cleanup 中被取消
+          if (!onFieldChange) {
+            _context2.next = 5;
+            break;
+          }
+          _context2.next = 4;
+          return executeChange(..._args3);
+        case 4:
+          return _context2.abrupt("return");
+        case 5:
+          // 没有 onFieldChange 时，使用防抖处理 onChange
+          if (!debounceRef.current) {
+            debounceRef.current = debounce(executeChange, 300);
           }
-
           // 调用防抖函数
           debounceRef.current(..._args3);
-        case 2:
+        case 7:
         case "end":
           return _context2.stop();
       }
@@ -538,15 +586,12 @@ var RenderField = _ref => {
   // 使用useCallback优化_onblur函数
   var _onblur = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
     var _TargetComponent3;
-    var _len3,
-      args,
-      _key3,
-      _args,
+    var _args,
       rowPath,
       row,
       orgRow,
-      _Object$keys2,
-      _Object$keys2$map,
+      _Object$keys3,
+      _Object$keys3$map,
       diff,
       validateFieldKeys,
       _args4 = arguments;
@@ -559,52 +604,49 @@ var RenderField = _ref => {
           }
           return _context3.abrupt("return", null);
         case 2:
-          for (_len3 = _args4.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-            args[_key3] = _args4[_key3];
-          }
-          _args = formatArgs([...args]);
+          _args = formatArgs(..._args4);
           rowPath = [...namePath, index];
           row = form.getFieldValue(rowPath, true);
           orgRow = cloneDeep(row);
           _args[1] = row;
           _context3.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 || (_TargetComponent3 = _TargetComponent3.props) === null || _TargetComponent3 === void 0 ? void 0 : _TargetComponent3.onBlur;
           if (!_context3.t0) {
-            _context3.next = 12;
+            _context3.next = 11;
             break;
           }
-          _context3.next = 12;
+          _context3.next = 11;
           return TargetComponent.props.onBlur(..._args);
-        case 12:
+        case 11:
           _context3.t1 = onBlur;
           if (!_context3.t1) {
-            _context3.next = 16;
+            _context3.next = 15;
             break;
           }
-          _context3.next = 16;
+          _context3.next = 15;
           return onBlur(..._args);
-        case 16:
+        case 15:
           // 判断属性是否变动
           form.setFieldValue(rowPath, row);
           if (validateTrigger && validateTrigger.includes('onBlur')) {
             if (!isEqual(orgRow, row)) {
               diff = difference(row, orgRow) || {};
-              validateFieldKeys = (_Object$keys2 = Object.keys(diff)) === null || _Object$keys2 === void 0 || (_Object$keys2$map = _Object$keys2.map) === null || _Object$keys2$map === void 0 ? void 0 : _Object$keys2$map.call(_Object$keys2, key => [...rowPath, key]).concat(dependencies || []);
+              validateFieldKeys = (_Object$keys3 = Object.keys(diff)) === null || _Object$keys3 === void 0 || (_Object$keys3$map = _Object$keys3.map) === null || _Object$keys3$map === void 0 ? void 0 : _Object$keys3$map.call(_Object$keys3, key => [...rowPath, key]).concat(dependencies || []);
               if (validateFieldKeys !== null && validateFieldKeys !== void 0 && validateFieldKeys.length) {
                 debounceValidate(validateFieldKeys);
               }
             }
           }
           if (!isCell) {
-            _context3.next = 22;
+            _context3.next = 21;
             break;
           }
-          _context3.next = 21;
+          _context3.next = 20;
           return form.validateFields([cellName]);
-        case 21:
+        case 20:
           setState({
             cellNamePath: []
           });
-        case 22:
+        case 21:
           // 单行编辑时需要 强制更新视图，仅对当前行打标记
           compatStartTransition(() => {
             setState({
@@ -613,7 +655,7 @@ var RenderField = _ref => {
               }
             });
           });
-        case 23:
+        case 22:
         case "end":
           return _context3.stop();
       }
@@ -673,7 +715,38 @@ var RenderField = _ref => {
 
   // 使用useMemo优化最终的formItemProps - 修复Hooks使用规则
   var finalFormItemProps = useMemo(() => {
-    return Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), namesTransform()), isTrim(type, trim, proConfig)));
+    var _namesTransformProps$, _namesTransformProps$2;
+    var defaultTransformProps = defaultTransform();
+    var namesTransformProps = namesTransform();
+    var trimProps = isTrim(type, trim, proConfig); // 使用顶层调用的proConfig
+
+    var transformNormalize = (_namesTransformProps$ = namesTransformProps === null || namesTransformProps === void 0 ? void 0 : namesTransformProps.normalize) !== null && _namesTransformProps$ !== void 0 ? _namesTransformProps$ : defaultTransformProps === null || defaultTransformProps === void 0 ? void 0 : defaultTransformProps.normalize;
+    var userNormalize = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.normalize;
+    var transformGetValueProps = (_namesTransformProps$2 = namesTransformProps === null || namesTransformProps === void 0 ? void 0 : namesTransformProps.getValueProps) !== null && _namesTransformProps$2 !== void 0 ? _namesTransformProps$2 : defaultTransformProps === null || defaultTransformProps === void 0 ? void 0 : defaultTransformProps.getValueProps;
+    var userGetValueProps = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.getValueProps;
+    var finalNormalize = transformNormalize && userNormalize ? (value, prevValue, allValues, isDiffMode) => {
+      // 用户 normalize 需要拿到组件原始值（如 DatePicker 的 dayjs）
+      var userValue = userNormalize(value, prevValue, allValues, isDiffMode);
+      // 保持用户优先：用户有明确返回值时直接使用，不再强制走内置转换
+      if (userValue !== undefined) {
+        return userValue;
+      }
+      // 仅在用户未返回时，回退到内置 transform 逻辑
+      return transformNormalize(value, prevValue, allValues, isDiffMode);
+    } : userNormalize || transformNormalize;
+    var finalGetValueProps = transformGetValueProps && userGetValueProps ? function (value) {
+      for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
+        args[_key3 - 1] = arguments[_key3];
+      }
+      var transformValueProps = transformGetValueProps(value, ...args) || {};
+      var nextValue = Object.prototype.hasOwnProperty.call(transformValueProps, 'value') ? transformValueProps.value : value;
+      var userValueProps = userGetValueProps(nextValue, ...args) || {};
+      return _objectSpread(_objectSpread({}, transformValueProps), userValueProps);
+    } : userGetValueProps || transformGetValueProps;
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, _formItemProps), defaultTransformProps), namesTransformProps), trimProps), {}, {
+      normalize: finalNormalize,
+      getValueProps: finalGetValueProps
+    });
   }, [_formItemProps, defaultTransform, namesTransform, type, trim, proConfig]);
 
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
@@ -691,20 +764,50 @@ var RenderField = _ref => {
     // 如果处于 shouldUpdate 模式，需要重新获取最新的行数据并重新计算依赖值
     var finalComponentProps = componentProps;
     if (shouldUpdateMode) {
-      // 重新获取最新的行数据
+      var _column$isEditable2;
+      // 重新获取最新的行数据（shouldUpdate 触发时，通过 getFieldValue 拿到最新值）
       var latestRowData = form.getFieldValue([...namePath, index]) || record || {};
-      var latestOptions = {
-        index,
+      var latestReactiveParams = {
         form,
-        name: column === null || column === void 0 ? void 0 : column.name,
+        index,
         namePath: [...namePath, index]
       };
-      var latestRowParams = [latestRowData, latestOptions];
+      var latestRowParams = [latestRowData, latestReactiveParams];
 
-      // 重新计算 fieldProps
+      // ⭐ 关键修改：shouldUpdate 模式下，跳过缓存，直接重新计算所有响应式属性
       var latestFieldProps = fieldProps || formItemProps || {};
       if (isFunction(fieldProps)) {
-        latestFieldProps = fieldProps(...latestRowParams);
+        latestFieldProps = fieldProps(latestRowData, latestReactiveParams);
+      }
+
+      // 重新计算 required（用于可能的后续逻辑）
+      var latestRequired = required;
+      if (isFunction(required)) {
+        latestRequired = required(latestRowData, latestReactiveParams);
+      }
+
+      // 重新计算 rules（用于可能的后续逻辑）
+      var latestRules = rules;
+      if (isFunction(rules)) {
+        latestRules = rules(latestRowData, latestReactiveParams);
+      }
+
+      // 重新计算 desensitization
+      var latestDesensitization = desensitization || [];
+      if (isFunction(desensitization)) {
+        latestDesensitization = desensitization(latestRowData, latestReactiveParams);
+      }
+
+      // 重新计算 component
+      var latestComponent = component || editRender;
+      if (isFunction(latestComponent)) {
+        latestComponent = latestComponent(latestRowData, latestReactiveParams);
+      }
+
+      // 重新计算 isEditable（使用原始的 column.isEditable，而不是处理后的 isEditable）
+      var latestIsEditable = (_column$isEditable2 = column.isEditable) !== null && _column$isEditable2 !== void 0 ? _column$isEditable2 : true;
+      if (isFunction(column.isEditable)) {
+        latestIsEditable = column.isEditable(latestRowData, latestReactiveParams);
       }
 
       // 重新计算 disabled
@@ -717,10 +820,75 @@ var RenderField = _ref => {
         params: latestRowParams
       });
 
-      // 更新 componentProps 中的 disabled 和 fieldProps
-      finalComponentProps = _objectSpread(_objectSpread({}, componentProps), {}, {
-        disabled: latestDisabled
-      }, latestFieldProps);
+      // 更新 componentProps 中的所有响应式属性
+      // latestTargetComponent 稍后计算，此处先占位；最终 finalComponentProps 会在下方合并 latestTargetComponent?.props
+      finalComponentProps = _objectSpread(_objectSpread(_objectSpread({}, componentProps), latestFieldProps), {}, {
+        disabled: latestDisabled,
+        desensitization: latestDesensitization,
+        // shouldUpdate 模式下，确保事件包装函数不被 fieldProps 覆盖
+        onChange: _onChange,
+        onBlur: _onblur
+      });
+
+      // ⭐ 关键修改：在 shouldUpdate 模式下，需要重新设置 TargetComponent
+      // 因为 component 函数可能返回不同的结果
+      var latestTargetComponent = TargetComponent;
+
+      // 首先检查是否有内置type
+      if (!latestComponent && typeof type === 'string') {
+        var _componentMap$type2;
+        latestTargetComponent = (_componentMap$type2 = componentMap[type]) !== null && _componentMap$type2 !== void 0 ? _componentMap$type2 : /*#__PURE__*/_jsx(_Fragment, {});
+      }
+
+      // 然后处理自定义 component
+      var latestIsView = !latestIsEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || getDisabled({
+        globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
+        formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
+        column,
+        tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
+        columnFieldProps: latestFieldProps,
+        params: latestRowParams,
+        rowDisabled: rowDisabled || 'empty'
+      });
+      if (latestIsEditable && _isEditing) {
+        if ( /*#__PURE__*/React.isValidElement(latestComponent)) {
+          latestTargetComponent = latestComponent;
+        } else if (latestComponent) {
+          latestTargetComponent = latestComponent;
+        }
+      }
+
+      // 查看模式
+      if (latestIsView) {
+        if (typeof viewRender === 'function') {
+          var latestCurrentValue = dataIndex ? latestRowData === null || latestRowData === void 0 ? void 0 : latestRowData[dataIndex] : null;
+          var _View = viewRender(latestCurrentValue, latestRowData || {}, options);
+          latestTargetComponent = /*#__PURE__*/_jsx(Container, {
+            viewEmpty: viewEmpty,
+            children: _View
+          });
+        }
+        if ( /*#__PURE__*/React.isValidElement(viewRender)) {
+          latestTargetComponent = viewRender;
+        }
+      }
+
+      // 使用重新计算的 TargetComponent
+      TargetComponent = latestTargetComponent;
+
+      // componentProps 里展开了外层旧 TargetComponent?.props（如 { formType: "Input" }），
+      // 用 latestTargetComponent?.props 覆盖，确保不会被旧 cloneElement props 污染
+      if ( /*#__PURE__*/React.isValidElement(latestTargetComponent)) {
+        var _componentProps = latestTargetComponent.props;
+        // 确保 props 是对象类型才进行展开
+        if (_componentProps && typeof _componentProps === 'object') {
+          finalComponentProps = _objectSpread(_objectSpread(_objectSpread({}, finalComponentProps), _componentProps), {}, {
+            // 始终保证事件处理函数不被覆盖
+            onChange: _onChange,
+            onBlur: _onblur
+          });
+        }
+      }
     }
     var FormItem = null;
     // 当 viewRender 存在时，需要排除 finalComponentProps 中的 children，避免覆盖 Container 的 children
@@ -730,7 +898,15 @@ var RenderField = _ref => {
     if (isTargetDomElement) {
       propsForTarget = omit(propsForTarget, ['disabled', ...OMIT_FORM_ITEM_AND_DOM_KEYS]);
     }
-    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, propsForTarget)) : /*#__PURE__*/_jsx(TargetComponent, _objectSpread({}, propsForTarget));
+    // 当 TargetComponent 未定义时，使用空的占位组件避免渲染错误
+    var FieldComponent = null;
+    if ( /*#__PURE__*/React.isValidElement(TargetComponent)) {
+      FieldComponent = /*#__PURE__*/React.cloneElement(TargetComponent, propsForTarget);
+    } else if (TargetComponent) {
+      FieldComponent = /*#__PURE__*/_jsx(TargetComponent, _objectSpread({}, propsForTarget));
+    } else {
+      FieldComponent = /*#__PURE__*/_jsx(_Fragment, {});
+    }
     if (originalValues && !getIsNew(record)) {
       FieldComponent = /*#__PURE__*/_jsx(ListChangedWrapper, {
         name: cellName,
@@ -761,7 +937,7 @@ var RenderField = _ref => {
     }
     FormItem = TargetComponent ? /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
       validateFirst: true
-    }, omit(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _formItemProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+    }, omit(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', 'disabled', _formItemProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
       // 移除非必要字段，但保留 dependencies
       className: _className,
       name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
@@ -784,7 +960,7 @@ var RenderField = _ref => {
     return FormItem;
   };
   return /*#__PURE__*/_jsx(FieldProvider, {
-    value: ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps) || {},
+    value: ((_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps) || {},
     children: finalFormItemProps.shouldUpdate ? /*#__PURE__*/_jsx(Form.Item, {
       noStyle: true,
       shouldUpdate: finalFormItemProps.shouldUpdate,
@@ -805,6 +981,12 @@ export default /*#__PURE__*/memo(RenderField, (prevProps, nextProps) => {
     nextColumn = nextProps.column,
     nextConfig = nextProps.config;
 
+  // 自定义 component/editRender 且行对象为同引用时，浅比较无法区分原地修改，需强制重渲染
+  var hasFunctionComponent = isFunction(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.component) || isFunction(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.editRender) || isFunction(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.component) || isFunction(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.editRender);
+  if (hasFunctionComponent && prevRecord === nextRecord) {
+    return false;
+  }
+
   // 构建新的参数格式（与 ProForm 保持一致）
   var prevNamePath = getNamePath(prevConfig === null || prevConfig === void 0 ? void 0 : prevConfig.name, prevConfig === null || prevConfig === void 0 ? void 0 : prevConfig.virtualKey);
   var nextNamePath = getNamePath(nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.name, nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.virtualKey);
@@ -827,20 +1009,33 @@ export default /*#__PURE__*/memo(RenderField, (prevProps, nextProps) => {
   }
 
   // fieldProps 函数化直接更新，无法比对返回值是否一致
+  // 优化：不直接调用函数，而是比较输入参数（record 和 reactiveParams）
+  // 如果输入参数相同，fieldProps 的返回值应该相同（纯函数假设）
   if (isFunction(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.fieldProps) && isFunction(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.fieldProps)) {
-    var prevFieldProps = prevColumn.fieldProps(prevRecord, prevReactiveParams);
-    var nextFieldProps = nextColumn.fieldProps(nextRecord, nextReactiveParams);
-    if (!isEqualWith(prevFieldProps, nextFieldProps, customEqualForFunction)) {
+    // 比较 record 数据是否变化
+    if (!isEqualWith(prevRecord, nextRecord, customEqualForFunction)) {
+      return false;
+    }
+    // reactiveParams 中的 form、index、namePath 已经在外层比较过了，无需重复比较
+  }
+  // fieldProps 为对象时，必须比较配置变化（如 dataSource 异步更新）
+  if (!isFunction(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.fieldProps) && !isFunction(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.fieldProps)) {
+    var isFieldPropsEqual = isEqualWith(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.fieldProps, nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.fieldProps, customEqualForFunction);
+    if (!isFieldPropsEqual) {
       return false;
     }
   }
 
   // 通用函数比较方法
+  // 优化：不直接调用函数，而是比较函数引用和输入参数
   var compareFunctionResult = (prevColumn, nextColumn, prevValues, nextValues, prevReactiveParams, nextReactiveParams, functionName) => {
     var prevFunc = prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn[functionName];
     var nextFunc = nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn[functionName];
     if (isFunction(prevFunc) && isFunction(nextFunc)) {
-      return isEqualWith(prevFunc(prevValues, prevReactiveParams), nextFunc(nextValues, nextReactiveParams), customEqualForFunction);
+      // 函数引用变化说明闭包可能捕获了新的外部状态（如异步加载的 list），必须重渲染
+      if (prevFunc !== nextFunc) return false;
+      // 同引用函数，比较输入参数（纯函数假设：输入相同则输出相同）
+      return isEqualWith(prevValues, nextValues, customEqualForFunction);
     }
     return true; // 如果不是函数或只有一个是函数，认为相等
   };