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

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

@@ -1,14 +1,13 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 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 */
 import React, { useEffect, useCallback, useMemo, memo, useRef } from 'react';
-import { Form } from 'antd';
 import classNames from 'classnames';
 import { cloneDeep, isEqual, debounce, omit, isFunction, isEqualWith } from 'lodash';
 import { compatStartTransition, customEqualForFunction } from "../../../utils";
@@ -27,7 +26,7 @@ import { getDefaultProps } from "../../utils/getDefaultProps";
 import ListChangedWrapper from "./ListChangedWrapper";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
-var RenderField = function RenderField(_ref) {
+var RenderField = _ref => {
   var _type, _type$replace, _fieldProps2, _fieldProps4, _names, _TargetComponent5, _componentProps2;
   var value = _ref.text,
     record = _ref.record,
@@ -100,59 +99,55 @@ var RenderField = function RenderField(_ref) {
 
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   var namePath = getNamePath(name, virtualKey);
-  var rowData = form.getFieldValue([].concat(_toConsumableArray(namePath), [index])) || record || {};
+  var rowData = form.getFieldValue([...namePath, index]) || record || {};
   var currentValue = dataIndex ? rowData === null || rowData === void 0 ? void 0 : rowData[dataIndex] : null;
 
   // 第三个参数 - 使用useMemo优化
-  var options = useMemo(function () {
-    return {
-      index: index,
-      form: form,
-      name: column === null || column === void 0 ? void 0 : column.name,
-      namePath: [].concat(_toConsumableArray(namePath), [index])
-    };
-  }, [index, column === null || column === void 0 ? void 0 : column.name, namePath]);
+  var options = 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 = useMemo(function () {
-    return [currentValue, rowData, options];
-  }, [currentValue, rowData, options]);
+  var rowParams = useMemo(() => [currentValue, rowData, options], [currentValue, rowData, options]);
 
   // required & rules & fieldProps & disabled & valueType 函数化处理
   if (isFunction(required)) {
-    _required = required.apply(void 0, _toConsumableArray(rowParams));
+    _required = required(...rowParams);
   }
   if (isFunction(fieldProps)) {
-    _fieldProps = fieldProps.apply(void 0, _toConsumableArray(rowParams));
+    _fieldProps = fieldProps(...rowParams);
   }
   if (isFunction(rules)) {
-    _rules = rules.apply(void 0, _toConsumableArray(rowParams));
+    _rules = rules(...rowParams);
   }
   if (isFunction(valueType)) {
-    _valueType = valueType.apply(void 0, _toConsumableArray(rowParams));
+    _valueType = valueType(...rowParams);
   }
   if (isFunction(desensitization)) {
-    _desensitization = desensitization.apply(void 0, _toConsumableArray(rowParams));
+    _desensitization = desensitization(...rowParams);
   }
 
   // 获取最终的disabled
   _disabled = getDisabled({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
     formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
-    column: column,
+    column,
     tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
     columnFieldProps: _fieldProps,
     params: rowParams
   });
   if (isFunction(isEditable)) {
-    isEditable = isEditable.apply(void 0, _toConsumableArray(rowParams));
+    isEditable = isEditable(...rowParams);
   }
 
   // 是否只读文本
   var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || getDisabled({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
     formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
-    column: column,
+    column,
     tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
     columnFieldProps: _fieldProps,
     params: rowParams,
@@ -168,37 +163,33 @@ var RenderField = function RenderField(_ref) {
 
   // 设置校验规则 - 修复Hooks使用规则
   var internalRule = useRules({
-    names: names,
+    names,
     label: label,
-    labelRequired: labelRequired,
+    labelRequired,
     required: !isView && _required,
     rules: _isEditing ? _rules : [],
     isSelect: isSelect({
       dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
-      type: type
+      type
     }),
-    type: type
+    type
   });
 
   // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
   var formItemChildProps = _objectSpread({}, _fieldProps);
 
   // 使用useMemo优化defaultProps计算
-  var defaultProps = useMemo(function () {
-    return 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]);
+  var defaultProps = useMemo(() => 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 = useMemo(function () {
-    return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule), {}, {
-      validateTrigger: validateTrigger
-    });
-  }, [defaultProps, resetProps, internalRule, validateTrigger]);
+  var _formItemProps = useMemo(() => _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule), {}, {
+    validateTrigger
+  }), [defaultProps, resetProps, internalRule, validateTrigger]);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     _valueType = 'switch';
@@ -208,7 +199,7 @@ var RenderField = function RenderField(_ref) {
    * 针对一些特殊类型，基于formItem的normalize与getValueProps进行默认值类型转换
    * @returns {}
    */
-  var defaultTransform = useCallback(function () {
+  var defaultTransform = useCallback(() => {
     var types = ['DatePicker', 'RangePicker'];
     if (!_valueType && types.includes(type)) {
       var _transformMap$type;
@@ -221,7 +212,7 @@ var RenderField = function RenderField(_ref) {
    * 配置valueType时，基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
-  var valueTypeTransform = useCallback(function () {
+  var valueTypeTransform = useCallback(() => {
     var _fieldProps3;
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
@@ -234,21 +225,21 @@ var RenderField = function RenderField(_ref) {
   }, [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(function (key) {
+    names = names.map(key => {
       if (Array.isArray(key)) {
-        return [].concat(_toConsumableArray(baseName), [index], _toConsumableArray(key));
+        return [...baseName, index, ...key];
       }
-      return [].concat(_toConsumableArray(baseName), [index, key]);
+      return [...baseName, index, key];
     });
   }
   var originalName = cellName;
   var originalNames = names;
   if (virtualKey) {
     var _cellName$slice, _names2, _names2$map;
-    originalName = [].concat(_toConsumableArray(name), _toConsumableArray(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, function (item) {
+    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 [].concat(_toConsumableArray(name), _toConsumableArray(item === null || item === void 0 || (_item$slice = item.slice) === null || _item$slice === void 0 ? void 0 : _item$slice.call(item, name.length)));
+      return [...name, ...(item === null || item === void 0 || (_item$slice = item.slice) === null || _item$slice === void 0 ? void 0 : _item$slice.call(item, name.length))];
     });
   }
 
@@ -256,12 +247,12 @@ var RenderField = function RenderField(_ref) {
    * 配置names时，基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
-  var namesTransform = useCallback(function () {
+  var namesTransform = useCallback(() => {
     var _names3;
     if (!((_names3 = names) !== null && _names3 !== void 0 && _names3.length)) {
       return valueTypeTransform();
     }
-    var namesStr = [].concat(_toConsumableArray(baseName), [index, dataIndex]);
+    var namesStr = [...baseName, index, dataIndex];
     return transformNames(_objectSpread(_objectSpread({}, _formItemProps), valueTypeTransform()), form, names, namesStr, type);
   }, [names, baseName, index, dataIndex, _formItemProps, type]);
   if (!_editRender && typeof type === 'string') {
@@ -270,7 +261,7 @@ var RenderField = function RenderField(_ref) {
   }
   if (isEditable && _isEditing) {
     if (typeof _editRender === 'function') {
-      TargetComponent = _editRender.apply(void 0, _toConsumableArray(rowParams));
+      TargetComponent = _editRender(...rowParams);
     }
     if ( /*#__PURE__*/React.isValidElement(_editRender)) {
       TargetComponent = _editRender;
@@ -331,7 +322,7 @@ var RenderField = function RenderField(_ref) {
   // 使用useCallback优化debounceValidate函数
   var debounceValidate = useCallback(function () {
     var validateFieldKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    setTimeout(function () {
+    setTimeout(() => {
       form.validateFields(validateFieldKeys, {
         recursive: true
       });
@@ -360,9 +351,7 @@ var RenderField = function RenderField(_ref) {
                 row,
                 orgRow,
                 _TargetComponent,
-                _TargetComponent$prop,
                 _TargetComponent2,
-                _TargetComponent$prop2,
                 _Object$keys,
                 _Object$keys$map,
                 diff,
@@ -374,17 +363,15 @@ var RenderField = function RenderField(_ref) {
                     for (_len2 = _args2.length, innerArgs = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
                       innerArgs[_key2] = _args2[_key2];
                     }
-                    _args = [].concat(innerArgs);
-                    rowPath = [].concat(_toConsumableArray(namePath), [index]);
+                    _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, function (key) {
-                        return [].concat(_toConsumableArray(rowPath), [key]);
-                      });
-                      setTimeout(function () {
+                      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);
                     }
@@ -404,7 +391,7 @@ var RenderField = function RenderField(_ref) {
                       break;
                     }
                     _context.next = 15;
-                    return (_TargetComponent$prop = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop, _toConsumableArray(_args));
+                    return TargetComponent.props.onFieldChange(..._args);
                   case 15:
                     _context.t1 = onFieldChange;
                     if (!_context.t1) {
@@ -412,7 +399,7 @@ var RenderField = function RenderField(_ref) {
                       break;
                     }
                     _context.next = 19;
-                    return onFieldChange.apply(void 0, _toConsumableArray(_args));
+                    return onFieldChange(..._args);
                   case 19:
                     _context.next = 30;
                     break;
@@ -424,7 +411,7 @@ var RenderField = function RenderField(_ref) {
                       break;
                     }
                     _context.next = 26;
-                    return (_TargetComponent$prop2 = TargetComponent.props).onChange.apply(_TargetComponent$prop2, _toConsumableArray(_args));
+                    return TargetComponent.props.onChange(..._args);
                   case 26:
                     _context.t3 = onChange;
                     if (!_context.t3) {
@@ -432,23 +419,21 @@ var RenderField = function RenderField(_ref) {
                       break;
                     }
                     _context.next = 30;
-                    return onChange.apply(void 0, _toConsumableArray(_args));
+                    return onChange(..._args);
                   case 30:
                     // 判断属性是否变动
                     form.setFieldValue(rowPath, row);
                     if (validateTrigger && validateTrigger.includes('onChange')) {
                       if (!isEqual(orgRow, row)) {
                         diff = difference(row, orgRow) || {};
-                        _validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 || (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
-                          return [].concat(_toConsumableArray(rowPath), [key]);
-                        }).concat(dependencies || []);
+                        _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优化状态更新
-                    compatStartTransition(function () {
+                    compatStartTransition(() => {
                       setState({
                         forceUpdate: {
                           d: Date.now()
@@ -464,7 +449,7 @@ var RenderField = function RenderField(_ref) {
           }
 
           // 调用防抖函数
-          debounceRef.current.apply(debounceRef, _args3);
+          debounceRef.current(..._args3);
         case 2:
         case "end":
           return _context2.stop();
@@ -473,8 +458,8 @@ var RenderField = function RenderField(_ref) {
   })), [namePath, index, dependencies, formatArgs, onChange, onFieldChange, form, setState, TargetComponent, validateTrigger]);
 
   // 在组件卸载时清理防抖函数
-  useEffect(function () {
-    return function () {
+  useEffect(() => {
+    return () => {
       if (debounceRef.current) {
         debounceRef.current.cancel();
       }
@@ -483,7 +468,7 @@ var RenderField = function RenderField(_ref) {
 
   // 使用useCallback优化_onblur函数
   var _onblur = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    var _TargetComponent3, _TargetComponent$prop3;
+    var _TargetComponent3;
     var _len3,
       args,
       _key3,
@@ -508,8 +493,8 @@ var RenderField = function RenderField(_ref) {
           for (_len3 = _args4.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
             args[_key3] = _args4[_key3];
           }
-          _args = formatArgs([].concat(args));
-          rowPath = [].concat(_toConsumableArray(namePath), [index]);
+          _args = formatArgs([...args]);
+          rowPath = [...namePath, index];
           row = form.getFieldValue(rowPath, true);
           orgRow = cloneDeep(row);
           _args[1] = row;
@@ -519,7 +504,7 @@ var RenderField = function RenderField(_ref) {
             break;
           }
           _context3.next = 12;
-          return (_TargetComponent$prop3 = TargetComponent.props).onBlur.apply(_TargetComponent$prop3, _toConsumableArray(_args));
+          return TargetComponent.props.onBlur(..._args);
         case 12:
           _context3.t1 = onBlur;
           if (!_context3.t1) {
@@ -527,16 +512,14 @@ var RenderField = function RenderField(_ref) {
             break;
           }
           _context3.next = 16;
-          return onBlur.apply(void 0, _toConsumableArray(_args));
+          return onBlur(..._args);
         case 16:
           // 判断属性是否变动
           form.setFieldValue(rowPath, row);
           if (validateTrigger && validateTrigger.includes('onBlur')) {
             if (!isEqual(orgRow, row)) {
               diff = difference(row, orgRow) || {};
-              validateFieldKeys = (_Object$keys2 = Object.keys(diff)) === null || _Object$keys2 === void 0 || (_Object$keys2$map = _Object$keys2.map) === null || _Object$keys2$map === void 0 ? void 0 : _Object$keys2$map.call(_Object$keys2, function (key) {
-                return [].concat(_toConsumableArray(rowPath), [key]);
-              }).concat(dependencies || []);
+              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);
               }
@@ -554,7 +537,7 @@ var RenderField = function RenderField(_ref) {
           });
         case 22:
           // 单行编辑时需要 强制更新视图
-          compatStartTransition(function () {
+          compatStartTransition(() => {
             setState({
               forceUpdate: {
                 d: Date.now()
@@ -569,29 +552,29 @@ var RenderField = function RenderField(_ref) {
   })), [onBlur, formatArgs, namePath, index, form, TargetComponent, validateTrigger, debounceValidate, isCell, cellName, setState]);
 
   // 使用useMemo优化componentProps对象
-  var componentProps = useMemo(function () {
+  var componentProps = useMemo(() => {
     var _TargetComponent4;
     return _objectSpread(_objectSpread(_objectSpread({
-      form: form,
+      form,
       name: cellName
     }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
-      namePath: [].concat(_toConsumableArray(namePath), [index]),
+      namePath: [...namePath, index],
       disabled: _disabled,
       onChange: _onChange,
       onBlur: _onblur,
-      index: index,
-      confirm: confirm,
+      index,
+      confirm,
       desensitization: _desensitization,
       otherProps: {
-        form: form,
-        names: names,
-        namePath: [].concat(_toConsumableArray(namePath), [index]),
+        form,
+        names,
+        namePath: [...namePath, index],
         name: originalName,
         listName: cellName,
         // 用于下拉框去重消费，保持和formlist一致
-        viewEmpty: viewEmpty,
+        viewEmpty,
         valueType: _valueType,
-        isView: isView,
+        isView,
         desensitizationKey: otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey
       }
     });
@@ -600,12 +583,12 @@ var RenderField = function RenderField(_ref) {
 
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
-    record["".concat(dataIndex, "-Disabled")] = _disabled;
+    record[`${dataIndex}-Disabled`] = _disabled;
   }
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
   }
-  useEffect(function () {
+  useEffect(() => {
     if (isCell) {
       var _editingDom$focus;
       var editingDom = document.getElementById(cellNamePath.join('_'));
@@ -619,7 +602,7 @@ var RenderField = function RenderField(_ref) {
   }
 
   // 使用useMemo优化最终的formItemProps - 修复Hooks使用规则
-  var finalFormItemProps = useMemo(function () {
+  var finalFormItemProps = useMemo(() => {
     return Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), namesTransform()), isTrim(type, trim, proConfig)));
   }, [_formItemProps, defaultTransform, namesTransform, type, trim, proConfig]);
 
@@ -627,12 +610,12 @@ var RenderField = function RenderField(_ref) {
   if (isView) {
     delete finalFormItemProps.rules;
   }
-  var _className = useMemo(function () {
-    return classNames(_defineProperty({}, className, className));
-  }, [className]);
+  var _className = useMemo(() => classNames({
+    [className]: className
+  }), [className]);
 
   // 使用useCallback优化getFieldItem函数
-  var getFieldItem = useCallback(function () {
+  var getFieldItem = useCallback(() => {
     var _componentProps;
     var FormItem = null;
     var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : /*#__PURE__*/_jsx(TargetComponent, _objectSpread({}, componentProps));
@@ -640,8 +623,8 @@ var RenderField = function RenderField(_ref) {
       FieldComponent = /*#__PURE__*/_jsx(ListChangedWrapper, {
         name: cellName,
         names: names,
-        namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),
-        rowKeyPath: [].concat(_toConsumableArray(baseName), [index, 'rowKey']),
+        namesStr: [...baseName, index, dataIndex],
+        rowKeyPath: [...baseName, index, 'rowKey'],
         originalName: originalName,
         originalNames: originalNames,
         originalValues: originalValues,
@@ -664,7 +647,7 @@ var RenderField = function RenderField(_ref) {
         children: FieldComponent
       }));
     }
-    FormItem = TargetComponent ? /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
+    FormItem = TargetComponent ? /*#__PURE__*/_jsx(_Form.Item, _objectSpread(_objectSpread({
       validateFirst: true
     }, omit(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
       // 移除非必要字段
@@ -675,33 +658,29 @@ var RenderField = function RenderField(_ref) {
       viewEmpty: viewEmpty
     });
     if (type === 'FormList') {
-      FormItem = /*#__PURE__*/_jsx(Form.List, _objectSpread(_objectSpread({
+      FormItem = /*#__PURE__*/_jsx(_Form.List, _objectSpread(_objectSpread({
         name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
       }, omit(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
-        children: function children(fields, operation, meta) {
-          return /*#__PURE__*/_jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
-            otherProps: otherProps,
-            fields: fields,
-            operation: operation,
-            meta: meta
-          }));
-        }
+        children: (fields, operation, meta) => /*#__PURE__*/_jsx(TargetComponent, _objectSpread(_objectSpread({}, 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__*/_jsx(FieldProvider, {
     value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
-    children: finalFormItemProps.shouldUpdate ? /*#__PURE__*/_jsx(Form.Item, {
+    children: finalFormItemProps.shouldUpdate ? /*#__PURE__*/_jsx(_Form.Item, {
       noStyle: true,
       shouldUpdate: finalFormItemProps.shouldUpdate,
-      children: function children() {
-        return getFieldItem();
-      }
+      children: () => getFieldItem()
     }) : getFieldItem()
   });
 };
-export default /*#__PURE__*/memo(RenderField, function (prevProps, nextProps) {
+export default /*#__PURE__*/memo(RenderField, (prevProps, nextProps) => {
   // 自定义比较函数，只有关键props变化时才重新渲染
   var prevText = prevProps.text,
     prevRecord = prevProps.record,
@@ -724,7 +703,7 @@ export default /*#__PURE__*/memo(RenderField, function (prevProps, nextProps) {
     name: nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.name
   }];
   if (isFunction(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.disabled) && isFunction(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))) {
+    if ((prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.disabled(...prevRowParams)) !== (nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.disabled(...nextRowParams))) {
       return false;
     }
   }
@@ -735,20 +714,18 @@ export default /*#__PURE__*/memo(RenderField, function (prevProps, nextProps) {
   }
 
   // 通用函数比较方法
-  var compareFunctionResult = function compareFunctionResult(prevColumn, nextColumn, prevRowParams, nextRowParams, functionName) {
+  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 (isFunction(prevFunc) && isFunction(nextFunc)) {
-      return isEqualWith(prevFunc.apply(void 0, _toConsumableArray(prevRowParams)), nextFunc.apply(void 0, _toConsumableArray(nextRowParams)), customEqualForFunction);
+      return isEqualWith(prevFunc(...prevRowParams), nextFunc(...nextRowParams), customEqualForFunction);
     }
     return true; // 如果不是函数或只有一个是函数，认为相等
   };
 
   // 使用简化后的比较逻辑
   var functionFields = ['rules', 'component', 'desensitization', 'isEditable'];
-  if (functionFields.some(function (field) {
-    return !compareFunctionResult(prevColumn, nextColumn, prevRowParams, nextRowParams, field);
-  })) {
+  if (functionFields.some(field => !compareFunctionResult(prevColumn, nextColumn, prevRowParams, nextRowParams, field))) {
     return false;
   }