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

package/es/ProEditTable/utils/config.js

@@ -1,11 +1,10 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _typeof from "@babel/runtime/helpers/esm/typeof";
 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 "antd/es/message/style";
+import _message from "antd/es/message";
 import { PlusOutlined } from '@ant-design/icons';
 import { tools } from '@zat-design/utils';
-import { message } from 'antd';
 import { set } from 'lodash';
 import { onDelete, getRandom } from "./tools";
 import locale from "../../locale";
@@ -37,7 +36,7 @@ export var defaultToolbarKeys = ['add', 'mulDelete'];
 
 // 操作枚举
 export var actions = {
-  edit: function edit(_ref) {
+  edit: _ref => {
     var record = _ref.record,
       editingKeys = _ref.editingKeys,
       setState = _ref.setState,
@@ -47,10 +46,10 @@ export var actions = {
       onlyOneLineMsg = _ref.onlyOneLineMsg;
     // 单行编辑时，需要先保存，才能进行下面的编辑
     if (virtualKey && editingKeys.length >= 1) {
-      message.warning(onlyOneLineMsg);
+      _message.warning(onlyOneLineMsg);
       return false;
     }
-    var nextEditingKeys = _toConsumableArray(editingKeys);
+    var nextEditingKeys = [...editingKeys];
     // 开启编辑状态
     nextEditingKeys.push(record.rowKey);
     // 编辑时赋值编辑状态，供validator做保存校验
@@ -73,13 +72,11 @@ export var actions = {
           case 0:
             record = _ref2.record, editingKeys = _ref2.editingKeys, setState = _ref2.setState, form = _ref2.form, rowName = _ref2.rowName, virtualRowName = _ref2.virtualRowName, result = _ref2.result;
             // 保存返回数据与当前行内数据做合并
-            updateData = _typeof(result) === 'object' ? result : {};
+            updateData = typeof result === 'object' ? result : {};
             record = _objectSpread(_objectSpread(_objectSpread({}, record), form.getFieldValue(virtualRowName)), updateData);
             delete record._addFlag; // 删除第一次新增的标记
             // 关闭当前保存行的编辑状态
-            nextEditingKeys = editingKeys.filter(function (key) {
-              return key !== record.rowKey;
-            }); // 保存后取消编辑状态，供validator做保存校验
+            nextEditingKeys = editingKeys.filter(key => key !== record.rowKey); // 保存后取消编辑状态，供validator做保存校验
             if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
               record._isEditing = true;
             } else {
@@ -103,7 +100,7 @@ export var actions = {
     }
     return save;
   }(),
-  cancel: function cancel(_ref3) {
+  cancel: _ref3 => {
     var name = _ref3.name,
       record = _ref3.record,
       editingKeys = _ref3.editingKeys,
@@ -111,9 +108,7 @@ export var actions = {
       form = _ref3.form,
       virtualRowName = _ref3.virtualRowName,
       virtualKey = _ref3.virtualKey;
-    var nextEditingKeys = editingKeys.filter(function (key) {
-      return key !== record.rowKey;
-    });
+    var nextEditingKeys = editingKeys.filter(key => key !== record.rowKey);
     // 保存后取消编辑状态，供validator做保存校验
     if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
       record._isEditing = true;
@@ -126,9 +121,9 @@ export var actions = {
     // 取消分两种，一编辑取消，二添加取消
     if (record._addFlag) {
       onDelete({
-        name: name,
-        form: form,
-        virtualKey: virtualKey,
+        name,
+        form,
+        virtualKey,
         selectedRowKeys: [record.rowKey]
       });
     } else {
@@ -138,7 +133,7 @@ export var actions = {
       form.setFieldsValue(values);
     }
   },
-  delete: function _delete(_ref4) {
+  delete: _ref4 => {
     var name = _ref4.name,
       record = _ref4.record,
       editingKeys = _ref4.editingKeys,
@@ -148,21 +143,19 @@ export var actions = {
       onlyOneLineMsg = _ref4.onlyOneLineMsg;
     // 单行编辑时，需要先保存，才能进行下面的编辑
     if (virtualKey && editingKeys.length >= 1) {
-      message.warning(onlyOneLineMsg);
+      _message.warning(onlyOneLineMsg);
       return false;
     }
     // 删除当前行数据
     onDelete({
-      name: name,
-      form: form,
-      virtualKey: virtualKey,
+      name,
+      form,
+      virtualKey,
       selectedRowKeys: [record.rowKey]
     });
     if (virtualKey) {
       // 关闭编辑状态
-      var nextEditingKeys = editingKeys.filter(function (key) {
-        return key === record.rowKey;
-      });
+      var nextEditingKeys = editingKeys.filter(key => key === record.rowKey);
       setState({
         editingKeys: nextEditingKeys
       });
@@ -176,17 +169,17 @@ export var actions = {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef, _ref5$prefixCls = _ref5.prefixCls, prefixCls = _ref5$prefixCls === void 0 ? 'ant' : _ref5$prefixCls, page = _ref5.page, handlePageChange = _ref5.handlePageChange;
-            nextData = _toConsumableArray(form.getFieldValue(name) || []); // 单行编辑时，需要先保存，才能进行下面的编辑
+            nextData = [...(form.getFieldValue(name) || [])]; // 单行编辑时，需要先保存，才能进行下面的编辑
             if (!(virtualKey && editingKeys.length >= 1)) {
               _context4.next = 5;
               break;
             }
-            message.warning(onlyOneLineMsg);
+            _message.warning(onlyOneLineMsg);
             return _context4.abrupt("return", false);
           case 5:
             rowKey = getRandom(); // 添加新增对象数据
-            addData = _objectSpread(_objectSpread({}, _typeof(result) === 'object' ? result : {}), {}, {
-              rowKey: rowKey
+            addData = _objectSpread(_objectSpread({}, typeof result === 'object' ? result : {}), {}, {
+              rowKey
             }); // 单行编辑时，需要操作一下数据结构，判断是否第一次新增，以及是否是编辑状态
             if (virtualKey) {
               addData._addFlag = true;
@@ -223,7 +216,7 @@ export var actions = {
 
             // 当单选情况下，存储正在编辑值
             if (virtualKey) {
-              nextEditingKeys = _toConsumableArray(editingKeys); // 开启编辑状态
+              nextEditingKeys = [...editingKeys]; // 开启编辑状态
               nextEditingKeys.push(rowKey);
               form.setFieldValue(virtualName, nextData);
               setState({
@@ -231,7 +224,7 @@ export var actions = {
               });
             }
             form.setFieldValue(name, nextData);
-            (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.children[0]) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current === void 0 || (_tableRef$current$scr = _tableRef$current.scrollTo) === null || _tableRef$current$scr === void 0 || _tableRef$current$scr.call(_tableRef$current, {
+            (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.children[0]) === null || _tableRef$current === void 0 || (_tableRef$current = _tableRef$current.querySelector(`.${prefixCls}-table-body`)) === null || _tableRef$current === void 0 || (_tableRef$current$scr = _tableRef$current.scrollTo) === null || _tableRef$current$scr === void 0 || _tableRef$current$scr.call(_tableRef$current, {
               top: insertType === 'before' ? -10000 : 10000,
               behavior: 'smooth'
             });
@@ -252,7 +245,7 @@ export var actions = {
     }
     return add;
   }(),
-  mulDelete: function mulDelete(_ref8) {
+  mulDelete: _ref8 => {
     var form = _ref8.form,
       name = _ref8.name,
       virtualKey = _ref8.virtualKey,
@@ -262,10 +255,10 @@ export var actions = {
       editingKeys = _ref8$editingKeys === void 0 ? [] : _ref8$editingKeys;
     // 删除选中数据
     onDelete({
-      name: name,
-      form: form,
-      virtualKey: virtualKey,
-      selectedRowKeys: selectedRowKeys
+      name,
+      form,
+      virtualKey,
+      selectedRowKeys
     });
     var nextData = {
       selectedRowKeys: [],

package/es/ProEditTable/utils/diffOriginal.d.ts

@@ -4,6 +4,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
+    type?: string;
     onDiff?: ({ originValue, originRecord, value, record, index, }: {
         originValue: any;
         originRecord: any;

package/es/ProEditTable/utils/diffOriginal.js

@@ -1,16 +1,74 @@
 import { isEqual, isFunction, isObject } from 'lodash';
 import { validate } from '@zat-design/utils';
 var isEmpty = validate.isEmpty;
+
+// 比较策略接口
+
+// 数字类型标准化函数
+var normalizeNumberValue = value => {
+  if (value === null || value === undefined || value === '') return null;
+  var num = Number(value);
+  return Number.isNaN(num) ? null : num;
+};
+
+// InputNumber 比较策略
+var inputNumberStrategy = {
+  compare: (val1, val2) => {
+    var num1 = normalizeNumberValue(val1);
+    var num2 = normalizeNumberValue(val2);
+    return num1 === num2;
+  }
+};
+
+// ProNumberRange 比较策略
+var proNumberRangeStrategy = {
+  compare: (val1, val2) => {
+    if (!Array.isArray(val1) || !Array.isArray(val2)) return false;
+    if (val1.length !== val2.length) return false;
+    return val1.every((item, index) => {
+      var num1 = normalizeNumberValue(item);
+      var num2 = normalizeNumberValue(val2[index]);
+      return num1 === num2;
+    });
+  }
+};
+
+// 数字类型处理函数
+var handleNumberTypeDiff = params => {
+  var originalValue = params.originalValue,
+    value = params.value,
+    type = params.type;
+  var isEmptyVal = isEmpty(value);
+  var isEmptyOrg = isEmpty(originalValue);
+
+  // 都为空视为相等
+  if (isEmptyOrg && isEmptyVal) return 'same';
+
+  // 如果原始值为空 且当前有值的话 视为新增
+  if (isEmptyOrg && !isEmptyVal) return 'add';
+
+  // 根据类型选择对应的比较策略
+  var compareStrategy;
+  if (type === 'InputNumber') {
+    compareStrategy = inputNumberStrategy;
+  } else if (type === 'ProNumberRange') {
+    compareStrategy = proNumberRangeStrategy;
+  } else {
+    return 'changed'; // 未知类型视为已改变
+  }
+  return compareStrategy.compare(value, originalValue) ? 'same' : 'changed';
+};
+
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
-var filterObject = function filterObject(data) {
+var filterObject = data => {
   if (!isObject(data) || data === null) return data;
 
   // ['1', undefined] ['1', ''] 视为相等
   if (Array.isArray(data)) {
     // 数组中全是empty值的话 视为null
     var isFillNull = true;
-    var arr = data.map(function (item) {
+    var arr = data.map(item => {
       if (isEmpty(item)) {
         return null;
       }
@@ -20,7 +78,7 @@ var filterObject = function filterObject(data) {
     return isFillNull ? null : arr;
   }
   var resData = {};
-  Object.keys(data).forEach(function (key) {
+  Object.keys(data).forEach(key => {
     if (!isEmpty(data[key])) {
       resData[key] = data[key];
     }
@@ -30,21 +88,23 @@ var filterObject = function filterObject(data) {
   if (!Object.keys(resData).length) return null;
   return resData;
 };
-export var diffOriginal = function diffOriginal(params) {
+export var diffOriginal = params => {
   var originalValue = params.originalValue,
     value = params.value,
     onDiff = params.onDiff,
     originRecord = params.originRecord,
     record = params.record,
-    index = params.index;
+    index = params.index,
+    type = params.type;
+
   // 支持传入自定义比较事件
   if (isFunction(onDiff)) {
     var diffRes = onDiff({
       originValue: originalValue,
-      originRecord: originRecord,
-      value: value,
-      record: record,
-      index: index
+      originRecord,
+      value,
+      record,
+      index
     });
     // 如果返回undefined走内置比较逻辑
     if (diffRes !== undefined) {
@@ -54,6 +114,13 @@ export var diffOriginal = function diffOriginal(params) {
       return diffRes;
     }
   }
+
+  // 数字类型特殊处理
+  if (['InputNumber', 'ProNumberRange'].includes(type)) {
+    return handleNumberTypeDiff(params);
+  }
+
+  // 其他类型使用原有逻辑
   var _value = filterObject(value);
   var _originalValue = filterObject(originalValue);
   var isEmptyVal = isEmpty(_value);

package/es/ProEditTable/utils/getDefaultProps.js

@@ -1,7 +1,6 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { get, isEqual } from 'lodash';
 var defaultPropsMap = {
-  ProSelect: function ProSelect(props) {
+  ProSelect: props => {
     var fieldProps = props.fieldProps,
       name = props.name,
       namePath = props.namePath;
@@ -11,13 +10,13 @@ var defaultPropsMap = {
 
     // formList场景传入列表过滤时
     if (filterInList && namePath && name) {
-      var _namePath = _toConsumableArray(namePath).splice(2, namePath.length - 1);
-      defaultProps.shouldUpdate = function (preValues, curValues) {
+      var _namePath = [...namePath].splice(2, namePath.length - 1);
+      defaultProps.shouldUpdate = (preValues, curValues) => {
         var _get, _get$map, _get2, _get2$map;
-        var preListValue = (_get = get(preValues, name)) === null || _get === void 0 || (_get$map = _get.map) === null || _get$map === void 0 ? void 0 : _get$map.call(_get, function (item) {
+        var preListValue = (_get = get(preValues, name)) === null || _get === void 0 || (_get$map = _get.map) === null || _get$map === void 0 ? void 0 : _get$map.call(_get, item => {
           return get(item, _namePath);
         });
-        var curListValue = (_get2 = get(curValues, name)) === null || _get2 === void 0 || (_get2$map = _get2.map) === null || _get2$map === void 0 ? void 0 : _get2$map.call(_get2, function (item) {
+        var curListValue = (_get2 = get(curValues, name)) === null || _get2 === void 0 || (_get2$map = _get2.map) === null || _get2$map === void 0 ? void 0 : _get2$map.call(_get2, item => {
           return get(item, _namePath);
         });
         return !isEqual(preListValue, curListValue);
@@ -26,7 +25,7 @@ var defaultPropsMap = {
     return defaultProps;
   }
 };
-export var getDefaultProps = function getDefaultProps(props) {
+export var getDefaultProps = props => {
   var _defaultPropsMap$type;
   var type = props.type;
   return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);

package/es/ProEditTable/utils/index.js

@@ -1,14 +1,15 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
   _excluded2 = ["title", "icon"];
 import React from 'react';
 import { cloneDeepWith, isArray, isBoolean, isEqual, isFunction } from 'lodash';
-import { Tooltip, Space } from 'antd';
 import classnames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import { tools } from '@zat-design/utils';
@@ -22,8 +23,8 @@ import locale from "../../locale";
 // 渲染操作栏
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var getActionColumn = function getActionColumn(config) {
-  var _cloneDeepWith = cloneDeepWith(config, function (value) {
+var getActionColumn = config => {
+  var _cloneDeepWith = cloneDeepWith(config, value => {
       if ( /*#__PURE__*/React.isValidElement(value)) {
         return value;
       }
@@ -48,21 +49,19 @@ var getActionColumn = function getActionColumn(config) {
 
   // 设置默认操作栏按钮（区分单行与多行编辑场景）
   var defaultActionKeys = virtualKey ? defaultSingleActionKeys : defaultMultipleActionKeys;
-  var nextActionsProps = _toConsumableArray(actionProps);
+  var nextActionsProps = [...actionProps];
 
   // 不设置actionProps
   if (isArray(actionProps) && !(actionProps !== null && actionProps !== void 0 && actionProps.length)) {
-    nextActionsProps = defaultActionKeys.map(function (key) {
+    nextActionsProps = defaultActionKeys.map(key => {
       return {
         type: key
       };
     });
   } else {
     // 设置部分actionProps 内置的必选按钮会集成进去，可以手动开启show: false来隐藏对应类型的按钮
-    defaultActionKeys.forEach(function (key) {
-      if (isArray(actionProps) && !actionProps.find(function (action) {
-        return action.type === key;
-      })) {
+    defaultActionKeys.forEach(key => {
+      if (isArray(actionProps) && !actionProps.find(action => action.type === key)) {
         nextActionsProps.push({
           type: key
         });
@@ -71,7 +70,7 @@ var getActionColumn = function getActionColumn(config) {
   }
 
   // 渲染操作按钮前处理下默认数据
-  var actionBtns = nextActionsProps.map(function (action) {
+  var actionBtns = nextActionsProps.map(action => {
     var type = action.type,
       label = action.label,
       show = action.show,
@@ -92,7 +91,7 @@ var getActionColumn = function getActionColumn(config) {
             case 0:
               index = _ref.index, form = _ref.form, name = _ref.name, namePath = _ref.namePath, tableLength = _ref.tableLength, selectedRows = _ref.selectedRows;
               index = tools.calc(firstIndex, '+', index);
-              rowName = [].concat(_toConsumableArray(virtualRowName), [index]);
+              rowName = [...virtualRowName, index];
               if (!(type === 'save')) {
                 _context.next = 13;
                 break;
@@ -122,12 +121,12 @@ var getActionColumn = function getActionColumn(config) {
             case 19:
               _context.next = 21;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, {
-                form: form,
-                index: index,
-                tableLength: tableLength,
-                name: name,
-                namePath: namePath,
-                selectedRows: selectedRows
+                form,
+                index,
+                tableLength,
+                name,
+                namePath,
+                selectedRows
               });
             case 21:
               result = _context.sent;
@@ -135,11 +134,11 @@ var getActionColumn = function getActionColumn(config) {
               if (result !== false && type !== 'custom') {
                 actionHandler = actions[type];
                 actionHandler(_objectSpread(_objectSpread({}, config), {}, {
-                  rowName: [].concat(_toConsumableArray(name), [index]),
+                  rowName: [...name, index],
                   virtualRowName: rowName,
-                  record: record,
-                  result: result,
-                  validateKeys: validateKeys
+                  record,
+                  result,
+                  validateKeys
                 }));
               }
             case 23:
@@ -160,24 +159,24 @@ var getActionColumn = function getActionColumn(config) {
     key: 'action',
     fixed: 'right',
     width: actionWidth || (actionDirection === 'vertical' ? 60 : virtualKey ? 120 : 60),
-    render: function render(text, record, index) {
+    render: (text, record, index) => {
       var _rowDisabled;
       var _disabled = (_rowDisabled = rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled(record)) !== null && _rowDisabled !== void 0 ? _rowDisabled : false;
       if (_disabled) {
         return '';
       }
-      return /*#__PURE__*/_jsx(Space, {
+      return /*#__PURE__*/_jsx(_Space, {
         size: "small",
         direction: actionDirection,
-        children: actionBtns.map(function (btnConfig) {
+        children: actionBtns.map(btnConfig => {
           return /*#__PURE__*/_jsx(React.Fragment, {
             children: /*#__PURE__*/_jsx(ActionButton, {
-              record: record,
-              index: index,
-              config: config,
-              btnConfig: btnConfig
+              record,
+              index,
+              config,
+              btnConfig
             })
-          }, "".concat(record.rowKey, "-").concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type));
+          }, `${record.rowKey}-${btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type}`);
         })
       });
     }
@@ -211,7 +210,7 @@ export var transformColumns = function transformColumns() {
   var nextColumns = cloneDeepFilterNode(columns);
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);
-  nextColumns.forEach(function (item, index) {
+  nextColumns.forEach((item, index) => {
     var label = item.label,
       names = item.names,
       labelRequired = item.labelRequired,
@@ -238,7 +237,7 @@ export var transformColumns = function transformColumns() {
           resetProps = _objectWithoutProperties(_ref3, _excluded2);
         item.title = /*#__PURE__*/_jsxs("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
-          children: [before, columnTitle, /*#__PURE__*/_jsx(Tooltip, _objectSpread(_objectSpread({
+          children: [before, columnTitle, /*#__PURE__*/_jsx(_Tooltip, _objectSpread(_objectSpread({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
             children: icon ? ( /*#__PURE__*/React.cloneElement(icon, {
@@ -272,27 +271,28 @@ export var transformColumns = function transformColumns() {
     if (isFunction(item.required)) {
       var namePath = getNamePath(name, virtualKey);
       var namePathArray = Array.isArray(namePath) ? namePath : [namePath];
-      var rowData = form.getFieldValue([].concat(_toConsumableArray(namePathArray), [index])) || {};
+      var rowData = form.getFieldValue([...namePathArray, index]) || {};
       required = item.required(rowData[columnName], rowData, {
-        form: form,
-        index: index,
-        namePath: [].concat(_toConsumableArray(namePathArray), [index])
+        form,
+        index,
+        namePath: [...namePathArray, index]
       });
     }
 
     // 样式处理
-    item.className = classnames(_defineProperty({
+    item.className = classnames({
       'is-hidden': hidden,
       'is-required': required || labelRequired,
       'is-required-left': requiredAlign === 'left',
-      'is-required-right': requiredAlign === 'right'
-    }, className, className));
+      'is-required-right': requiredAlign === 'right',
+      [className]: className
+    });
 
     // 防止重复渲染导致className重复添加
     if (item.className) {
-      item.className = _toConsumableArray(new Set(item.className.split(' '))).join(' ');
+      item.className = [...new Set(item.className.split(' '))].join(' ');
     }
-    var _render = function _render(text, record, index) {
+    var _render = (text, record, index) => {
       var _isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record._addFlag;
       var namePath = isArray(name) ? name : [name];
       if (virtualKey && editingKeys.includes(record.rowKey)) {
@@ -302,7 +302,7 @@ export var transformColumns = function transformColumns() {
       var columnNamePath = isArray(columnName) ? columnName : [columnName];
       index = tools.calc(firstIndex, '+', index);
       // 设置单元格formItem的namePath
-      var cellName = columnName ? [].concat(_toConsumableArray(namePathArray), [index], _toConsumableArray(columnNamePath)) : [].concat(_toConsumableArray(namePathArray), [index]);
+      var cellName = columnName ? [...namePathArray, index, ...columnNamePath] : [...namePathArray, index];
       var _text = text;
 
       // 当传入组合组件时，name需要重新组合一下，以防names中key与dataIndex重叠
@@ -310,11 +310,9 @@ export var transformColumns = function transformColumns() {
         var nextDataIndex = splitNames(names);
         item.dataIndex = nextDataIndex;
         item.key = nextDataIndex;
-        cellName = [].concat(_toConsumableArray(namePathArray), [index, nextDataIndex]);
+        cellName = [...namePathArray, index, nextDataIndex];
         // 给names返回数组值
-        _text = names.map(function (item) {
-          return record === null || record === void 0 ? void 0 : record[item];
-        });
+        _text = names.map(item => record === null || record === void 0 ? void 0 : record[item]);
       }
       if (!_isEditing && ellipsis) {
         return /*#__PURE__*/_jsx(ProTooltip, {
@@ -324,7 +322,7 @@ export var transformColumns = function transformColumns() {
         });
       }
       var cellClassName;
-      var isCanEdit = isCell && !record["".concat(columnName, "-Disabled")] && item.isEditable !== false;
+      var isCanEdit = isCell && !record[`${columnName}-Disabled`] && item.isEditable !== false;
       // 单元格编辑场景下，需要将所有单元格设置为不可编辑状态，当鼠标hover时，展示输出框。点击可修改
       if (isCanEdit) {
         record['is-view'] = true;
@@ -337,7 +335,7 @@ export var transformColumns = function transformColumns() {
       // 单行多行交互有较大差异
       return /*#__PURE__*/_jsxs("div", {
         className: cellClassName,
-        onClick: function onClick() {
+        onClick: () => {
           isCanEdit && setState({
             cellNamePath: cellName
           });
@@ -355,9 +353,9 @@ export var transformColumns = function transformColumns() {
           index: index,
           column: item,
           config: _objectSpread(_objectSpread({}, config), {}, {
-            cellName: cellName,
+            cellName,
             // 单元格formItem的namePath
-            _isEditing: _isEditing // 是否正在编辑
+            _isEditing // 是否正在编辑
           })
         })]
       });
@@ -366,13 +364,9 @@ export var transformColumns = function transformColumns() {
   });
   if (disabled || isView) {
     // 查看模式下过滤操作栏
-    nextColumns = nextColumns.filter(function (item) {
-      return item.title !== locale.ProEditTable.operation;
-    });
+    nextColumns = nextColumns.filter(item => item.title !== locale.ProEditTable.operation);
   } else {
-    var validateKeys = nextColumns.filter(function (i) {
-      return i.rules || i.required;
-    }).map(function (item) {
+    var validateKeys = nextColumns.filter(i => i.rules || i.required).map(item => {
       var _item$names;
       if ((_item$names = item.names) !== null && _item$names !== void 0 && _item$names.length) {
         var nextDataIndex = splitNames(item.names);
@@ -382,7 +376,7 @@ export var transformColumns = function transformColumns() {
       return item.dataIndex || item.key;
     });
     var actionColumn = getActionColumn(_objectSpread(_objectSpread({}, config), {}, {
-      validateKeys: validateKeys // 需要校验的单元格的formItem的name
+      validateKeys // 需要校验的单元格的formItem的name
     }));
     actionColumn && nextColumns.push(actionColumn);
   }