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

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

@@ -1,36 +1,31 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 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";
-import _isFunction from "lodash/isFunction";
-import _omit from "lodash/omit";
-import _debounce from "lodash/debounce";
-import _isEqual from "lodash/isEqual";
-import _cloneDeep from "lodash/cloneDeep";
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies", "desensitization"];
-import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 import React, { useEffect } from 'react';
 import classNames from 'classnames';
-import valueTypeMap from '../../../ProForm/utils/valueType';
-import transformMap from '../../utils/transform';
-import { getNamePath, difference, getDisabled } from '../../utils/tools';
-import * as componentMap from '../../../ProForm/components';
-import { useProConfig } from '../../../ProConfigProvider';
-import Container from '../../../ProForm/components/Container';
-import transformNames from '../../../ProForm/utils/transformNames';
-import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
-import useRules from '../../../ProForm/utils/useRules';
-import { isSelect, isTrim } from '../../../ProForm/utils';
-import ConfirmWrapper from '../../../ProForm/components/render/ConfirmWrapper';
-import { getDefaultProps } from '../../utils/getDefaultProps';
-import ListChangedWrapper from './ListChangedWrapper';
-var RenderField = function RenderField(_ref) {
+import { cloneDeep, isEqual, debounce, omit, isFunction } from 'lodash';
+import valueTypeMap from "../../../ProForm/utils/valueType";
+import transformMap from "../../utils/transform";
+import { getNamePath, difference, getDisabled } from "../../utils/tools";
+import * as componentMap from "../../../ProForm/components";
+import { useProConfig } from "../../../ProConfigProvider";
+import Container from "../../../ProForm/components/Container";
+import transformNames from "../../../ProForm/utils/transformNames";
+import { FieldProvider } from "../../../ProForm/utils/useFieldProps";
+import useRules from "../../../ProForm/utils/useRules";
+import { isSelect, isTrim } from "../../../ProForm/utils";
+import ConfirmWrapper from "../../../ProForm/components/render/ConfirmWrapper";
+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 = _ref => {
   var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps2;
   var value = _ref.text,
     record = _ref.record,
@@ -63,6 +58,7 @@ var RenderField = function RenderField(_ref) {
     dependencies = column.dependencies,
     desensitization = column.desensitization,
     resetProps = _objectWithoutProperties(column, _excluded);
+
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
   var mode = config.mode,
@@ -90,117 +86,131 @@ var RenderField = function RenderField(_ref) {
   var _desensitization = desensitization || [];
   var isCell = mode === 'cell';
   if (isCell) {
-    record['is-view'] = !_isEqual(cellNamePath, cellName);
+    record['is-view'] = !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';
+  type = ((_type = type) === null || _type === void 0 || (_type$replace = _type.replace) === null || _type$replace === void 0 ? void 0 : _type$replace.call(_type, type[0], type[0].toUpperCase())) || 'Input';
+
   // 自定义组件时 防止默认值影像后续判断
   if ('component' in column) {
     type = null;
   }
+
   // 单行正在编辑时，临时生成一套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;
+
   // 第三个参数
   var options = {
-    index: index,
-    form: form,
+    index,
+    form,
     name: column === null || column === void 0 ? void 0 : column.name,
-    namePath: [].concat(_toConsumableArray(namePath), [index])
+    namePath: [...namePath, index]
   };
+
   // 行参数
   var rowParams = [currentValue, rowData, options];
+
   // required & rules & fieldProps & disabled & valueType 函数化处理
-  if (_isFunction(required)) {
-    _required = required.apply(void 0, rowParams);
+  if (isFunction(required)) {
+    _required = required(...rowParams);
   }
-  if (_isFunction(fieldProps)) {
-    _fieldProps = fieldProps.apply(void 0, rowParams);
+  if (isFunction(fieldProps)) {
+    _fieldProps = fieldProps(...rowParams);
   }
-  if (_isFunction(rules)) {
-    _rules = rules.apply(void 0, rowParams);
+  if (isFunction(rules)) {
+    _rules = rules(...rowParams);
   }
-  if (_isFunction(valueType)) {
-    _valueType = valueType.apply(void 0, rowParams);
+  if (isFunction(valueType)) {
+    _valueType = valueType(...rowParams);
   }
-  if (_isFunction(desensitization)) {
-    _desensitization = desensitization.apply(void 0, rowParams);
+  if (isFunction(desensitization)) {
+    _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 (typeof isEditable === 'function') {
-    isEditable = isEditable.apply(void 0, rowParams);
+    isEditable = isEditable(...rowParams);
     // setTimeout(() => {
     //   !isEditable && form.validateFields([cellName]);
     // }, 100);
   }
+
   // 是否只读文本
   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,
     rowDisabled: rowDisabled || 'empty'
   });
+
   // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
   var baseName = isView ? name : namePath;
   var TargetComponent;
+
   // 设置校验规则
   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);
   var defaultProps = getDefaultProps({
-    name: 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
   });
+
   // 允许formItem的属性放在column最外层
   var _formItemProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule), {}, {
-    validateTrigger: validateTrigger
+    validateTrigger
   });
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     _valueType = 'switch';
   }
+
   /**
    * 针对一些特殊类型，基于formItem的normalize与getValueProps进行默认值类型转换
    * @returns {}
    */
-  var defaultTransform = function defaultTransform() {
+  var defaultTransform = () => {
     var types = ['DatePicker', 'RangePicker'];
     if (!_valueType && types.includes(type)) {
       var _transformMap$type;
-      return transformMap === null || transformMap === void 0 ? void 0 : (_transformMap$type = transformMap[type]) === null || _transformMap$type === void 0 ? void 0 : _transformMap$type.call(transformMap, _fieldProps || {});
+      return transformMap === null || transformMap === void 0 || (_transformMap$type = transformMap[type]) === null || _transformMap$type === void 0 ? void 0 : _transformMap$type.call(transformMap, _fieldProps || {});
     }
     return {};
   };
+
   /**
    * 配置valueType时，基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
-  var valueTypeTransform = function valueTypeTransform() {
+  var valueTypeTransform = () => {
     var _fieldProps3;
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
@@ -209,64 +219,66 @@ var RenderField = function RenderField(_ref) {
     var params = _objectSpread(_objectSpread({}, column), {}, {
       mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
     });
-    return _isFunction(valueTypeMap[_valueType]) ? valueTypeMap[_valueType](params) : {};
+    return isFunction(valueTypeMap[_valueType]) ? valueTypeMap[_valueType](params) : {};
   };
-  if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
+  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 ? 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) {
+    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 ? 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))];
     });
   }
+
   /**
    * 配置names时，基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
-  var namesTransform = function namesTransform() {
+  var namesTransform = () => {
     var _names3;
-    if (!((_names3 = names) === null || _names3 === void 0 ? void 0 : _names3.length)) {
+    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);
   };
   if (!_editRender && typeof type === 'string') {
     var _componentMap$type;
-    TargetComponent = (_componentMap$type = componentMap[type]) !== null && _componentMap$type !== void 0 ? _componentMap$type : _jsx(_Fragment, {});
+    TargetComponent = (_componentMap$type = componentMap[type]) !== null && _componentMap$type !== void 0 ? _componentMap$type : /*#__PURE__*/_jsx(_Fragment, {});
   }
   if (isEditable && _isEditing) {
     if (typeof _editRender === 'function') {
-      TargetComponent = _editRender.apply(void 0, rowParams);
+      TargetComponent = _editRender(...rowParams);
     }
-    if (/*#__PURE__*/React.isValidElement(_editRender)) {
+    if ( /*#__PURE__*/React.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;
+      currentValue = column !== null && column !== void 0 && (_column$dataIndex = column.dataIndex) !== null && _column$dataIndex !== void 0 && _column$dataIndex.includes('-') ? value : currentValue;
       var View = viewRender(currentValue, record || {}, options);
-      TargetComponent = _jsx(Container, {
+      TargetComponent = /*#__PURE__*/_jsx(Container, {
         viewEmpty: viewEmpty,
         children: View
       });
     }
-    if (/*#__PURE__*/React.isValidElement(viewRender)) {
+    if ( /*#__PURE__*/React.isValidElement(viewRender)) {
       TargetComponent = viewRender;
     }
   }
@@ -304,12 +316,13 @@ var RenderField = function RenderField(_ref) {
   };
   var debounceValidate = function debounceValidate() {
     var validateFieldKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    setTimeout(function () {
+    setTimeout(() => {
       form.validateFields(validateFieldKeys);
     }, 100);
   };
+
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
-  var _onChange = _debounce(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var _onChange = debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _len2,
       args,
       _key2,
@@ -320,11 +333,7 @@ var RenderField = function RenderField(_ref) {
       row,
       orgRow,
       _TargetComponent,
-      _TargetComponent$prop,
-      _TargetComponent$prop2,
       _TargetComponent2,
-      _TargetComponent2$pro,
-      _TargetComponent$prop3,
       _Object$keys,
       _Object$keys$map,
       diff,
@@ -336,37 +345,35 @@ var RenderField = function RenderField(_ref) {
           for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
             args[_key2] = _args2[_key2];
           }
-          _args = [].concat(args);
-          rowPath = [].concat(_toConsumableArray(namePath), [index]);
+          _args = [...args];
+          rowPath = [...namePath, index];
           if (!(!onFieldChange && !onChange)) {
             _context.next = 6;
             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(_toConsumableArray(rowPath), [key]);
-            });
-            setTimeout(function () {
+          if (dependencies !== null && dependencies !== void 0 && dependencies.length) {
+            validateFieldKeys = dependencies === null || dependencies === void 0 || (_dependencies$map = dependencies.map) === null || _dependencies$map === void 0 ? void 0 : _dependencies$map.call(dependencies, key => [...rowPath, key]);
+            setTimeout(() => {
               form.validateFields(validateFieldKeys);
             }, 100);
           }
           return _context.abrupt("return", null);
         case 6:
           row = form.getFieldValue(rowPath, true);
-          orgRow = _cloneDeep(row);
+          orgRow = cloneDeep(row);
           if (!onFieldChange) {
             _context.next = 21;
             break;
           }
           _args = formatArgs(args);
           _args[1] = row;
-          _context.t0 = (_TargetComponent = TargetComponent) === null || _TargetComponent === void 0 ? void 0 : (_TargetComponent$prop = _TargetComponent.props) === null || _TargetComponent$prop === void 0 ? void 0 : _TargetComponent$prop.onFieldChange;
+          _context.t0 = (_TargetComponent = TargetComponent) === null || _TargetComponent === void 0 || (_TargetComponent = _TargetComponent.props) === null || _TargetComponent === void 0 ? void 0 : _TargetComponent.onFieldChange;
           if (!_context.t0) {
             _context.next = 15;
             break;
           }
           _context.next = 15;
-          return (_TargetComponent$prop2 = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop2, _toConsumableArray(_args));
+          return TargetComponent.props.onFieldChange(..._args);
         case 15:
           _context.t1 = onFieldChange;
           if (!_context.t1) {
@@ -374,19 +381,19 @@ 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;
         case 21:
           _args = _args.concat([row, index, form]);
-          _context.t2 = (_TargetComponent2 = TargetComponent) === null || _TargetComponent2 === void 0 ? void 0 : (_TargetComponent2$pro = _TargetComponent2.props) === null || _TargetComponent2$pro === void 0 ? void 0 : _TargetComponent2$pro.onChange;
+          _context.t2 = (_TargetComponent2 = TargetComponent) === null || _TargetComponent2 === void 0 || (_TargetComponent2 = _TargetComponent2.props) === null || _TargetComponent2 === void 0 ? void 0 : _TargetComponent2.onChange;
           if (!_context.t2) {
             _context.next = 26;
             break;
           }
           _context.next = 26;
-          return (_TargetComponent$prop3 = TargetComponent.props).onChange.apply(_TargetComponent$prop3, _toConsumableArray(_args));
+          return TargetComponent.props.onChange(..._args);
         case 26:
           _context.t3 = onChange;
           if (!_context.t3) {
@@ -394,18 +401,16 @@ 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)) {
+            if (!isEqual(orgRow, row)) {
               diff = 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(_toConsumableArray(rowPath), [key]);
-              }).concat(dependencies || []);
-              if (_validateFieldKeys === null || _validateFieldKeys === void 0 ? void 0 : _validateFieldKeys.length) {
-                setTimeout(function () {
+              _validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 || (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, key => [...rowPath, key]).concat(dependencies || []);
+              if (_validateFieldKeys !== null && _validateFieldKeys !== void 0 && _validateFieldKeys.length) {
+                setTimeout(() => {
                   form.validateFields(_validateFieldKeys);
                 }, 100);
               }
@@ -423,8 +428,8 @@ var RenderField = function RenderField(_ref) {
     }, _callee);
   })), 300);
   var _onblur = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _TargetComponent3;
       var _len3,
         args,
         _key3,
@@ -449,18 +454,18 @@ var RenderField = function RenderField(_ref) {
             for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
               args[_key3] = _args3[_key3];
             }
-            _args = formatArgs([].concat(args));
-            rowPath = [].concat(_toConsumableArray(namePath), [index]);
+            _args = formatArgs([...args]);
+            rowPath = [...namePath, index];
             row = form.getFieldValue(rowPath, true);
-            orgRow = _cloneDeep(row);
+            orgRow = cloneDeep(row);
             _args[1] = row;
-            _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 ? void 0 : (_TargetComponent3$pro = _TargetComponent3.props) === null || _TargetComponent3$pro === void 0 ? void 0 : _TargetComponent3$pro.onBlur;
+            _context2.t0 = (_TargetComponent3 = TargetComponent) === null || _TargetComponent3 === void 0 || (_TargetComponent3 = _TargetComponent3.props) === null || _TargetComponent3 === void 0 ? void 0 : _TargetComponent3.onBlur;
             if (!_context2.t0) {
               _context2.next = 12;
               break;
             }
             _context2.next = 12;
-            return (_TargetComponent$prop4 = TargetComponent.props).onBlur.apply(_TargetComponent$prop4, _toConsumableArray(_args));
+            return TargetComponent.props.onBlur(..._args);
           case 12:
             _context2.t1 = onBlur;
             if (!_context2.t1) {
@@ -468,17 +473,15 @@ var RenderField = function RenderField(_ref) {
               break;
             }
             _context2.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)) {
+              if (!isEqual(orgRow, row)) {
                 diff = 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(_toConsumableArray(rowPath), [key]);
-                }).concat(dependencies || []);
-                if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
+                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);
                 }
               }
@@ -511,63 +514,69 @@ var RenderField = function RenderField(_ref) {
     };
   }();
   var componentProps = _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,
-      viewEmpty: viewEmpty,
+      // 用于下拉框去重消费，保持和formlist一致
+      viewEmpty,
       valueType: _valueType,
-      isView: isView,
+      isView,
       desensitizationKey: otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey
     }
   });
-  componentProps = _omit(componentProps, ['onFieldChange', 'namePath', 'index']);
+  componentProps = omit(componentProps, ['onFieldChange', 'namePath', 'index']);
+
   // 单元格编辑时，设置各个单元格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('_'));
-      editingDom === null || editingDom === void 0 ? void 0 : (_editingDom$focus = editingDom.focus) === null || _editingDom$focus === void 0 ? void 0 : _editingDom$focus.call(editingDom);
+      editingDom === null || editingDom === void 0 || (_editingDom$focus = editingDom.focus) === null || _editingDom$focus === void 0 || _editingDom$focus.call(editingDom);
     }
   }, [cellNamePath]);
+
   // 可编辑表格默认关闭scrollFollowParent
   if (['Select', 'ProSelect', 'ProEnum'].includes(type)) {
     componentProps.scrollFollowParent = false;
   }
   Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), namesTransform()), isTrim(type, trim, useProConfig())));
+
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
   if (isView) {
     delete _formItemProps.rules;
   }
-  var _className = classNames(_defineProperty({}, className, className));
-  var getFieldItem = function getFieldItem() {
+  var _className = classNames({
+    [className]: className
+  });
+  var getFieldItem = () => {
     var _componentProps;
     var FormItem = null;
-    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? (/*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
+    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : /*#__PURE__*/_jsx(TargetComponent, _objectSpread({}, componentProps));
     if (originalValues && !getIsNew(record)) {
-      FieldComponent = _jsx(ListChangedWrapper, {
+      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,
@@ -585,44 +594,41 @@ var RenderField = function RenderField(_ref) {
         children: FieldComponent
       });
     }
-    if ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) {
-      FieldComponent = _jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
+    if ((_componentProps = componentProps) !== null && _componentProps !== void 0 && _componentProps.confirm) {
+      FieldComponent = /*#__PURE__*/_jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
         children: FieldComponent
       }));
     }
-    FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
+    FormItem = TargetComponent ? /*#__PURE__*/_jsx(_Form.Item, _objectSpread(_objectSpread({
       validateFirst: true
-    }, _omit(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+    }, omit(_formItemProps, ['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
-    })) : _jsx(Container, {
+    })) : /*#__PURE__*/_jsx(Container, {
       viewEmpty: viewEmpty
     });
     if (type === 'FormList') {
-      FormItem = _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(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
-        children: function children(fields, operation, meta) {
-          return _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
-            otherProps: otherProps,
-            fields: fields,
-            operation: operation,
-            meta: meta
-          }));
-        }
+      }, omit(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+        children: (fields, operation, meta) => /*#__PURE__*/_jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
+          otherProps: otherProps,
+          fields: fields,
+          operation: operation,
+          meta: meta
+        }))
       }));
     }
     return FormItem;
   };
-  return _jsx(FieldProvider, {
+  return /*#__PURE__*/_jsx(FieldProvider, {
     value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
-    children: _formItemProps.shouldUpdate ? _jsx(_Form.Item, {
+    children: _formItemProps.shouldUpdate ? /*#__PURE__*/_jsx(_Form.Item, {
       noStyle: true,
       shouldUpdate: _formItemProps.shouldUpdate,
-      children: function children() {
-        return getFieldItem();
-      }
+      children: () => getFieldItem()
     }) : getFieldItem()
   });
 };