@zat-design/sisyphus-react 3.14.0-beta.2 → 4.0.0-beta.10

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

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
+var _utils = require("../../../utils");
 var _valueType2 = _interopRequireDefault(require("../../../ProForm/utils/valueType"));
 var _transform = _interopRequireDefault(require("../../utils/transform"));
 var _tools = require("../../utils/tools");
@@ -24,16 +24,17 @@ var _Container = _interopRequireDefault(require("../../../ProForm/components/Con
 var _transformNames = _interopRequireDefault(require("../../../ProForm/utils/transformNames"));
 var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
-var _utils = require("../../../ProForm/utils");
+var _utils2 = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
 var _getDefaultProps = require("../../utils/getDefaultProps");
 var _ListChangedWrapper = _interopRequireDefault(require("./ListChangedWrapper"));
+var _useShouldUpdateForTable = _interopRequireDefault(require("../../utils/useShouldUpdateForTable"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies", "desensitization"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = _ref => {
-  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps2;
+  var _type, _type$replace, _fieldProps2, _fieldProps4, _names, _TargetComponent5, _componentProps2;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -65,9 +66,6 @@ var RenderField = _ref => {
     dependencies = column.dependencies,
     desensitization = column.desensitization,
     resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
-
-  // editRender弃用使用component同ProForm
-  var _editRender = component || editRender;
   var mode = config.mode,
     cellName = config.cellName,
     cellNamePath = config.cellNamePath,
@@ -84,13 +82,17 @@ var RenderField = _ref => {
     validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
     otherProps = config.otherProps,
     diffConfig = config.diffConfig,
-    getIsNew = config.getIsNew;
+    getIsNew = config.getIsNew,
+    shouldUpdateDebounce = config.shouldUpdateDebounce;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
   var _valueType = valueType;
   var _disabled = false;
   var _desensitization = desensitization || [];
+
+  // editRender弃用使用component同ProForm
+  var _editRender = component || editRender;
   var isCell = mode === 'cell';
   if (isCell) {
     record['is-view'] = !(0, _lodash.isEqual)(cellNamePath, cellName);
@@ -109,32 +111,45 @@ var RenderField = _ref => {
   var rowData = form.getFieldValue([...namePath, index]) || record || {};
   var currentValue = dataIndex ? rowData === null || rowData === void 0 ? void 0 : rowData[dataIndex] : null;
 
-  // 第三个参数
-  var options = {
+  // 第三个参数 - 使用useMemo优化
+  var options = (0, _react.useMemo)(() => ({
     index,
     form,
     name: column === null || column === void 0 ? void 0 : column.name,
     namePath: [...namePath, index]
-  };
+  }), [index, column === null || column === void 0 ? void 0 : column.name, namePath]);
 
-  // 行参数
-  var rowParams = [currentValue, rowData, options];
+  // 行参数 - 使用useMemo优化
+  var rowParams = (0, _react.useMemo)(() => [currentValue, rowData, options], [currentValue, rowData, options]);
+
+  // 使用 hook 处理动态属性（带选择性防抖）
+  var dynamicProps = (0, _useShouldUpdateForTable.default)({
+    rowParams,
+    column,
+    shouldUpdateDebounce
+  });
 
   // required & rules & fieldProps & disabled & valueType 函数化处理
+  // 优先使用 hook 返回的值，fallback 到原始值
   if ((0, _lodash.isFunction)(required)) {
-    _required = required(...rowParams);
+    var _dynamicProps$require;
+    _required = (_dynamicProps$require = dynamicProps.required) !== null && _dynamicProps$require !== void 0 ? _dynamicProps$require : required(...rowParams);
   }
   if ((0, _lodash.isFunction)(fieldProps)) {
-    _fieldProps = fieldProps(...rowParams);
+    var _dynamicProps$fieldPr;
+    _fieldProps = (_dynamicProps$fieldPr = dynamicProps.fieldProps) !== null && _dynamicProps$fieldPr !== void 0 ? _dynamicProps$fieldPr : fieldProps(...rowParams);
   }
   if ((0, _lodash.isFunction)(rules)) {
-    _rules = rules(...rowParams);
+    var _dynamicProps$rules;
+    _rules = (_dynamicProps$rules = dynamicProps.rules) !== null && _dynamicProps$rules !== void 0 ? _dynamicProps$rules : rules(...rowParams);
   }
   if ((0, _lodash.isFunction)(valueType)) {
-    _valueType = valueType(...rowParams);
+    var _dynamicProps$valueTy;
+    _valueType = (_dynamicProps$valueTy = dynamicProps.valueType) !== null && _dynamicProps$valueTy !== void 0 ? _dynamicProps$valueTy : valueType(...rowParams);
   }
   if ((0, _lodash.isFunction)(desensitization)) {
-    _desensitization = desensitization(...rowParams);
+    var _dynamicProps$desensi;
+    _desensitization = (_dynamicProps$desensi = dynamicProps.desensitization) !== null && _dynamicProps$desensi !== void 0 ? _dynamicProps$desensi : desensitization(...rowParams);
   }
 
   // 获取最终的disabled
@@ -146,11 +161,11 @@ var RenderField = _ref => {
     columnFieldProps: _fieldProps,
     params: rowParams
   });
-  if (typeof isEditable === 'function') {
-    isEditable = isEditable(...rowParams);
-    // setTimeout(() => {
-    //   !isEditable && form.validateFields([cellName]);
-    // }, 100);
+
+  // isEditable 处理 - 优先使用 hook 返回的值
+  if ((0, _lodash.isFunction)(isEditable)) {
+    var _dynamicProps$isEdita;
+    isEditable = (_dynamicProps$isEdita = dynamicProps.isEditable) !== null && _dynamicProps$isEdita !== void 0 ? _dynamicProps$isEdita : isEditable(...rowParams);
   }
 
   // 是否只读文本
@@ -168,14 +183,17 @@ var RenderField = _ref => {
   var baseName = isView ? name : namePath;
   var TargetComponent;
 
-  // 设置校验规则
+  // 将Hooks调用移到组件顶层
+  var proConfig = (0, _ProConfigProvider.useProConfig)();
+
+  // 设置校验规则 - 修复Hooks使用规则
   var internalRule = (0, _useRules.default)({
     names,
     label: label,
     labelRequired,
     required: !isView && _required,
     rules: _isEditing ? _rules : [],
-    isSelect: (0, _utils.isSelect)({
+    isSelect: (0, _utils2.isSelect)({
       dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
       type
     }),
@@ -184,17 +202,19 @@ var RenderField = _ref => {
 
   // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
   var formItemChildProps = (0, _objectSpread2.default)({}, _fieldProps);
-  var defaultProps = (0, _getDefaultProps.getDefaultProps)({
+
+  // 使用useMemo优化defaultProps计算
+  var defaultProps = (0, _react.useMemo)(() => (0, _getDefaultProps.getDefaultProps)({
     name,
     namePath: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
     type: column === null || column === void 0 ? void 0 : column.type,
     fieldProps: column === null || column === void 0 ? void 0 : column.fieldProps
-  });
+  }), [name, formNamePath, cellName, column === null || column === void 0 ? void 0 : column.type, column === null || column === void 0 ? void 0 : column.fieldProps]);
 
-  // 允许formItem的属性放在column最外层
-  var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), resetProps), internalRule), {}, {
+  // 允许formItem的属性放在column最外层 - 使用useMemo优化
+  var _formItemProps = (0, _react.useMemo)(() => (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), resetProps), internalRule), {}, {
     validateTrigger
-  });
+  }), [defaultProps, resetProps, internalRule, validateTrigger]);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     _valueType = 'switch';
@@ -204,20 +224,20 @@ var RenderField = _ref => {
    * 针对一些特殊类型，基于formItem的normalize与getValueProps进行默认值类型转换
    * @returns {}
    */
-  var defaultTransform = () => {
+  var defaultTransform = (0, _react.useCallback)(() => {
     var types = ['DatePicker', 'RangePicker'];
     if (!_valueType && types.includes(type)) {
       var _transformMap$type;
       return _transform.default === null || _transform.default === void 0 || (_transformMap$type = _transform.default[type]) === null || _transformMap$type === void 0 ? void 0 : _transformMap$type.call(_transform.default, _fieldProps || {});
     }
     return {};
-  };
+  }, [_valueType, type, _fieldProps]);
 
   /**
    * 配置valueType时，基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
-  var valueTypeTransform = () => {
+  var valueTypeTransform = (0, _react.useCallback)(() => {
     var _fieldProps3;
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
@@ -227,7 +247,7 @@ var RenderField = _ref => {
       mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
     });
     return (0, _lodash.isFunction)(_valueType2.default[_valueType]) ? _valueType2.default[_valueType](params) : {};
-  };
+  }, [type, _valueType, column, (_fieldProps4 = _fieldProps) === null || _fieldProps4 === void 0 ? void 0 : _fieldProps4.mode]);
   if ((_names = names) !== null && _names !== void 0 && _names.length) {
     // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
     names = names.map(key => {
@@ -252,14 +272,14 @@ var RenderField = _ref => {
    * 配置names时，基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
-  var namesTransform = () => {
+  var namesTransform = (0, _react.useCallback)(() => {
     var _names3;
     if (!((_names3 = names) !== null && _names3 !== void 0 && _names3.length)) {
       return valueTypeTransform();
     }
     var namesStr = [...baseName, index, dataIndex];
     return (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _formItemProps), valueTypeTransform()), form, names, namesStr, type);
-  };
+  }, [names, baseName, index, dataIndex, _formItemProps, type]);
   if (!_editRender && typeof type === 'string') {
     var _componentMap$type;
     TargetComponent = (_componentMap$type = componentMap[type]) !== null && _componentMap$type !== void 0 ? _componentMap$type : /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
@@ -292,7 +312,9 @@ var RenderField = _ref => {
   var onChange = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.onChange;
   var onFieldChange = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.onFieldChange;
   var onBlur = formItemChildProps === null || formItemChildProps === void 0 ? void 0 : formItemChildProps.onBlur;
-  var formatArgs = function formatArgs() {
+
+  // 使用useCallback优化formatArgs函数
+  var formatArgs = (0, _react.useCallback)(function () {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
@@ -320,230 +342,268 @@ var RenderField = _ref => {
         break;
     }
     return nextArgs;
-  };
-  var debounceValidate = function debounceValidate() {
+  }, [options, type]);
+
+  // 使用useCallback优化debounceValidate函数
+  var debounceValidate = (0, _react.useCallback)(function () {
     var validateFieldKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     setTimeout(() => {
-      form.validateFields(validateFieldKeys);
+      form.validateFields(validateFieldKeys, {
+        recursive: true
+      });
     }, 100);
-  };
+  }, [form]);
+
+  // 使用 useRef 保存防抖函数
+  var debounceRef = (0, _react.useRef)(null);
+
+  // 使用 useCallback 创建稳定的 onChange 函数
+  var _onChange = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+    var _args3 = arguments;
+    return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          // 如果防抖函数不存在，创建一个新的防抖函数
+          if (!debounceRef.current) {
+            debounceRef.current = (0, _lodash.debounce)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+              var _len2,
+                innerArgs,
+                _key2,
+                _args,
+                rowPath,
+                _dependencies$map,
+                validateFieldKeys,
+                row,
+                orgRow,
+                _TargetComponent,
+                _TargetComponent2,
+                _Object$keys,
+                _Object$keys$map,
+                diff,
+                _validateFieldKeys,
+                _args2 = arguments;
+              return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    for (_len2 = _args2.length, innerArgs = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+                      innerArgs[_key2] = _args2[_key2];
+                    }
+                    _args = [...innerArgs];
+                    rowPath = [...namePath, index];
+                    if (!(!onFieldChange && !onChange)) {
+                      _context.next = 6;
+                      break;
+                    }
+                    if (dependencies !== null && dependencies !== void 0 && dependencies.length) {
+                      validateFieldKeys = dependencies === null || dependencies === void 0 || (_dependencies$map = dependencies.map) === null || _dependencies$map === void 0 ? void 0 : _dependencies$map.call(dependencies, key => [...rowPath, key]);
+                      setTimeout(() => {
+                        form.validateFields(validateFieldKeys);
+                      }, 100);
+                    }
+                    return _context.abrupt("return", null);
+                  case 6:
+                    row = form.getFieldValue(rowPath, true);
+                    orgRow = (0, _lodash.cloneDeep)(row);
+                    if (!onFieldChange) {
+                      _context.next = 21;
+                      break;
+                    }
+                    _args = formatArgs(innerArgs);
+                    _args[1] = row;
+                    _context.t0 = (_TargetComponent = TargetComponent) === null || _TargetComponent === void 0 || (_TargetComponent = _TargetComponent.props) === null || _TargetComponent === void 0 ? void 0 : _TargetComponent.onFieldChange;
+                    if (!_context.t0) {
+                      _context.next = 15;
+                      break;
+                    }
+                    _context.next = 15;
+                    return TargetComponent.props.onFieldChange(..._args);
+                  case 15:
+                    _context.t1 = onFieldChange;
+                    if (!_context.t1) {
+                      _context.next = 19;
+                      break;
+                    }
+                    _context.next = 19;
+                    return onFieldChange(..._args);
+                  case 19:
+                    _context.next = 30;
+                    break;
+                  case 21:
+                    _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;
+                      break;
+                    }
+                    _context.next = 26;
+                    return TargetComponent.props.onChange(..._args);
+                  case 26:
+                    _context.t3 = onChange;
+                    if (!_context.t3) {
+                      _context.next = 30;
+                      break;
+                    }
+                    _context.next = 30;
+                    return onChange(..._args);
+                  case 30:
+                    // 判断属性是否变动
+                    form.setFieldValue(rowPath, row);
+                    if (validateTrigger && validateTrigger.includes('onChange')) {
+                      if (!(0, _lodash.isEqual)(orgRow, row)) {
+                        diff = (0, _tools.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);
+                        }
+                      }
+                    }
+                    // 使用startTransition优化状态更新
+                    (0, _utils.compatStartTransition)(() => {
+                      setState({
+                        forceUpdate: {
+                          d: Date.now()
+                        }
+                      });
+                    });
+                  case 33:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
+            })), 300);
+          }
 
-  // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
-  var _onChange = (0, _lodash.debounce)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var _len2,
+          // 调用防抖函数
+          debounceRef.current(..._args3);
+        case 2:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })), [namePath, index, dependencies, formatArgs, onChange, onFieldChange, form, setState, TargetComponent, validateTrigger]);
+
+  // 在组件卸载时清理防抖函数
+  (0, _react.useEffect)(() => {
+    return () => {
+      if (debounceRef.current) {
+        debounceRef.current.cancel();
+      }
+    };
+  }, []);
+
+  // 使用useCallback优化_onblur函数
+  var _onblur = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+    var _TargetComponent3;
+    var _len3,
       args,
-      _key2,
+      _key3,
       _args,
       rowPath,
-      _dependencies$map,
-      validateFieldKeys,
       row,
       orgRow,
-      _TargetComponent,
-      _TargetComponent2,
-      _Object$keys,
-      _Object$keys$map,
+      _Object$keys2,
+      _Object$keys2$map,
       diff,
-      _validateFieldKeys,
-      _args2 = arguments;
-    return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+      validateFieldKeys,
+      _args4 = arguments;
+    return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-            args[_key2] = _args2[_key2];
-          }
-          _args = [...args];
-          rowPath = [...namePath, index];
-          if (!(!onFieldChange && !onChange)) {
-            _context.next = 6;
+          if (onBlur) {
+            _context3.next = 2;
             break;
           }
-          if (dependencies !== null && dependencies !== void 0 && dependencies.length) {
-            validateFieldKeys = dependencies === null || dependencies === void 0 || (_dependencies$map = dependencies.map) === null || _dependencies$map === void 0 ? void 0 : _dependencies$map.call(dependencies, key => [...rowPath, key]);
-            setTimeout(() => {
-              form.validateFields(validateFieldKeys);
-            }, 100);
+          return _context3.abrupt("return", null);
+        case 2:
+          for (_len3 = _args4.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+            args[_key3] = _args4[_key3];
           }
-          return _context.abrupt("return", null);
-        case 6:
+          _args = formatArgs([...args]);
+          rowPath = [...namePath, index];
           row = form.getFieldValue(rowPath, true);
           orgRow = (0, _lodash.cloneDeep)(row);
-          if (!onFieldChange) {
-            _context.next = 21;
-            break;
-          }
-          _args = formatArgs(args);
           _args[1] = row;
-          _context.t0 = (_TargetComponent = TargetComponent) === null || _TargetComponent === void 0 || (_TargetComponent = _TargetComponent.props) === null || _TargetComponent === void 0 ? void 0 : _TargetComponent.onFieldChange;
-          if (!_context.t0) {
-            _context.next = 15;
+          _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;
             break;
           }
-          _context.next = 15;
-          return TargetComponent.props.onFieldChange(..._args);
-        case 15:
-          _context.t1 = onFieldChange;
-          if (!_context.t1) {
-            _context.next = 19;
+          _context3.next = 12;
+          return TargetComponent.props.onBlur(..._args);
+        case 12:
+          _context3.t1 = onBlur;
+          if (!_context3.t1) {
+            _context3.next = 16;
             break;
           }
-          _context.next = 19;
-          return onFieldChange(..._args);
-        case 19:
-          _context.next = 30;
-          break;
-        case 21:
-          _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;
-            break;
-          }
-          _context.next = 26;
-          return TargetComponent.props.onChange(..._args);
-        case 26:
-          _context.t3 = onChange;
-          if (!_context.t3) {
-            _context.next = 30;
-            break;
-          }
-          _context.next = 30;
-          return onChange(..._args);
-        case 30:
+          _context3.next = 16;
+          return onBlur(..._args);
+        case 16:
           // 判断属性是否变动
           form.setFieldValue(rowPath, row);
-          if (validateTrigger && validateTrigger.includes('onChange')) {
+          if (validateTrigger && validateTrigger.includes('onBlur')) {
             if (!(0, _lodash.isEqual)(orgRow, row)) {
               diff = (0, _tools.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) {
-                setTimeout(() => {
-                  form.validateFields(_validateFieldKeys);
-                }, 100);
+              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 || []);
+              if (validateFieldKeys !== null && validateFieldKeys !== void 0 && validateFieldKeys.length) {
+                debounceValidate(validateFieldKeys);
               }
             }
           }
+          if (!isCell) {
+            _context3.next = 22;
+            break;
+          }
+          _context3.next = 21;
+          return form.validateFields([cellName]);
+        case 21:
           setState({
-            forceUpdate: {
-              d: Date.now()
-            }
+            cellNamePath: []
           });
-        case 33:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), 300);
-  var _onblur = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
-      var _TargetComponent3;
-      var _len3,
-        args,
-        _key3,
-        _args,
-        rowPath,
-        row,
-        orgRow,
-        _Object$keys2,
-        _Object$keys2$map,
-        diff,
-        validateFieldKeys,
-        _args3 = arguments;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            if (onBlur) {
-              _context2.next = 2;
-              break;
-            }
-            return _context2.abrupt("return", null);
-          case 2:
-            for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-              args[_key3] = _args3[_key3];
-            }
-            _args = formatArgs([...args]);
-            rowPath = [...namePath, index];
-            row = form.getFieldValue(rowPath, true);
-            orgRow = (0, _lodash.cloneDeep)(row);
-            _args[1] = row;
-            _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 || (_TargetComponent3 = _TargetComponent3.props) === null || _TargetComponent3 === void 0 ? void 0 : _TargetComponent3.onBlur;
-            if (!_context2.t0) {
-              _context2.next = 12;
-              break;
-            }
-            _context2.next = 12;
-            return TargetComponent.props.onBlur(..._args);
-          case 12:
-            _context2.t1 = onBlur;
-            if (!_context2.t1) {
-              _context2.next = 16;
-              break;
-            }
-            _context2.next = 16;
-            return onBlur(..._args);
-          case 16:
-            // 判断属性是否变动
-            form.setFieldValue(rowPath, row);
-            if (validateTrigger && validateTrigger.includes('onBlur')) {
-              if (!(0, _lodash.isEqual)(orgRow, row)) {
-                diff = (0, _tools.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 || []);
-                if (validateFieldKeys !== null && validateFieldKeys !== void 0 && validateFieldKeys.length) {
-                  debounceValidate(validateFieldKeys);
-                }
-              }
-            }
-            if (!isCell) {
-              _context2.next = 22;
-              break;
-            }
-            _context2.next = 21;
-            return form.validateFields([cellName]);
-          case 21:
-            setState({
-              cellNamePath: []
-            });
-          case 22:
-            // 单行编辑时需要 强制更新视图
+        case 22:
+          // 单行编辑时需要 强制更新视图
+          (0, _utils.compatStartTransition)(() => {
             setState({
               forceUpdate: {
                 d: Date.now()
               }
             });
-          case 23:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function _onblur() {
-      return _ref3.apply(this, arguments);
-    };
-  }();
-  var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-    form,
-    name: cellName
-  }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
-    namePath: [...namePath, index],
-    disabled: _disabled,
-    onChange: _onChange,
-    onBlur: _onblur,
-    index,
-    confirm,
-    desensitization: _desensitization,
-    otherProps: {
+          });
+        case 23:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  })), [onBlur, formatArgs, namePath, index, form, TargetComponent, validateTrigger, debounceValidate, isCell, cellName, setState]);
+
+  // 使用useMemo优化componentProps对象
+  var componentProps = (0, _react.useMemo)(() => {
+    var _TargetComponent4;
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
       form,
-      names,
+      name: cellName
+    }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
       namePath: [...namePath, index],
-      name: originalName,
-      listName: cellName,
-      // 用于下拉框去重消费，保持和formlist一致
-      viewEmpty,
-      valueType: _valueType,
-      isView,
-      desensitizationKey: otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey
-    }
-  });
+      disabled: _disabled,
+      onChange: _onChange,
+      onBlur: _onblur,
+      index,
+      confirm,
+      desensitization: _desensitization,
+      otherProps: {
+        form,
+        names,
+        namePath: [...namePath, index],
+        name: originalName,
+        listName: cellName,
+        // 用于下拉框去重消费，保持和formlist一致
+        viewEmpty,
+        valueType: _valueType,
+        isView,
+        desensitizationKey: otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey
+      }
+    });
+  }, [cellName, _fieldProps, (_TargetComponent5 = TargetComponent) === null || _TargetComponent5 === void 0 ? void 0 : _TargetComponent5.props, namePath, index, _disabled, _onChange, _onblur, confirm, _desensitization, names, originalName, viewEmpty, _valueType, isView, otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey]);
   componentProps = (0, _lodash.omit)(componentProps, ['onFieldChange', 'namePath', 'index']);
 
   // 单元格编辑时，设置各个单元格disabled属性
@@ -559,22 +619,28 @@ var RenderField = _ref => {
       var editingDom = document.getElementById(cellNamePath.join('_'));
       editingDom === null || editingDom === void 0 || (_editingDom$focus = editingDom.focus) === null || _editingDom$focus === void 0 || _editingDom$focus.call(editingDom);
     }
-  }, [cellNamePath]);
+  }, [cellNamePath, isCell]);
 
   // 可编辑表格默认关闭scrollFollowParent
   if (['Select', 'ProSelect', 'ProEnum'].includes(type)) {
     componentProps.scrollFollowParent = false;
   }
-  Object.assign(_formItemProps, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultTransform()), namesTransform()), (0, _utils.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())));
+
+  // 使用useMemo优化最终的formItemProps - 修复Hooks使用规则
+  var finalFormItemProps = (0, _react.useMemo)(() => {
+    return Object.assign(_formItemProps, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultTransform()), namesTransform()), (0, _utils2.isTrim)(type, trim, proConfig)));
+  }, [_formItemProps, defaultTransform, namesTransform, type, trim, proConfig]);
 
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
   if (isView) {
-    delete _formItemProps.rules;
+    delete finalFormItemProps.rules;
   }
-  var _className = (0, _classnames.default)({
+  var _className = (0, _react.useMemo)(() => (0, _classnames.default)({
     [className]: className
-  });
-  var getFieldItem = () => {
+  }), [className]);
+
+  // 使用useCallback优化getFieldItem函数
+  var getFieldItem = (0, _react.useCallback)(() => {
     var _componentProps;
     var FormItem = null;
     var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
@@ -592,9 +658,9 @@ var RenderField = _ref => {
         type: type,
         onChange: _onChange,
         onBlur: _onblur,
-        valuePropName: _formItemProps.valuePropName,
-        normalize: _formItemProps.normalize,
-        getValueProps: _formItemProps.getValueProps,
+        valuePropName: finalFormItemProps.valuePropName,
+        normalize: finalFormItemProps.normalize,
+        getValueProps: finalFormItemProps.getValueProps,
         viewRender: viewRender,
         diffConfig: diffConfig,
         index: index,
@@ -606,9 +672,9 @@ var RenderField = _ref => {
         children: FieldComponent
       }));
     }
-    FormItem = TargetComponent ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    FormItem = TargetComponent ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       validateFirst: true
-    }, (0, _lodash.omit)(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+    }, (0, _lodash.omit)(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
       // 移除非必要字段
       className: _className,
       name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
@@ -617,9 +683,9 @@ var RenderField = _ref => {
       viewEmpty: viewEmpty
     });
     if (type === 'FormList') {
-      FormItem = /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      FormItem = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
-      }, (0, _lodash.omit)(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+      }, (0, _lodash.omit)(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
         children: (fields, operation, meta) => /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
           otherProps: otherProps,
           fields: fields,
@@ -629,14 +695,108 @@ var RenderField = _ref => {
       }));
     }
     return FormItem;
-  };
+  }, [TargetComponent, componentProps, originalValues, record, cellName, names, baseName, index, dataIndex, originalName, originalNames, type, finalFormItemProps, viewRender, diffConfig, _className, formNamePath, viewEmpty, otherProps, getIsNew]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
-    children: _formItemProps.shouldUpdate ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, {
+    children: finalFormItemProps.shouldUpdate ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, {
       noStyle: true,
-      shouldUpdate: _formItemProps.shouldUpdate,
+      shouldUpdate: finalFormItemProps.shouldUpdate,
       children: () => getFieldItem()
     }) : getFieldItem()
   });
 };
-var _default = exports.default = RenderField;
+var _default = exports.default = /*#__PURE__*/(0, _react.memo)(RenderField, (prevProps, nextProps) => {
+  // 自定义比较函数，只有关键props变化时才重新渲染
+  var prevText = prevProps.text,
+    prevRecord = prevProps.record,
+    prevIndex = prevProps.index,
+    prevColumn = prevProps.column,
+    prevConfig = prevProps.config;
+  var nextText = nextProps.text,
+    nextRecord = nextProps.record,
+    nextIndex = nextProps.index,
+    nextColumn = nextProps.column,
+    nextConfig = nextProps.config;
+  var prevRowParams = [prevText, prevRecord, {
+    index: prevIndex,
+    form: prevConfig === null || prevConfig === void 0 ? void 0 : prevConfig.form,
+    name: prevConfig === null || prevConfig === void 0 ? void 0 : prevConfig.name
+  }];
+  var nextRowParams = [nextText, nextRecord, {
+    index: nextIndex,
+    form: nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.form,
+    name: nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.name
+  }];
+  if ((0, _lodash.isFunction)(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.disabled) && (0, _lodash.isFunction)(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.disabled)) {
+    if ((prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.disabled(...prevRowParams)) !== (nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.disabled(...nextRowParams))) {
+      return false;
+    }
+  }
+
+  // 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 compareFunctionResult = (prevColumn, nextColumn, prevRowParams, nextRowParams, functionName) => {
+    var prevFunc = prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn[functionName];
+    var nextFunc = nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn[functionName];
+    if ((0, _lodash.isFunction)(prevFunc) && (0, _lodash.isFunction)(nextFunc)) {
+      return (0, _lodash.isEqualWith)(prevFunc(...prevRowParams), nextFunc(...nextRowParams), _utils.customEqualForFunction);
+    }
+    return true; // 如果不是函数或只有一个是函数，认为相等
+  };
+
+  // 使用简化后的比较逻辑
+  var functionFields = ['rules', 'component', 'desensitization', 'isEditable'];
+  if (functionFields.some(field => !compareFunctionResult(prevColumn, nextColumn, prevRowParams, nextRowParams, field))) {
+    return false;
+  }
+
+  // 基本props比较
+  if (!(0, _lodash.isEqual)(prevText, nextText) || prevIndex !== nextIndex) {
+    return false;
+  }
+
+  // 记录关键字段比较（避免完整对象比较的性能开销）
+  if ((prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.rowKey) !== (nextRecord === null || nextRecord === void 0 ? void 0 : nextRecord.rowKey) || (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._addFlag) !== (nextRecord === null || nextRecord === void 0 ? void 0 : nextRecord._addFlag)) {
+    return false;
+  }
+
+  // 列配置比较（只比较关键字段）,required,disabled为函数时，需要重新计算
+  if ((prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.dataIndex) !== (nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.dataIndex) || (prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.type) !== (nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.type) || (prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.name) !== (nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.name)) {
+    return false;
+  }
+
+  // config中关键字段比较
+  if ((prevConfig === null || prevConfig === void 0 ? void 0 : prevConfig._isEditing) !== (nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig._isEditing) || (prevConfig === null || prevConfig === void 0 ? void 0 : prevConfig.mode) !== (nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.mode)) {
+    return false;
+  }
+
+  // 当前单元格的值比较
+  var prevDataIndex = prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.dataIndex;
+  var nextDataIndex = nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.dataIndex;
+  if (prevDataIndex && nextDataIndex && prevDataIndex === nextDataIndex) {
+    if ((prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[prevDataIndex]) !== (nextRecord === null || nextRecord === void 0 ? void 0 : nextRecord[nextDataIndex])) {
+      return false;
+    }
+  }
+
+  // 特殊处理：当使用自定义 component 函数时，比较整个 record 对象
+  // 因为自定义组件可能依赖 record 中的其他字段（不只是当前列的 dataIndex）
+  if ((0, _lodash.isFunction)(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.component) || (0, _lodash.isFunction)(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.component)) {
+    // 浅比较 record 的所有属性
+    var prevKeys = Object.keys(prevRecord || {});
+    var nextKeys = Object.keys(nextRecord || {});
+    if (prevKeys.length !== nextKeys.length) {
+      return false;
+    }
+
+    // 使用 some 方法代替 for 循环
+    if (prevKeys.some(key => (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[key]) !== (nextRecord === null || nextRecord === void 0 ? void 0 : nextRecord[key]))) {
+      return false;
+    }
+  }
+  return true;
+});