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

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

@@ -1,761 +1,679 @@
-"use strict";
+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);
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
+// src/ProEditTable/components/RenderField/index.tsx
+var RenderField_exports = {};
+__export(RenderField_exports, {
+  default: () => RenderField_default
 });
-exports.default = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _isEqualWith2 = _interopRequireDefault(require("lodash/isEqualWith"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _debounce2 = _interopRequireDefault(require("lodash/debounce"));
-var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
-var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
-var _jsxRuntime = require("react/jsx-runtime");
-var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
-var _classnames = _interopRequireDefault(require("classnames"));
-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 _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 */
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
-function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
-var RenderField = function 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';
+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";
   if (isCell) {
-    record['is-view'] = !(0, _isEqual2.default)(cellNamePath, cellName);
+    record["is-view"] = !(0, import_lodash.isEqual)(cellNamePath, cellName);
   }
-  // type类型 首字母转大写
-  type = ((_type = type) === null || _type === void 0 ? 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 = ((_a = type == null ? void 0 : type.replace) == null ? void 0 : _a.call(type, type[0], type[0].toUpperCase())) || "Input";
+  if ("component" in column) {
     type = null;
   }
-  // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
-  var namePath = (0, _tools.getNamePath)(name, virtualKey);
-  var rowData = form.getFieldValue([].concat((0, _toConsumableArray2.default)(namePath), [index])) || record || {};
-  var currentValue = dataIndex ? rowData === null || rowData === void 0 ? void 0 : rowData[dataIndex] : null;
-  // 第三个参数 - 使用useMemo优化
-  var options = (0, _react.useMemo)(function () {
-    return {
-      index: index,
-      form: form,
-      name: column === null || column === void 0 ? void 0 : column.name,
-      namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index])
-    };
-  }, [index, column === null || column === void 0 ? void 0 : column.name, namePath]);
-  // 行参数 - 使用useMemo优化
-  var rowParams = (0, _react.useMemo)(function () {
-    return [currentValue, rowData, options];
-  }, [currentValue, rowData, options]);
-  // required & rules & fieldProps & disabled & valueType 函数化处理
-  if ((0, _isFunction2.default)(required)) {
-    _required = required.apply(void 0, (0, _toConsumableArray2.default)(rowParams));
+  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)) {
+    _required = required(...rowParams);
   }
-  if ((0, _isFunction2.default)(fieldProps)) {
-    _fieldProps = fieldProps.apply(void 0, (0, _toConsumableArray2.default)(rowParams));
+  if ((0, import_lodash.isFunction)(fieldProps)) {
+    _fieldProps = fieldProps(...rowParams);
   }
-  if ((0, _isFunction2.default)(rules)) {
-    _rules = rules.apply(void 0, (0, _toConsumableArray2.default)(rowParams));
+  if ((0, import_lodash.isFunction)(rules)) {
+    _rules = rules(...rowParams);
   }
-  if ((0, _isFunction2.default)(valueType)) {
-    _valueType = valueType.apply(void 0, (0, _toConsumableArray2.default)(rowParams));
+  if ((0, import_lodash.isFunction)(valueType)) {
+    _valueType = valueType(...rowParams);
   }
-  if ((0, _isFunction2.default)(desensitization)) {
-    _desensitization = desensitization.apply(void 0, (0, _toConsumableArray2.default)(rowParams));
+  if ((0, import_lodash.isFunction)(desensitization)) {
+    _desensitization = desensitization(...rowParams);
   }
-  // 获取最终的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: column,
-    tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
+  _disabled = (0, import_tools.getDisabled)({
+    globalControl: otherProps == null ? void 0 : otherProps.globalControl,
+    formDisabled: otherProps == null ? void 0 : otherProps.formDisabled,
+    column,
+    tabledDisabled: config == null ? void 0 : config.disabled,
     columnFieldProps: _fieldProps,
     params: rowParams
   });
-  if ((0, _isFunction2.default)(isEditable)) {
-    isEditable = isEditable.apply(void 0, (0, _toConsumableArray2.default)(rowParams));
+  if ((0, import_lodash.isFunction)(isEditable)) {
+    isEditable = isEditable(...rowParams);
   }
-  // 是否只读文本
-  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: column,
-    tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
+  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,
+    column,
+    tabledDisabled: config == null ? void 0 : config.disabled,
     columnFieldProps: _fieldProps,
     params: rowParams,
-    rowDisabled: rowDisabled || 'empty'
+    rowDisabled: rowDisabled || "empty"
   });
-  // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
-  var baseName = isView ? name : namePath;
-  var TargetComponent;
-  // 将Hooks调用移到组件顶层
-  var proConfig = (0, _ProConfigProvider.useProConfig)();
-  // 设置校验规则 - 修复Hooks使用规则
-  var internalRule = (0, _useRules.default)({
-    names: names,
-    label: label,
-    labelRequired: labelRequired,
+  const baseName = isView ? name : namePath;
+  let TargetComponent;
+  const proConfig = (0, import_ProConfigProvider.useProConfig)();
+  const internalRule = (0, import_useRules.default)({
+    names,
+    label,
+    labelRequired,
     required: !isView && _required,
     rules: _isEditing ? _rules : [],
-    isSelect: (0, _utils2.isSelect)({
-      dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
-      type: type
+    isSelect: (0, import_utils2.isSelect)({
+      dataSource: _fieldProps == null ? void 0 : _fieldProps.dataSource,
+      type
     }),
-    type: type
+    type
   });
-  // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
-  var formItemChildProps = (0, _objectSpread2.default)({}, _fieldProps);
-  // 使用useMemo优化defaultProps计算
-  var defaultProps = (0, _react.useMemo)(function () {
-    return (0, _getDefaultProps.getDefaultProps)({
-      name: 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)(function () {
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), resetProps), internalRule), {}, {
-      validateTrigger: validateTrigger
-    });
-  }, [defaultProps, resetProps, internalRule, validateTrigger]);
-  if (['Switch', 'SwitchCheckbox'].includes(type)) {
-    _formItemProps.valuePropName = 'checked';
-    _valueType = 'switch';
+  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";
   }
-  /**
-   * 针对一些特殊类型，基于formItem的normalize与getValueProps进行默认值类型转换
-   * @returns {}
-   */
-  var defaultTransform = (0, _react.useCallback)(function () {
-    var types = ['DatePicker', 'RangePicker'];
+  const defaultTransform = (0, import_react.useCallback)(() => {
+    var _a2, _b2;
+    const types = ["DatePicker", "RangePicker"];
     if (!_valueType && types.includes(type)) {
-      var _transformMap$type;
-      return _transform.default === null || _transform.default === void 0 ? void 0 : (_transformMap$type = _transform.default[type]) === null || _transformMap$type === void 0 ? void 0 : _transformMap$type.call(_transform.default, _fieldProps || {});
+      return (_b2 = (_a2 = import_transform.default) == null ? void 0 : _a2[type]) == null ? void 0 : _b2.call(_a2, _fieldProps || {});
     }
     return {};
   }, [_valueType, type, _fieldProps]);
-  /**
-   * 配置valueType时，基于formItem的normalize与getValueProps进行值类型转换
-   * @returns {}
-   */
-  var valueTypeTransform = (0, _react.useCallback)(function () {
-    var _fieldProps3;
-    // SwitchCheckbox默认YN, 兼容已有组件
-    if (type === 'SwitchCheckbox') {
-      _valueType = 'switch';
+  const valueTypeTransform = (0, import_react.useCallback)(() => {
+    if (type === "SwitchCheckbox") {
+      _valueType = "switch";
     }
-    var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
-      mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
-    });
-    return (0, _isFunction2.default)(_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 ? void 0 : _names.length) {
-    // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
-    names = names.map(function (key) {
+    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) => {
       if (Array.isArray(key)) {
-        return [].concat((0, _toConsumableArray2.default)(baseName), [index], (0, _toConsumableArray2.default)(key));
+        return [...baseName, index, ...key];
       }
-      return [].concat((0, _toConsumableArray2.default)(baseName), [index, key]);
+      return [...baseName, index, key];
     });
   }
-  var originalName = cellName;
-  var originalNames = names;
+  let originalName = cellName;
+  let originalNames = names;
   if (virtualKey) {
-    var _cellName$slice, _names2, _names2$map;
-    originalName = [].concat((0, _toConsumableArray2.default)(name), (0, _toConsumableArray2.default)(cellName === null || cellName === void 0 ? 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 ? void 0 : (_names2$map = _names2.map) === null || _names2$map === void 0 ? void 0 : _names2$map.call(_names2, function (item) {
-      var _item$slice;
-      return [].concat((0, _toConsumableArray2.default)(name), (0, _toConsumableArray2.default)(item === null || item === void 0 ? void 0 : (_item$slice = item.slice) === null || _item$slice === void 0 ? void 0 : _item$slice.call(item, name.length)));
+    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)];
     });
   }
-  /**
-   * 配置names时，基于formItem的normalize与getValueProps进行值类型转换
-   * @returns {}
-   */
-  var namesTransform = (0, _react.useCallback)(function () {
-    var _names3;
-    if (!((_names3 = names) === null || _names3 === void 0 ? void 0 : _names3.length)) {
+  const namesTransform = (0, import_react.useCallback)(() => {
+    if (!(names == null ? void 0 : names.length)) {
       return valueTypeTransform();
     }
-    var namesStr = [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]);
-    return (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _formItemProps), valueTypeTransform()), form, names, namesStr, type);
+    const namesStr = [...baseName, index, dataIndex];
+    return (0, import_transformNames.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 : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+  if (!_editRender && typeof type === "string") {
+    TargetComponent = componentMap[type] ?? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null);
   }
   if (isEditable && _isEditing) {
-    if (typeof _editRender === 'function') {
-      TargetComponent = _editRender.apply(void 0, (0, _toConsumableArray2.default)(rowParams));
+    if (typeof _editRender === "function") {
+      TargetComponent = _editRender(...rowParams);
     }
-    if (/*#__PURE__*/_react.default.isValidElement(_editRender)) {
+    if (import_react.default.isValidElement(_editRender)) {
       TargetComponent = _editRender;
     }
   }
-  // 查看模式
   if (isView) {
-    // 存在viewRender覆盖默认值
-    if (typeof viewRender === 'function') {
-      var _column$dataIndex;
-      currentValue = (column === null || column === void 0 ? void 0 : (_column$dataIndex = column.dataIndex) === null || _column$dataIndex === void 0 ? void 0 : _column$dataIndex.includes('-')) ? value : currentValue;
-      var View = viewRender(currentValue, record || {}, options);
-      TargetComponent = (0, _jsxRuntime.jsx)(_Container.default, {
-        viewEmpty: viewEmpty,
-        children: View
-      });
+    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);
     }
-    if (/*#__PURE__*/_react.default.isValidElement(viewRender)) {
+    if (import_react.default.isValidElement(viewRender)) {
       TargetComponent = viewRender;
     }
   }
-  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(function () {
-      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__*/_regenerator().m(function _callee2() {
-    var _args3 = arguments;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
-        case 0:
-          // 如果防抖函数不存在，创建一个新的防抖函数
-          if (!debounceRef.current) {
-            debounceRef.current = (0, _debounce2.default)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee() {
-              var _len2,
-                innerArgs,
-                _key2,
-                _args,
-                rowPath,
-                _dependencies$map,
-                validateFieldKeys,
-                row,
-                orgRow,
-                _TargetComponent,
-                _TargetComponent$prop,
-                _TargetComponent$prop2,
-                _TargetComponent2,
-                _TargetComponent2$pro,
-                _TargetComponent$prop3,
-                _Object$keys,
-                _Object$keys$map,
-                diff,
-                _validateFieldKeys,
-                _args2 = arguments,
-                _t,
-                _t2,
-                _t3,
-                _t4;
-              return _regenerator().w(function (_context) {
-                while (1) switch (_context.n) {
-                  case 0:
-                    for (_len2 = _args2.length, innerArgs = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-                      innerArgs[_key2] = _args2[_key2];
-                    }
-                    _args = [].concat(innerArgs);
-                    rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-                    if (!(!onFieldChange && !onChange)) {
-                      _context.n = 1;
-                      break;
-                    }
-                    if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
-                      validateFieldKeys = dependencies === null || dependencies === void 0 ? void 0 : (_dependencies$map = dependencies.map) === null || _dependencies$map === void 0 ? void 0 : _dependencies$map.call(dependencies, function (key) {
-                        return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
-                      });
-                      setTimeout(function () {
-                        form.validateFields(validateFieldKeys);
-                      }, 100);
-                    }
-                    return _context.a(2, null);
-                  case 1:
-                    row = form.getFieldValue(rowPath, true);
-                    orgRow = (0, _cloneDeep2.default)(row);
-                    if (!onFieldChange) {
-                      _context.n = 4;
-                      break;
-                    }
-                    _args = formatArgs(innerArgs);
-                    _args[1] = row;
-                    _t = (_TargetComponent = TargetComponent) === null || _TargetComponent === void 0 ? void 0 : (_TargetComponent$prop = _TargetComponent.props) === null || _TargetComponent$prop === void 0 ? void 0 : _TargetComponent$prop.onFieldChange;
-                    if (!_t) {
-                      _context.n = 2;
-                      break;
-                    }
-                    _context.n = 2;
-                    return (_TargetComponent$prop2 = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop2, (0, _toConsumableArray2.default)(_args));
-                  case 2:
-                    _t2 = onFieldChange;
-                    if (!_t2) {
-                      _context.n = 3;
-                      break;
-                    }
-                    _context.n = 3;
-                    return onFieldChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
-                  case 3:
-                    _context.n = 6;
-                    break;
-                  case 4:
-                    _args = _args.concat([row, index, form]);
-                    _t3 = (_TargetComponent2 = TargetComponent) === null || _TargetComponent2 === void 0 ? void 0 : (_TargetComponent2$pro = _TargetComponent2.props) === null || _TargetComponent2$pro === void 0 ? void 0 : _TargetComponent2$pro.onChange;
-                    if (!_t3) {
-                      _context.n = 5;
-                      break;
-                    }
-                    _context.n = 5;
-                    return (_TargetComponent$prop3 = TargetComponent.props).onChange.apply(_TargetComponent$prop3, (0, _toConsumableArray2.default)(_args));
-                  case 5:
-                    _t4 = onChange;
-                    if (!_t4) {
-                      _context.n = 6;
-                      break;
-                    }
-                    _context.n = 6;
-                    return onChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
-                  case 6:
-                    // 判断属性是否变动
-                    form.setFieldValue(rowPath, row);
-                    if (validateTrigger && validateTrigger.includes('onChange')) {
-                      if (!(0, _isEqual2.default)(orgRow, row)) {
-                        diff = (0, _tools.difference)(row, orgRow) || {};
-                        _validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
-                          return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
-                        }).concat(dependencies || []);
-                        if (_validateFieldKeys === null || _validateFieldKeys === void 0 ? void 0 : _validateFieldKeys.length) {
-                          debounceValidate(_validateFieldKeys);
-                        }
-                      }
-                    }
-                    // 使用startTransition优化状态更新
-                    (0, _utils.compatStartTransition)(function () {
-                      setState({
-                        forceUpdate: {
-                          d: Date.now()
-                        }
-                      });
-                    });
-                  case 7:
-                    return _context.a(2);
-                }
-              }, _callee);
-            })), 300);
-          }
-          // 调用防抖函数
-          debounceRef.current.apply(debounceRef, _args3);
-        case 1:
-          return _context2.a(2);
-      }
-    }, _callee2);
-  })), [namePath, index, dependencies, formatArgs, onChange, onFieldChange, form, setState, TargetComponent, validateTrigger]);
-  // 在组件卸载时清理防抖函数
-  (0, _react.useEffect)(function () {
-    return function () {
-      if (debounceRef.current) {
-        debounceRef.current.cancel();
+  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;
       }
-    };
-  }, []);
-  // 使用useCallback优化_onblur函数
-  var _onblur = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee3() {
-    var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
-    var _len3,
-      args,
-      _key3,
-      _args,
-      rowPath,
-      row,
-      orgRow,
-      _Object$keys2,
-      _Object$keys2$map,
-      diff,
-      validateFieldKeys,
-      _args4 = arguments,
-      _t5,
-      _t6;
-    return _regenerator().w(function (_context3) {
-      while (1) switch (_context3.n) {
-        case 0:
-          if (onBlur) {
-            _context3.n = 1;
-            break;
-          }
-          return _context3.a(2, null);
-        case 1:
-          for (_len3 = _args4.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-            args[_key3] = _args4[_key3];
-          }
-          _args = formatArgs([].concat(args));
-          rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-          row = form.getFieldValue(rowPath, true);
-          orgRow = (0, _cloneDeep2.default)(row);
-          _args[1] = row;
-          _t5 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
-          if (!_t5) {
-            _context3.n = 2;
-            break;
+      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;
           }
-          _context3.n = 2;
-          return (_TargetComponent$prop4 = TargetComponent.props).onBlur.apply(_TargetComponent$prop4, (0, _toConsumableArray2.default)(_args));
-        case 2:
-          _t6 = onBlur;
-          if (!_t6) {
-            _context3.n = 3;
-            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.n = 3;
-          return onBlur.apply(void 0, (0, _toConsumableArray2.default)(_args));
-        case 3:
-          // 判断属性是否变动
           form.setFieldValue(rowPath, row);
-          if (validateTrigger && validateTrigger.includes('onBlur')) {
-            if (!(0, _isEqual2.default)(orgRow, row)) {
-              diff = (0, _tools.difference)(row, orgRow) || {};
-              validateFieldKeys = (_Object$keys2 = Object.keys(diff)) === null || _Object$keys2 === void 0 ? void 0 : (_Object$keys2$map = _Object$keys2.map) === null || _Object$keys2$map === void 0 ? void 0 : _Object$keys2$map.call(_Object$keys2, function (key) {
-                return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
-              }).concat(dependencies || []);
-              if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
+          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) {
                 debounceValidate(validateFieldKeys);
               }
             }
           }
-          if (!isCell) {
-            _context3.n = 5;
-            break;
-          }
-          _context3.n = 4;
-          return form.validateFields([cellName]);
-        case 4:
-          setState({
-            cellNamePath: []
-          });
-        case 5:
-          // 单行编辑时需要 强制更新视图
-          (0, _utils.compatStartTransition)(function () {
+          (0, import_utils.compatStartTransition)(() => {
             setState({
               forceUpdate: {
                 d: Date.now()
               }
             });
           });
-        case 6:
-          return _context3.a(2);
+        }, 300);
       }
-    }, _callee3);
-  })), [onBlur, formatArgs, namePath, index, form, TargetComponent, validateTrigger, debounceValidate, isCell, cellName, setState]);
-  // 使用useMemo优化componentProps对象
-  var componentProps = (0, _react.useMemo)(function () {
-    var _TargetComponent4;
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-      form: form,
-      name: cellName
-    }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
-      namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index]),
+      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);
+          }
+        }
+      }
+      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)(
+    () => ({
+      form,
+      name: cellName,
+      ..._fieldProps,
+      ...TargetComponent == null ? void 0 : TargetComponent.props,
+      namePath: [...namePath, index],
       disabled: _disabled,
       onChange: _onChange,
       onBlur: _onblur,
-      index: index,
-      confirm: confirm,
+      index,
+      confirm,
       desensitization: _desensitization,
       otherProps: {
-        form: form,
-        names: names,
-        namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index]),
+        form,
+        names,
+        namePath: [...namePath, index],
         name: originalName,
         listName: cellName,
-        viewEmpty: viewEmpty,
+        // 用于下拉框去重消费，保持和formlist一致
+        viewEmpty,
         valueType: _valueType,
-        isView: isView,
-        desensitizationKey: otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey
+        isView,
+        desensitizationKey: otherProps == null ? 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, _omit2.default)(componentProps, ['onFieldChange', 'namePath', 'index']);
-  // 单元格编辑时，设置各个单元格disabled属性
+    }),
+    [
+      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"]);
   if (isCell) {
-    record["".concat(dataIndex, "-Disabled")] = _disabled;
+    record[`${dataIndex}-Disabled`] = _disabled;
   }
-  if (['Switch', 'SwitchCheckbox'].includes(type)) {
-    _formItemProps.valuePropName = 'checked';
+  if (["Switch", "SwitchCheckbox"].includes(type)) {
+    _formItemProps.valuePropName = "checked";
   }
-  (0, _react.useEffect)(function () {
+  (0, import_react.useEffect)(() => {
+    var _a2;
     if (isCell) {
-      var _editingDom$focus;
-      var editingDom = document.getElementById(cellNamePath.join('_'));
-      editingDom === null || editingDom === void 0 ? void 0 : (_editingDom$focus = editingDom.focus) === null || _editingDom$focus === void 0 ? void 0 : _editingDom$focus.call(editingDom);
+      const editingDom = document.getElementById(cellNamePath.join("_"));
+      (_a2 = editingDom == null ? void 0 : editingDom.focus) == null ? void 0 : _a2.call(editingDom);
     }
   }, [cellNamePath, isCell]);
-  // 可编辑表格默认关闭scrollFollowParent
-  if (['Select', 'ProSelect', 'ProEnum'].includes(type)) {
+  if (["Select", "ProSelect", "ProEnum"].includes(type)) {
     componentProps.scrollFollowParent = false;
   }
-  // 使用useMemo优化最终的formItemProps - 修复Hooks使用规则
-  var finalFormItemProps = (0, _react.useMemo)(function () {
-    return Object.assign(_formItemProps, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultTransform()), namesTransform()), (0, _utils2.isTrim)(type, trim, proConfig)));
+  const finalFormItemProps = (0, import_react.useMemo)(() => {
+    return Object.assign(_formItemProps, {
+      ...defaultTransform(),
+      ...namesTransform(),
+      ...(0, import_utils2.isTrim)(type, trim, proConfig)
+      // 使用顶层调用的proConfig
+    });
   }, [_formItemProps, defaultTransform, namesTransform, type, trim, proConfig]);
-  // 编辑&保存模式，在查看状态下移除表单的rules不做校验
   if (isView) {
     delete finalFormItemProps.rules;
   }
-  var _className = (0, _react.useMemo)(function () {
-    return (0, _classnames.default)((0, _defineProperty2.default)({}, className, className));
-  }, [className]);
-  // 使用useCallback优化getFieldItem函数
-  var getFieldItem = (0, _react.useCallback)(function () {
-    var _componentProps;
-    var FormItem = null;
-    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? (/*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
+  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 });
     if (originalValues && !getIsNew(record)) {
-      FieldComponent = (0, _jsxRuntime.jsx)(_ListChangedWrapper.default, {
-        name: cellName,
-        names: names,
-        namesStr: [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]),
-        rowKeyPath: [].concat((0, _toConsumableArray2.default)(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
-      });
+      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
+      );
     }
-    if ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) {
-      FieldComponent = (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
-        children: FieldComponent
-      }));
+    if (componentProps == null ? void 0 : componentProps.confirm) {
+      FieldComponent = /* @__PURE__ */ import_react.default.createElement(import_ConfirmWrapper.default, { ...componentProps }, FieldComponent);
     }
-    FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      validateFirst: true
-    }, (0, _omit2.default)(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
-    })) : (0, _jsxRuntime.jsx)(_Container.default, {
-      viewEmpty: viewEmpty
-    });
-    if (type === 'FormList') {
-      FormItem = (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, _omit2.default)(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
-        children: function children(fields, operation, meta) {
-          return (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
-            otherProps: otherProps,
-            fields: fields,
-            operation: operation,
-            meta: meta
-          }));
-        }
-      }));
+    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
+          }
+        )
+      );
     }
     return FormItem;
-  }, [TargetComponent, componentProps, originalValues, record, cellName, names, baseName, index, dataIndex, originalName, originalNames, type, finalFormItemProps, viewRender, diffConfig, _className, formNamePath, viewEmpty, otherProps, getIsNew]);
-  return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-    value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
-    children: finalFormItemProps.shouldUpdate ? (0, _jsxRuntime.jsx)(_antd.Form.Item, {
-      noStyle: true,
-      shouldUpdate: finalFormItemProps.shouldUpdate,
-      children: function children() {
-        return getFieldItem();
-      }
-    }) : getFieldItem()
-  });
+  }, [
+    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());
 };
-var _default = exports.default = /*#__PURE__*/(0, _react.memo)(RenderField, function (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, {
+var RenderField_default = (0, import_react.memo)(RenderField, (prevProps, nextProps) => {
+  const {
+    text: prevText,
+    record: 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, {
+    column: prevColumn,
+    config: prevConfig
+  } = prevProps;
+  const {
+    text: nextText,
+    record: 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, _isFunction2.default)(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.disabled) && (0, _isFunction2.default)(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.disabled)) {
-    if ((prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.disabled.apply(prevColumn, prevRowParams)) !== (nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.disabled.apply(nextColumn, nextRowParams))) {
+    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))) {
       return false;
     }
   }
-  // fieldProps 函数化直接更新，无法比对返回值是否一致
-  if ((0, _isFunction2.default)(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.fieldProps) && (0, _isFunction2.default)(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.fieldProps)) {
+  if ((0, import_lodash.isFunction)(prevColumn == null ? void 0 : prevColumn.fieldProps) && (0, import_lodash.isFunction)(nextColumn == null ? void 0 : nextColumn.fieldProps)) {
     return false;
   }
-  // 通用函数比较方法
-  var compareFunctionResult = function 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, _isFunction2.default)(prevFunc) && (0, _isFunction2.default)(nextFunc)) {
-      return (0, _isEqualWith2.default)(prevFunc.apply(void 0, (0, _toConsumableArray2.default)(prevRowParams)), nextFunc.apply(void 0, (0, _toConsumableArray2.default)(nextRowParams)), _utils.customEqualForFunction);
+  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
+      );
     }
-    return true; // 如果不是函数或只有一个是函数，认为相等
+    return true;
   };
-  // 使用简化后的比较逻辑
-  var functionFields = ['rules', 'component', 'desensitization', 'isEditable'];
-  if (functionFields.some(function (field) {
-    return !compareFunctionResult(prevColumn, nextColumn, prevRowParams, nextRowParams, field);
-  })) {
+  const functionFields = ["rules", "component", "desensitization", "isEditable"];
+  if (functionFields.some(
+    (field) => !compareFunctionResult(prevColumn, nextColumn, prevRowParams, nextRowParams, field)
+  )) {
     return false;
   }
-  // 基本props比较
-  if (!(0, _isEqual2.default)(prevText, nextText) || prevIndex !== nextIndex) {
+  if (!(0, import_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)) {
+  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)) {
     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)) {
+  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)) {
     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)) {
+  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)) {
     return false;
   }
-  // 当前单元格的值比较
-  var prevDataIndex = prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.dataIndex;
-  var nextDataIndex = nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.dataIndex;
+  const prevDataIndex = prevColumn == null ? void 0 : prevColumn.dataIndex;
+  const nextDataIndex = nextColumn == null ? 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])) {
+    if ((prevRecord == null ? void 0 : prevRecord[prevDataIndex]) !== (nextRecord == null ? void 0 : nextRecord[nextDataIndex])) {
       return false;
     }
   }
   return true;
-});
+});