@zat-design/sisyphus-react 4.0.0-beta.4 → 4.0.0-beta.5

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

@@ -1,443 +1,570 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/ProEditTable/components/RenderField/index.tsx
-var RenderField_exports = {};
-__export(RenderField_exports, {
-  default: () => RenderField_default
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(RenderField_exports);
-var import_react = __toESM(require("react"));
-var import_antd = require("antd");
-var import_classnames = __toESM(require("classnames"));
-var import_lodash = require("lodash");
-var import_utils = require("../../../utils");
-var import_valueType = __toESM(require("../../../ProForm/utils/valueType"));
-var import_transform = __toESM(require("../../utils/transform"));
-var import_tools = require("../../utils/tools");
-var componentMap = __toESM(require("../../../ProForm/components"));
-var import_ProConfigProvider = require("../../../ProConfigProvider");
-var import_Container = __toESM(require("../../../ProForm/components/Container"));
-var import_transformNames = __toESM(require("../../../ProForm/utils/transformNames"));
-var import_useFieldProps = require("../../../ProForm/utils/useFieldProps");
-var import_useRules = __toESM(require("../../../ProForm/utils/useRules"));
-var import_utils2 = require("../../../ProForm/utils");
-var import_ConfirmWrapper = __toESM(require("../../../ProForm/components/render/ConfirmWrapper"));
-var import_getDefaultProps = require("../../utils/getDefaultProps");
-var import_ListChangedWrapper = __toESM(require("./ListChangedWrapper"));
-var RenderField = ({ text: value, record, index, column, config }) => {
-  var _a, _b, _c, _d;
-  let {
-    type,
-    valueType,
-    names,
-    fieldProps,
-    labelRequired,
-    editRender,
-    component,
-    viewRender,
-    title,
-    originTitle,
-    label,
-    dataIndex,
-    formItemProps,
-    isEditable = true,
-    required = false,
-    rules = [],
-    onDiff,
-    className,
-    trim,
-    confirm,
-    dependencies,
-    desensitization,
-    ...resetProps
-  } = column;
-  const _editRender = component || editRender;
-  const {
-    mode,
-    cellName,
-    cellNamePath,
-    _isEditing,
-    form,
-    setState,
-    name,
-    virtualKey,
-    viewEmpty,
-    originalValues,
-    namePath: formNamePath,
-    rowDisabled,
-    validateTrigger = ["onChange", "onBlur", "onSubmit"],
-    otherProps,
-    diffConfig,
-    getIsNew
-  } = config;
-  let _fieldProps = fieldProps || formItemProps || {};
-  let _rules = rules || [];
-  let _required = required;
-  let _valueType = valueType;
-  let _disabled = false;
-  let _desensitization = desensitization || [];
-  const isCell = mode === "cell";
+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 _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");
+var componentMap = _interopRequireWildcard(require("../../../ProForm/components"));
+var _ProConfigProvider = require("../../../ProConfigProvider");
+var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
+var _transformNames = _interopRequireDefault(require("../../../ProForm/utils/transformNames"));
+var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
+var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
+var _utils2 = require("../../../ProForm/utils");
+var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
+var _getDefaultProps = require("../../utils/getDefaultProps");
+var _ListChangedWrapper = _interopRequireDefault(require("./ListChangedWrapper"));
+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, _fieldProps4, _names, _TargetComponent5, _componentProps2;
+  var value = _ref.text,
+    record = _ref.record,
+    index = _ref.index,
+    column = _ref.column,
+    config = _ref.config;
+  var type = column.type,
+    valueType = column.valueType,
+    names = column.names,
+    fieldProps = column.fieldProps,
+    labelRequired = column.labelRequired,
+    editRender = column.editRender,
+    component = column.component,
+    viewRender = column.viewRender,
+    title = column.title,
+    originTitle = column.originTitle,
+    label = column.label,
+    dataIndex = column.dataIndex,
+    formItemProps = column.formItemProps,
+    _column$isEditable = column.isEditable,
+    isEditable = _column$isEditable === void 0 ? true : _column$isEditable,
+    _column$required = column.required,
+    required = _column$required === void 0 ? false : _column$required,
+    _column$rules = column.rules,
+    rules = _column$rules === void 0 ? [] : _column$rules,
+    onDiff = column.onDiff,
+    className = column.className,
+    trim = column.trim,
+    confirm = column.confirm,
+    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,
+    _isEditing = config._isEditing,
+    form = config.form,
+    setState = config.setState,
+    name = config.name,
+    virtualKey = config.virtualKey,
+    viewEmpty = config.viewEmpty,
+    originalValues = config.originalValues,
+    formNamePath = config.namePath,
+    rowDisabled = config.rowDisabled,
+    _config$validateTrigg = config.validateTrigger,
+    validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
+    otherProps = config.otherProps,
+    diffConfig = config.diffConfig,
+    getIsNew = config.getIsNew;
+  var _fieldProps = fieldProps || formItemProps || {};
+  var _rules = rules || [];
+  var _required = required;
+  var _valueType = valueType;
+  var _disabled = false;
+  var _desensitization = desensitization || [];
+  var isCell = mode === 'cell';
   if (isCell) {
-    record["is-view"] = !(0, import_lodash.isEqual)(cellNamePath, cellName);
+    record['is-view'] = !(0, _lodash.isEqual)(cellNamePath, cellName);
   }
-  type = ((_a = type == null ? void 0 : type.replace) == null ? void 0 : _a.call(type, type[0], type[0].toUpperCase())) || "Input";
-  if ("component" in column) {
+
+  // type类型 首字母转大写
+  type = ((_type = type) === null || _type === void 0 || (_type$replace = _type.replace) === null || _type$replace === void 0 ? void 0 : _type$replace.call(_type, type[0], type[0].toUpperCase())) || 'Input';
+
+  // 自定义组件时 防止默认值影像后续判断
+  if ('component' in column) {
     type = null;
   }
-  const namePath = (0, import_tools.getNamePath)(name, virtualKey);
-  const rowData = form.getFieldValue([...namePath, index]) || record || {};
-  let currentValue = dataIndex ? rowData == null ? void 0 : rowData[dataIndex] : null;
-  const options = (0, import_react.useMemo)(
-    () => ({
-      index,
-      form,
-      name: column == null ? void 0 : column.name,
-      namePath: [...namePath, index]
-    }),
-    [index, column == null ? void 0 : column.name, namePath]
-  );
-  const rowParams = (0, import_react.useMemo)(
-    () => [currentValue, rowData, options],
-    [currentValue, rowData, options]
-  );
-  if ((0, import_lodash.isFunction)(required)) {
+
+  // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
+  var namePath = (0, _tools.getNamePath)(name, virtualKey);
+  var rowData = form.getFieldValue([...namePath, index]) || record || {};
+  var currentValue = dataIndex ? rowData === null || rowData === void 0 ? void 0 : rowData[dataIndex] : null;
+
+  // 第三个参数 - 使用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]);
+
+  // 行参数 - 使用useMemo优化
+  var rowParams = (0, _react.useMemo)(() => [currentValue, rowData, options], [currentValue, rowData, options]);
+
+  // required & rules & fieldProps & disabled & valueType 函数化处理
+  if ((0, _lodash.isFunction)(required)) {
     _required = required(...rowParams);
   }
-  if ((0, import_lodash.isFunction)(fieldProps)) {
+  if ((0, _lodash.isFunction)(fieldProps)) {
     _fieldProps = fieldProps(...rowParams);
   }
-  if ((0, import_lodash.isFunction)(rules)) {
+  if ((0, _lodash.isFunction)(rules)) {
     _rules = rules(...rowParams);
   }
-  if ((0, import_lodash.isFunction)(valueType)) {
+  if ((0, _lodash.isFunction)(valueType)) {
     _valueType = valueType(...rowParams);
   }
-  if ((0, import_lodash.isFunction)(desensitization)) {
+  if ((0, _lodash.isFunction)(desensitization)) {
     _desensitization = desensitization(...rowParams);
   }
-  _disabled = (0, import_tools.getDisabled)({
-    globalControl: otherProps == null ? void 0 : otherProps.globalControl,
-    formDisabled: otherProps == null ? void 0 : otherProps.formDisabled,
+
+  // 获取最终的disabled
+  _disabled = (0, _tools.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 ? void 0 : config.disabled,
+    tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
     columnFieldProps: _fieldProps,
     params: rowParams
   });
-  if ((0, import_lodash.isFunction)(isEditable)) {
+  if ((0, _lodash.isFunction)(isEditable)) {
     isEditable = isEditable(...rowParams);
   }
-  const isView = !isEditable || (record == null ? void 0 : record["is-view"]) || config.isView || virtualKey && !_isEditing || (0, import_tools.getDisabled)({
-    globalControl: otherProps == null ? void 0 : otherProps.globalControl,
-    formDisabled: otherProps == null ? void 0 : otherProps.formDisabled,
+
+  // 是否只读文本
+  var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || (0, _tools.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 ? void 0 : config.disabled,
+    tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
     columnFieldProps: _fieldProps,
     params: rowParams,
-    rowDisabled: rowDisabled || "empty"
+    rowDisabled: rowDisabled || 'empty'
   });
-  const baseName = isView ? name : namePath;
-  let TargetComponent;
-  const proConfig = (0, import_ProConfigProvider.useProConfig)();
-  const internalRule = (0, import_useRules.default)({
+
+  // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
+  var baseName = isView ? name : namePath;
+  var TargetComponent;
+
+  // 将Hooks调用移到组件顶层
+  var proConfig = (0, _ProConfigProvider.useProConfig)();
+
+  // 设置校验规则 - 修复Hooks使用规则
+  var internalRule = (0, _useRules.default)({
     names,
-    label,
+    label: label,
     labelRequired,
     required: !isView && _required,
     rules: _isEditing ? _rules : [],
-    isSelect: (0, import_utils2.isSelect)({
-      dataSource: _fieldProps == null ? void 0 : _fieldProps.dataSource,
+    isSelect: (0, _utils2.isSelect)({
+      dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
       type
     }),
     type
   });
-  const formItemChildProps = { ..._fieldProps };
-  const defaultProps = (0, import_react.useMemo)(
-    () => (0, import_getDefaultProps.getDefaultProps)({
-      name,
-      namePath: formNamePath ? cellName.slice((formNamePath == null ? void 0 : formNamePath.length) - 1) : cellName,
-      type: column == null ? void 0 : column.type,
-      fieldProps: column == null ? void 0 : column.fieldProps
-    }),
-    [name, formNamePath, cellName, column == null ? void 0 : column.type, column == null ? void 0 : column.fieldProps]
-  );
-  const _formItemProps = (0, import_react.useMemo)(
-    () => ({
-      ...defaultProps,
-      ...resetProps,
-      ...internalRule,
-      validateTrigger
-    }),
-    [defaultProps, resetProps, internalRule, validateTrigger]
-  );
-  if (["Switch", "SwitchCheckbox"].includes(type)) {
-    _formItemProps.valuePropName = "checked";
-    _valueType = "switch";
+
+  // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
+  var formItemChildProps = (0, _objectSpread2.default)({}, _fieldProps);
+
+  // 使用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最外层 - 使用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';
   }
-  const defaultTransform = (0, import_react.useCallback)(() => {
-    var _a2, _b2;
-    const types = ["DatePicker", "RangePicker"];
+
+  /**
+   * 针对一些特殊类型，基于formItem的normalize与getValueProps进行默认值类型转换
+   * @returns {}
+   */
+  var defaultTransform = (0, _react.useCallback)(() => {
+    var types = ['DatePicker', 'RangePicker'];
     if (!_valueType && types.includes(type)) {
-      return (_b2 = (_a2 = import_transform.default) == null ? void 0 : _a2[type]) == null ? void 0 : _b2.call(_a2, _fieldProps || {});
+      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]);
-  const valueTypeTransform = (0, import_react.useCallback)(() => {
-    if (type === "SwitchCheckbox") {
-      _valueType = "switch";
+
+  /**
+   * 配置valueType时，基于formItem的normalize与getValueProps进行值类型转换
+   * @returns {}
+   */
+  var valueTypeTransform = (0, _react.useCallback)(() => {
+    var _fieldProps3;
+    // SwitchCheckbox默认YN, 兼容已有组件
+    if (type === 'SwitchCheckbox') {
+      _valueType = 'switch';
     }
-    const params = {
-      ...column,
-      mode: _fieldProps == null ? void 0 : _fieldProps.mode
-    };
-    return (0, import_lodash.isFunction)(import_valueType.default[_valueType]) ? import_valueType.default[_valueType](params) : {};
-  }, [type, _valueType, column, _fieldProps == null ? void 0 : _fieldProps.mode]);
-  if (names == null ? void 0 : names.length) {
-    names = names.map((key) => {
+    var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
+      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 => {
       if (Array.isArray(key)) {
         return [...baseName, index, ...key];
       }
       return [...baseName, index, key];
     });
   }
-  let originalName = cellName;
-  let originalNames = names;
+  var originalName = cellName;
+  var originalNames = names;
   if (virtualKey) {
-    originalName = [...name, ...(_b = cellName == null ? void 0 : cellName.slice) == null ? void 0 : _b.call(cellName, name.length)];
-    originalNames = (_c = names == null ? void 0 : names.map) == null ? void 0 : _c.call(names, (item) => {
-      var _a2;
-      return [...name, ...(_a2 = item == null ? void 0 : item.slice) == null ? void 0 : _a2.call(item, name.length)];
+    var _cellName$slice, _names2, _names2$map;
+    originalName = [...name, ...(cellName === null || cellName === void 0 || (_cellName$slice = cellName.slice) === null || _cellName$slice === void 0 ? void 0 : _cellName$slice.call(cellName, name.length))];
+    originalNames = (_names2 = names) === null || _names2 === void 0 || (_names2$map = _names2.map) === null || _names2$map === void 0 ? void 0 : _names2$map.call(_names2, item => {
+      var _item$slice;
+      return [...name, ...(item === null || item === void 0 || (_item$slice = item.slice) === null || _item$slice === void 0 ? void 0 : _item$slice.call(item, name.length))];
     });
   }
-  const namesTransform = (0, import_react.useCallback)(() => {
-    if (!(names == null ? void 0 : names.length)) {
+
+  /**
+   * 配置names时，基于formItem的normalize与getValueProps进行值类型转换
+   * @returns {}
+   */
+  var namesTransform = (0, _react.useCallback)(() => {
+    var _names3;
+    if (!((_names3 = names) !== null && _names3 !== void 0 && _names3.length)) {
       return valueTypeTransform();
     }
-    const namesStr = [...baseName, index, dataIndex];
-    return (0, import_transformNames.default)(
-      {
-        ..._formItemProps,
-        ...valueTypeTransform()
-      },
-      form,
-      names,
-      namesStr,
-      type
-    );
+    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") {
-    TargetComponent = componentMap[type] ?? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null);
+  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, {});
   }
   if (isEditable && _isEditing) {
-    if (typeof _editRender === "function") {
+    if (typeof _editRender === 'function') {
       TargetComponent = _editRender(...rowParams);
     }
-    if (import_react.default.isValidElement(_editRender)) {
+    if ( /*#__PURE__*/_react.default.isValidElement(_editRender)) {
       TargetComponent = _editRender;
     }
   }
+
+  // 查看模式
   if (isView) {
-    if (typeof viewRender === "function") {
-      currentValue = ((_d = column == null ? void 0 : column.dataIndex) == null ? void 0 : _d.includes("-")) ? value : currentValue;
-      const View = viewRender(currentValue, record || {}, options);
-      TargetComponent = /* @__PURE__ */ import_react.default.createElement(import_Container.default, { viewEmpty }, View);
+    // 存在viewRender覆盖默认值
+    if (typeof viewRender === 'function') {
+      var _column$dataIndex;
+      currentValue = column !== null && column !== void 0 && (_column$dataIndex = column.dataIndex) !== null && _column$dataIndex !== void 0 && _column$dataIndex.includes('-') ? value : currentValue;
+      var View = viewRender(currentValue, record || {}, options);
+      TargetComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
+        viewEmpty: viewEmpty,
+        children: View
+      });
     }
-    if (import_react.default.isValidElement(viewRender)) {
+    if ( /*#__PURE__*/_react.default.isValidElement(viewRender)) {
       TargetComponent = viewRender;
     }
   }
-  const onChange = formItemChildProps == null ? void 0 : formItemChildProps.onChange;
-  const onFieldChange = formItemChildProps == null ? void 0 : formItemChildProps.onFieldChange;
-  const onBlur = formItemChildProps == null ? void 0 : formItemChildProps.onBlur;
-  const formatArgs = (0, import_react.useCallback)(
-    (...args) => {
-      const _args = args == null ? void 0 : args[0];
-      const nextArgs = [];
-      nextArgs[0] = _args[0];
-      nextArgs[2] = {
-        ...options,
-        extra: _args
-      };
-      switch (type) {
-        case "ProSelect":
-        case "ProModalSelect":
-        case "ProEnum":
-          nextArgs[2].option = _args[1];
-          break;
-        case "ProCascader":
-          nextArgs[2].selectedOptions = _args[1];
-          break;
-        case "DatePicker":
-        case "RangePicker":
-          nextArgs[2].dateString = _args[1];
-          break;
-        default:
-          break;
+  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;
+
+  // 使用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];
+    }
+    var _args = args === null || args === void 0 ? void 0 : args[0];
+    var nextArgs = [];
+    nextArgs[0] = _args[0];
+    // 返回表单元素默认值
+    nextArgs[2] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, options), {}, {
+      extra: _args
+    });
+    switch (type) {
+      case 'ProSelect':
+      case 'ProModalSelect':
+      case 'ProEnum':
+        nextArgs[2].option = _args[1];
+        break;
+      case 'ProCascader':
+        nextArgs[2].selectedOptions = _args[1];
+        break;
+      case 'DatePicker':
+      case 'RangePicker':
+        nextArgs[2].dateString = _args[1];
+        break;
+      default:
+        break;
+    }
+    return nextArgs;
+  }, [options, type]);
+
+  // 使用useCallback优化debounceValidate函数
+  var debounceValidate = (0, _react.useCallback)(function () {
+    var validateFieldKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    setTimeout(() => {
+      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);
+          }
+
+          // 调用防抖函数
+          debounceRef.current(..._args3);
+        case 2:
+        case "end":
+          return _context2.stop();
       }
-      return nextArgs;
-    },
-    [options, type]
-  );
-  const debounceValidate = (0, import_react.useCallback)(
-    (validateFieldKeys = []) => {
-      setTimeout(() => {
-        form.validateFields(validateFieldKeys, { recursive: true });
-      }, 100);
-    },
-    [form]
-  );
-  const debounceRef = (0, import_react.useRef)(null);
-  const _onChange = (0, import_react.useCallback)(
-    async (...args) => {
-      if (!debounceRef.current) {
-        debounceRef.current = (0, import_lodash.debounce)(async (...innerArgs) => {
-          var _a2, _b2, _c2, _d2, _e;
-          let _args = [...innerArgs];
-          const rowPath = [...namePath, index];
-          if (!onFieldChange && !onChange) {
-            if (dependencies == null ? void 0 : dependencies.length) {
-              const validateFieldKeys = (_a2 = dependencies == null ? void 0 : dependencies.map) == null ? void 0 : _a2.call(dependencies, (key) => [...rowPath, key]);
-              setTimeout(() => {
-                form.validateFields(validateFieldKeys);
-              }, 100);
-            }
-            return null;
+    }, _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,
+      _key3,
+      _args,
+      rowPath,
+      row,
+      orgRow,
+      _Object$keys2,
+      _Object$keys2$map,
+      diff,
+      validateFieldKeys,
+      _args4 = arguments;
+    return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          if (onBlur) {
+            _context3.next = 2;
+            break;
+          }
+          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]);
+          rowPath = [...namePath, index];
+          row = form.getFieldValue(rowPath, true);
+          orgRow = (0, _lodash.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;
+            break;
           }
-          const row = form.getFieldValue(rowPath, true);
-          const orgRow = (0, import_lodash.cloneDeep)(row);
-          if (onFieldChange) {
-            _args = formatArgs(innerArgs);
-            _args[1] = row;
-            ((_b2 = TargetComponent == null ? void 0 : TargetComponent.props) == null ? void 0 : _b2.onFieldChange) && await TargetComponent.props.onFieldChange(..._args);
-            onFieldChange && await onFieldChange(..._args);
-          } else {
-            _args = _args.concat([row, index, form]);
-            ((_c2 = TargetComponent == null ? void 0 : TargetComponent.props) == null ? void 0 : _c2.onChange) && await TargetComponent.props.onChange(..._args);
-            onChange && await onChange(..._args);
+          _context3.next = 12;
+          return TargetComponent.props.onBlur(..._args);
+        case 12:
+          _context3.t1 = onBlur;
+          if (!_context3.t1) {
+            _context3.next = 16;
+            break;
           }
+          _context3.next = 16;
+          return onBlur(..._args);
+        case 16:
+          // 判断属性是否变动
           form.setFieldValue(rowPath, row);
-          if (validateTrigger && validateTrigger.includes("onChange")) {
-            if (!(0, import_lodash.isEqual)(orgRow, row)) {
-              const diff = (0, import_tools.difference)(row, orgRow) || {};
-              const validateFieldKeys = (_e = (_d2 = Object.keys(diff)) == null ? void 0 : _d2.map) == null ? void 0 : _e.call(_d2, (key) => [...rowPath, key]).concat(dependencies || []);
-              if (validateFieldKeys == null ? void 0 : validateFieldKeys.length) {
+          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);
               }
             }
           }
-          (0, import_utils.compatStartTransition)(() => {
+          if (!isCell) {
+            _context3.next = 22;
+            break;
+          }
+          _context3.next = 21;
+          return form.validateFields([cellName]);
+        case 21:
+          setState({
+            cellNamePath: []
+          });
+        case 22:
+          // 单行编辑时需要 强制更新视图
+          (0, _utils.compatStartTransition)(() => {
             setState({
               forceUpdate: {
                 d: Date.now()
               }
             });
           });
-        }, 300);
-      }
-      debounceRef.current(...args);
-    },
-    [
-      namePath,
-      index,
-      dependencies,
-      formatArgs,
-      onChange,
-      onFieldChange,
-      form,
-      setState,
-      TargetComponent,
-      validateTrigger
-    ]
-  );
-  (0, import_react.useEffect)(() => {
-    return () => {
-      if (debounceRef.current) {
-        debounceRef.current.cancel();
-      }
-    };
-  }, []);
-  const _onblur = (0, import_react.useCallback)(
-    async (...args) => {
-      var _a2, _b2, _c2;
-      if (!onBlur) {
-        return null;
-      }
-      let _args = formatArgs([...args]);
-      const rowPath = [...namePath, index];
-      const row = form.getFieldValue(rowPath, true);
-      const orgRow = (0, import_lodash.cloneDeep)(row);
-      _args[1] = row;
-      ((_a2 = TargetComponent == null ? void 0 : TargetComponent.props) == null ? void 0 : _a2.onBlur) && await TargetComponent.props.onBlur(..._args);
-      onBlur && await onBlur(..._args);
-      form.setFieldValue(rowPath, row);
-      if (validateTrigger && validateTrigger.includes("onBlur")) {
-        if (!(0, import_lodash.isEqual)(orgRow, row)) {
-          const diff = (0, import_tools.difference)(row, orgRow) || {};
-          const validateFieldKeys = (_c2 = (_b2 = Object.keys(diff)) == null ? void 0 : _b2.map) == null ? void 0 : _c2.call(_b2, (key) => [...rowPath, key]).concat(dependencies || []);
-          if (validateFieldKeys == null ? void 0 : validateFieldKeys.length) {
-            debounceValidate(validateFieldKeys);
-          }
-        }
+        case 23:
+        case "end":
+          return _context3.stop();
       }
-      if (isCell) {
-        await form.validateFields([cellName]);
-        setState({
-          cellNamePath: []
-        });
-      }
-      (0, import_utils.compatStartTransition)(() => {
-        setState({
-          forceUpdate: {
-            d: Date.now()
-          }
-        });
-      });
-    },
-    [
-      onBlur,
-      formatArgs,
-      namePath,
-      index,
-      form,
-      TargetComponent,
-      validateTrigger,
-      debounceValidate,
-      isCell,
-      cellName,
-      setState
-    ]
-  );
-  let componentProps = (0, import_react.useMemo)(
-    () => ({
+    }, _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,
-      name: cellName,
-      ..._fieldProps,
-      ...TargetComponent == null ? void 0 : TargetComponent.props,
+      name: cellName
+    }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
       namePath: [...namePath, index],
       disabled: _disabled,
       onChange: _onChange,
@@ -455,225 +582,187 @@ var RenderField = ({ text: value, record, index, column, config }) => {
         viewEmpty,
         valueType: _valueType,
         isView,
-        desensitizationKey: otherProps == null ? void 0 : otherProps.desensitizationKey
+        desensitizationKey: otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey
       }
-    }),
-    [
-      cellName,
-      _fieldProps,
-      TargetComponent == null ? void 0 : TargetComponent.props,
-      namePath,
-      index,
-      _disabled,
-      _onChange,
-      _onblur,
-      confirm,
-      _desensitization,
-      names,
-      originalName,
-      viewEmpty,
-      _valueType,
-      isView,
-      otherProps == null ? void 0 : otherProps.desensitizationKey
-    ]
-  );
-  componentProps = (0, import_lodash.omit)(componentProps, ["onFieldChange", "namePath", "index"]);
+    });
+  }, [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属性
   if (isCell) {
     record[`${dataIndex}-Disabled`] = _disabled;
   }
-  if (["Switch", "SwitchCheckbox"].includes(type)) {
-    _formItemProps.valuePropName = "checked";
+  if (['Switch', 'SwitchCheckbox'].includes(type)) {
+    _formItemProps.valuePropName = 'checked';
   }
-  (0, import_react.useEffect)(() => {
-    var _a2;
+  (0, _react.useEffect)(() => {
     if (isCell) {
-      const editingDom = document.getElementById(cellNamePath.join("_"));
-      (_a2 = editingDom == null ? void 0 : editingDom.focus) == null ? void 0 : _a2.call(editingDom);
+      var _editingDom$focus;
+      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, isCell]);
-  if (["Select", "ProSelect", "ProEnum"].includes(type)) {
+
+  // 可编辑表格默认关闭scrollFollowParent
+  if (['Select', 'ProSelect', 'ProEnum'].includes(type)) {
     componentProps.scrollFollowParent = false;
   }
-  const finalFormItemProps = (0, import_react.useMemo)(() => {
-    return Object.assign(_formItemProps, {
-      ...defaultTransform(),
-      ...namesTransform(),
-      ...(0, import_utils2.isTrim)(type, trim, proConfig)
-      // 使用顶层调用的proConfig
-    });
+
+  // 使用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 finalFormItemProps.rules;
   }
-  const _className = (0, import_react.useMemo)(
-    () => (0, import_classnames.default)({
-      [className]: className
-    }),
-    [className]
-  );
-  const getFieldItem = (0, import_react.useCallback)(() => {
-    let FormItem = null;
-    let FieldComponent = import_react.default.isValidElement(TargetComponent) ? import_react.default.cloneElement(TargetComponent, componentProps) : /* @__PURE__ */ import_react.default.createElement(TargetComponent, { ...componentProps });
+  var _className = (0, _react.useMemo)(() => (0, _classnames.default)({
+    [className]: className
+  }), [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));
     if (originalValues && !getIsNew(record)) {
-      FieldComponent = /* @__PURE__ */ import_react.default.createElement(
-        import_ListChangedWrapper.default,
-        {
-          name: cellName,
-          names,
-          namesStr: [...baseName, index, dataIndex],
-          rowKeyPath: [...baseName, index, "rowKey"],
-          originalName,
-          originalNames,
-          originalValues,
-          form,
-          onDiff,
-          type,
-          onChange: _onChange,
-          onBlur: _onblur,
-          valuePropName: finalFormItemProps.valuePropName,
-          normalize: finalFormItemProps.normalize,
-          getValueProps: finalFormItemProps.getValueProps,
-          viewRender,
-          diffConfig,
-          index
-        },
-        FieldComponent
-      );
+      FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ListChangedWrapper.default, {
+        name: cellName,
+        names: names,
+        namesStr: [...baseName, index, dataIndex],
+        rowKeyPath: [...baseName, index, 'rowKey'],
+        originalName: originalName,
+        originalNames: originalNames,
+        originalValues: originalValues,
+        form: form,
+        onDiff: onDiff,
+        type: type,
+        onChange: _onChange,
+        onBlur: _onblur,
+        valuePropName: finalFormItemProps.valuePropName,
+        normalize: finalFormItemProps.normalize,
+        getValueProps: finalFormItemProps.getValueProps,
+        viewRender: viewRender,
+        diffConfig: diffConfig,
+        index: index,
+        children: FieldComponent
+      });
     }
-    if (componentProps == null ? void 0 : componentProps.confirm) {
-      FieldComponent = /* @__PURE__ */ import_react.default.createElement(import_ConfirmWrapper.default, { ...componentProps }, FieldComponent);
+    if ((_componentProps = componentProps) !== null && _componentProps !== void 0 && _componentProps.confirm) {
+      FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+        children: FieldComponent
+      }));
     }
-    FormItem = TargetComponent ? /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Form.Item,
-      {
-        validateFirst: true,
-        ...(0, import_lodash.omit)(finalFormItemProps, [
-          "render",
-          "key",
-          "width",
-          "hiddenNames",
-          "name",
-          "onCell",
-          _fieldProps.shouldUpdate ? "shouldUpdate" : null
-        ]),
-        className: _className,
-        name: formNamePath ? cellName.slice((formNamePath == null ? void 0 : formNamePath.length) - 1) : cellName
-      },
-      FieldComponent
-    ) : /* @__PURE__ */ import_react.default.createElement(import_Container.default, { viewEmpty });
-    if (type === "FormList") {
-      FormItem = /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Form.List,
-        {
-          name: formNamePath ? cellName.slice((formNamePath == null ? void 0 : formNamePath.length) - 1) : cellName,
-          ...(0, import_lodash.omit)(finalFormItemProps, ["render", "key", "width", "hiddenNames", "name"])
-        },
-        (fields, operation, meta) => /* @__PURE__ */ import_react.default.createElement(
-          TargetComponent,
-          {
-            ...componentProps,
-            otherProps,
-            fields,
-            operation,
-            meta
-          }
-        )
-      );
+    FormItem = TargetComponent ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      validateFirst: true
+    }, (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,
+      children: FieldComponent
+    })) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
+      viewEmpty: viewEmpty
+    });
+    if (type === 'FormList') {
+      FormItem = /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.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)(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,
+          operation: operation,
+          meta: meta
+        }))
+      }));
     }
     return FormItem;
-  }, [
-    TargetComponent,
-    componentProps,
-    originalValues,
-    record,
-    cellName,
-    names,
-    baseName,
-    index,
-    dataIndex,
-    originalName,
-    originalNames,
-    type,
-    finalFormItemProps,
-    viewRender,
-    diffConfig,
-    _className,
-    formNamePath,
-    viewEmpty,
-    otherProps,
-    getIsNew
-  ]);
-  return /* @__PURE__ */ import_react.default.createElement(import_useFieldProps.FieldProvider, { value: componentProps == null ? void 0 : componentProps.otherProps }, finalFormItemProps.shouldUpdate ? /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { noStyle: true, shouldUpdate: finalFormItemProps.shouldUpdate }, () => getFieldItem()) : getFieldItem());
+  }, [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: finalFormItemProps.shouldUpdate ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, {
+      noStyle: true,
+      shouldUpdate: finalFormItemProps.shouldUpdate,
+      children: () => getFieldItem()
+    }) : getFieldItem()
+  });
 };
-var RenderField_default = (0, import_react.memo)(RenderField, (prevProps, nextProps) => {
-  const {
-    text: prevText,
-    record: prevRecord,
+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,
-    column: prevColumn,
-    config: prevConfig
-  } = prevProps;
-  const {
-    text: nextText,
-    record: nextRecord,
+    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,
-    column: nextColumn,
-    config: nextConfig
-  } = nextProps;
-  const prevRowParams = [
-    prevText,
-    prevRecord,
-    { index: prevIndex, form: prevConfig == null ? void 0 : prevConfig.form, name: prevConfig == null ? void 0 : prevConfig.name }
-  ];
-  const nextRowParams = [
-    nextText,
-    nextRecord,
-    { index: nextIndex, form: nextConfig == null ? void 0 : nextConfig.form, name: nextConfig == null ? void 0 : nextConfig.name }
-  ];
-  if ((0, import_lodash.isFunction)(prevColumn == null ? void 0 : prevColumn.disabled) && (0, import_lodash.isFunction)(nextColumn == null ? void 0 : nextColumn.disabled)) {
-    if ((prevColumn == null ? void 0 : prevColumn.disabled(...prevRowParams)) !== (nextColumn == null ? void 0 : nextColumn.disabled(...nextRowParams))) {
+    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;
     }
   }
-  if ((0, import_lodash.isFunction)(prevColumn == null ? void 0 : prevColumn.fieldProps) && (0, import_lodash.isFunction)(nextColumn == null ? void 0 : nextColumn.fieldProps)) {
+
+  // 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;
   }
-  const compareFunctionResult = (prevColumn2, nextColumn2, prevRowParams2, nextRowParams2, functionName) => {
-    const prevFunc = prevColumn2 == null ? void 0 : prevColumn2[functionName];
-    const nextFunc = nextColumn2 == null ? void 0 : nextColumn2[functionName];
-    if ((0, import_lodash.isFunction)(prevFunc) && (0, import_lodash.isFunction)(nextFunc)) {
-      return (0, import_lodash.isEqualWith)(
-        prevFunc(...prevRowParams2),
-        nextFunc(...nextRowParams2),
-        import_utils.customEqualForFunction
-      );
+
+  // 通用函数比较方法
+  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;
+    return true; // 如果不是函数或只有一个是函数，认为相等
   };
-  const functionFields = ["rules", "component", "desensitization", "isEditable"];
-  if (functionFields.some(
-    (field) => !compareFunctionResult(prevColumn, nextColumn, prevRowParams, nextRowParams, field)
-  )) {
+
+  // 使用简化后的比较逻辑
+  var functionFields = ['rules', 'component', 'desensitization', 'isEditable'];
+  if (functionFields.some(field => !compareFunctionResult(prevColumn, nextColumn, prevRowParams, nextRowParams, field))) {
     return false;
   }
-  if (!(0, import_lodash.isEqual)(prevText, nextText) || prevIndex !== nextIndex) {
+
+  // 基本props比较
+  if (!(0, _lodash.isEqual)(prevText, nextText) || prevIndex !== nextIndex) {
     return false;
   }
-  if ((prevRecord == null ? void 0 : prevRecord.rowKey) !== (nextRecord == null ? void 0 : nextRecord.rowKey) || (prevRecord == null ? void 0 : prevRecord._addFlag) !== (nextRecord == null ? void 0 : nextRecord._addFlag)) {
+
+  // 记录关键字段比较（避免完整对象比较的性能开销）
+  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;
   }
-  if ((prevColumn == null ? void 0 : prevColumn.dataIndex) !== (nextColumn == null ? void 0 : nextColumn.dataIndex) || (prevColumn == null ? void 0 : prevColumn.type) !== (nextColumn == null ? void 0 : nextColumn.type) || (prevColumn == null ? void 0 : prevColumn.name) !== (nextColumn == null ? void 0 : nextColumn.name)) {
+
+  // 列配置比较（只比较关键字段）,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;
   }
-  if ((prevConfig == null ? void 0 : prevConfig._isEditing) !== (nextConfig == null ? void 0 : nextConfig._isEditing) || (prevConfig == null ? void 0 : prevConfig.mode) !== (nextConfig == null ? void 0 : nextConfig.mode)) {
+
+  // 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;
   }
-  const prevDataIndex = prevColumn == null ? void 0 : prevColumn.dataIndex;
-  const nextDataIndex = nextColumn == null ? void 0 : nextColumn.dataIndex;
+
+  // 当前单元格的值比较
+  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 ? void 0 : prevRecord[prevDataIndex]) !== (nextRecord == null ? void 0 : nextRecord[nextDataIndex])) {
+    if ((prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[prevDataIndex]) !== (nextRecord === null || nextRecord === void 0 ? void 0 : nextRecord[nextDataIndex])) {
       return false;
     }
   }
   return true;
-});
+});