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

package/es/ProEditTable/utils/config.js

@@ -3,14 +3,13 @@ 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 _set from "lodash/set";
-import { jsx as _jsx } from "react/jsx-runtime";
 import { PlusOutlined } from '@ant-design/icons';
 import { tools } from '@zat-design/utils';
-import { onDelete, getRandom } from './tools';
-import locale from '../../locale';
+import { message } from 'antd';
+import { set } from 'lodash';
+import { onDelete, getRandom } from "./tools";
+import locale from "../../locale";
+import { jsx as _jsx } from "react/jsx-runtime";
 export var defaultBtnNameMap = {
   add: locale.ProEditTable.add,
   edit: locale.ProEditTable.edit,
@@ -21,10 +20,12 @@ export var defaultBtnNameMap = {
   cancel: locale.ProEditTable.cancel,
   custom: locale.ProEditTable.custom
 };
+
 // 默认按钮配置
 export var iconMap = {
-  add: _jsx(PlusOutlined, {})
+  add: /*#__PURE__*/_jsx(PlusOutlined, {})
 };
+
 // 单行编辑 操作栏默认配置按钮
 export var defaultSingleActionKeys = ['edit', 'delete', 'save', 'cancel'];
 // 多行编辑 操作栏默认配置按钮
@@ -33,6 +34,7 @@ export var defaultMultipleActionKeys = ['delete'];
 export var defaultEditingActionKeys = ['save', 'cancel'];
 // 工具栏默认配置按钮
 export var defaultToolbarKeys = ['add', 'mulDelete'];
+
 // 操作枚举
 export var actions = {
   edit: function edit(_ref) {
@@ -45,14 +47,14 @@ export var actions = {
       onlyOneLineMsg = _ref.onlyOneLineMsg;
     // 单行编辑时，需要先保存，才能进行下面的编辑
     if (virtualKey && editingKeys.length >= 1) {
-      _message.warning(onlyOneLineMsg);
+      message.warning(onlyOneLineMsg);
       return false;
     }
     var nextEditingKeys = _toConsumableArray(editingKeys);
     // 开启编辑状态
     nextEditingKeys.push(record.rowKey);
     // 编辑时赋值编辑状态，供validator做保存校验
-    if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
+    if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
       record._isEditing = true;
     } else {
       delete record._isEditing;
@@ -64,7 +66,7 @@ export var actions = {
     });
   },
   save: function () {
-    var _save = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
+    var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -78,14 +80,14 @@ export var actions = {
             nextEditingKeys = editingKeys.filter(function (key) {
               return key !== record.rowKey;
             }); // 保存后取消编辑状态，供validator做保存校验
-            if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
+            if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
               record._isEditing = true;
             } else {
               delete record._isEditing;
             }
             // 防止value引用不变, 值不更新 - (自定义组件)
             values = form.getFieldsValue();
-            _set(values, rowName, record);
+            set(values, rowName, record);
             form.setFieldsValue(values);
             setState({
               editingKeys: nextEditingKeys
@@ -113,7 +115,7 @@ export var actions = {
       return key !== record.rowKey;
     });
     // 保存后取消编辑状态，供validator做保存校验
-    if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
+    if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
       record._isEditing = true;
     } else {
       delete record._isEditing;
@@ -132,7 +134,7 @@ export var actions = {
     } else {
       // 防止value引用不变, 值不更新 - (自定义组件)
       var values = form.getFieldsValue();
-      _set(values, virtualRowName, record);
+      set(values, virtualRowName, record);
       form.setFieldsValue(values);
     }
   },
@@ -146,7 +148,7 @@ export var actions = {
       onlyOneLineMsg = _ref4.onlyOneLineMsg;
     // 单行编辑时，需要先保存，才能进行下面的编辑
     if (virtualKey && editingKeys.length >= 1) {
-      _message.warning(onlyOneLineMsg);
+      message.warning(onlyOneLineMsg);
       return false;
     }
     // 删除当前行数据
@@ -167,8 +169,8 @@ export var actions = {
     }
   },
   add: function () {
-    var _add = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
-      var _tableRef$current$que, _tableRef$current$que2;
+    var _add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
+      var _tableRef$current, _tableRef$current$scr;
       var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, page, handlePageChange, nextData, rowKey, addData, nextPageNum, nextEditingKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -179,7 +181,7 @@ export var actions = {
               _context4.next = 5;
               break;
             }
-            _message.warning(onlyOneLineMsg);
+            message.warning(onlyOneLineMsg);
             return _context4.abrupt("return", false);
           case 5:
             rowKey = getRandom(); // 添加新增对象数据
@@ -192,7 +194,7 @@ export var actions = {
             }
             if (insertType === 'before') {
               nextData.unshift(addData);
-              setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+              setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                   while (1) switch (_context2.prev = _context2.next) {
                     case 0:
@@ -206,7 +208,7 @@ export var actions = {
             } else {
               nextData.push(addData);
               nextPageNum = Math.ceil(tools.calc(nextData.length, '/', page.pageSize));
-              setTimeout(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+              setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
                 return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                   while (1) switch (_context3.prev = _context3.next) {
                     case 0:
@@ -218,6 +220,7 @@ export var actions = {
                 }, _callee3);
               })), 0);
             }
+
             // 当单选情况下，存储正在编辑值
             if (virtualKey) {
               nextEditingKeys = _toConsumableArray(editingKeys); // 开启编辑状态
@@ -228,7 +231,7 @@ export var actions = {
               });
             }
             form.setFieldValue(name, nextData);
-            (_tableRef$current$que = tableRef.current.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current$que === void 0 ? void 0 : (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 ? void 0 : _tableRef$current$que2.call(_tableRef$current$que, {
+            (_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, {
               top: insertType === 'before' ? -10000 : 10000,
               behavior: 'smooth'
             });

package/es/ProEditTable/utils/diffOriginal.js

@@ -1,12 +1,11 @@
-import _isObject from "lodash/isObject";
-import _isFunction from "lodash/isFunction";
-import _isEqual from "lodash/isEqual";
+import { isEqual, isFunction, isObject } from 'lodash';
 import { validate } from '@zat-design/utils';
 var isEmpty = validate.isEmpty;
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
 var filterObject = function filterObject(data) {
-  if (!_isObject(data) || data === null) return data;
+  if (!isObject(data) || data === null) return data;
+
   // ['1', undefined] ['1', ''] 视为相等
   if (Array.isArray(data)) {
     // 数组中全是empty值的话 视为null
@@ -26,6 +25,7 @@ var filterObject = function filterObject(data) {
       resData[key] = data[key];
     }
   });
+
   // 空对象视为null 比较时 null undefined {} [] '' 视为相等
   if (!Object.keys(resData).length) return null;
   return resData;
@@ -38,7 +38,7 @@ export var diffOriginal = function diffOriginal(params) {
     record = params.record,
     index = params.index;
   // 支持传入自定义比较事件
-  if (_isFunction(onDiff)) {
+  if (isFunction(onDiff)) {
     var diffRes = onDiff({
       originValue: originalValue,
       originRecord: originRecord,
@@ -58,9 +58,11 @@ export var diffOriginal = function diffOriginal(params) {
   var _originalValue = filterObject(originalValue);
   var isEmptyVal = isEmpty(_value);
   var isEmptyOrg = isEmpty(_originalValue);
+
   // 都为空视为相等
   if (isEmptyOrg && isEmptyVal) return 'same';
+
   // 如果原始值为空 且当前有值的话 视为新增
   if (isEmptyOrg && !isEmptyVal) return 'add';
-  return _isEqual(_value, _originalValue) ? 'same' : 'changed';
+  return isEqual(_value, _originalValue) ? 'same' : 'changed';
 };

package/es/ProEditTable/utils/getDefaultProps.js

@@ -1,6 +1,5 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _isEqual from "lodash/isEqual";
-import _get from "lodash/get";
+import { get, isEqual } from 'lodash';
 var defaultPropsMap = {
   ProSelect: function ProSelect(props) {
     var fieldProps = props.fieldProps,
@@ -9,18 +8,19 @@ var defaultPropsMap = {
     var _ref = fieldProps || {},
       filterInList = _ref.filterInList;
     var defaultProps = {};
+
     // formList场景传入列表过滤时
     if (filterInList && namePath && name) {
       var _namePath = _toConsumableArray(namePath).splice(2, namePath.length - 1);
       defaultProps.shouldUpdate = function (preValues, curValues) {
-        var _get2, _get2$map, _get3, _get3$map;
-        var preListValue = (_get2 = _get(preValues, name)) === null || _get2 === void 0 ? void 0 : (_get2$map = _get2.map) === null || _get2$map === void 0 ? void 0 : _get2$map.call(_get2, function (item) {
-          return _get(item, _namePath);
+        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) {
+          return get(item, _namePath);
         });
-        var curListValue = (_get3 = _get(curValues, name)) === null || _get3 === void 0 ? void 0 : (_get3$map = _get3.map) === null || _get3$map === void 0 ? void 0 : _get3$map.call(_get3, function (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) {
+          return get(item, _namePath);
         });
-        return !_isEqual(preListValue, curListValue);
+        return !isEqual(preListValue, curListValue);
       };
     }
     return defaultProps;

package/es/ProEditTable/utils/index.js

@@ -1,47 +1,43 @@
 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";
-import _isEqual from "lodash/isEqual";
-import _isBoolean from "lodash/isBoolean";
-import _isArray from "lodash/isArray";
-import _cloneDeepWith from "lodash/cloneDeepWith";
 var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
   _excluded2 = ["title", "icon"];
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 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';
-import { actions, defaultBtnNameMap, defaultSingleActionKeys, defaultMultipleActionKeys, defaultEditingActionKeys } from './config';
-import { customValidate, getNamePath, splitNames, handleScrollToError, cloneDeepFilterNode } from './tools';
-import ProTooltip from '../../ProTooltip';
-import { RenderField, ActionButton } from '../components';
-import tipSvg from '../../assets/tip.svg';
-import locale from '../../locale';
+import { actions, defaultBtnNameMap, defaultSingleActionKeys, defaultMultipleActionKeys, defaultEditingActionKeys } from "./config";
+import { customValidate, getNamePath, splitNames, handleScrollToError, cloneDeepFilterNode } from "./tools";
+import ProTooltip from "../../ProTooltip";
+import { RenderField, ActionButton } from "../components";
+import tipSvg from "../../assets/tip.svg";
+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 _cloneDeepWith2 = _cloneDeepWith(config, function (value) {
-      if (/*#__PURE__*/React.isValidElement(value)) {
+  var _cloneDeepWith = cloneDeepWith(config, function (value) {
+      if ( /*#__PURE__*/React.isValidElement(value)) {
         return value;
       }
     }),
-    disabled = _cloneDeepWith2.disabled,
-    name = _cloneDeepWith2.name,
-    form = _cloneDeepWith2.form,
-    virtualKey = _cloneDeepWith2.virtualKey,
-    validateKeys = _cloneDeepWith2.validateKeys,
-    actionWidth = _cloneDeepWith2.actionWidth,
-    actionProps = _cloneDeepWith2.actionProps,
-    page = _cloneDeepWith2.page,
-    rowDisabled = _cloneDeepWith2.rowDisabled,
-    actionDirection = _cloneDeepWith2.actionDirection;
+    disabled = _cloneDeepWith.disabled,
+    name = _cloneDeepWith.name,
+    form = _cloneDeepWith.form,
+    virtualKey = _cloneDeepWith.virtualKey,
+    validateKeys = _cloneDeepWith.validateKeys,
+    actionWidth = _cloneDeepWith.actionWidth,
+    actionProps = _cloneDeepWith.actionProps,
+    page = _cloneDeepWith.page,
+    rowDisabled = _cloneDeepWith.rowDisabled,
+    actionDirection = _cloneDeepWith.actionDirection;
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);
   // actionProps配置为false 默认不插入
@@ -49,11 +45,13 @@ var getActionColumn = function getActionColumn(config) {
     return false;
   }
   var virtualRowName = getNamePath(name, virtualKey);
+
   // 设置默认操作栏按钮（区分单行与多行编辑场景）
   var defaultActionKeys = virtualKey ? defaultSingleActionKeys : defaultMultipleActionKeys;
   var nextActionsProps = _toConsumableArray(actionProps);
+
   // 不设置actionProps
-  if (_isArray(actionProps) && !(actionProps === null || actionProps === void 0 ? void 0 : actionProps.length)) {
+  if (isArray(actionProps) && !(actionProps !== null && actionProps !== void 0 && actionProps.length)) {
     nextActionsProps = defaultActionKeys.map(function (key) {
       return {
         type: key
@@ -62,7 +60,7 @@ var getActionColumn = function getActionColumn(config) {
   } else {
     // 设置部分actionProps 内置的必选按钮会集成进去，可以手动开启show: false来隐藏对应类型的按钮
     defaultActionKeys.forEach(function (key) {
-      if (_isArray(actionProps) && !actionProps.find(function (action) {
+      if (isArray(actionProps) && !actionProps.find(function (action) {
         return action.type === key;
       })) {
         nextActionsProps.push({
@@ -71,6 +69,7 @@ var getActionColumn = function getActionColumn(config) {
       }
     });
   }
+
   // 渲染操作按钮前处理下默认数据
   var actionBtns = nextActionsProps.map(function (action) {
     var type = action.type,
@@ -85,9 +84,9 @@ var getActionColumn = function getActionColumn(config) {
     action.show = show !== null && show !== void 0 ? show : true;
     action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     action.onEvent = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, _ref) {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, _ref) {
         var _form$getFieldValue;
-        var index, form, name, namePath, tableLength, selectedRows, rowName, _record, onEvent, result;
+        var index, form, name, namePath, tableLength, selectedRows, rowName, _record, onEvent, result, actionHandler;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -134,7 +133,8 @@ var getActionColumn = function getActionColumn(config) {
               result = _context.sent;
             case 22:
               if (result !== false && type !== 'custom') {
-                actions[type](_objectSpread(_objectSpread({}, config), {}, {
+                actionHandler = actions[type];
+                actionHandler(_objectSpread(_objectSpread({}, config), {}, {
                   rowName: [].concat(_toConsumableArray(name), [index]),
                   virtualRowName: rowName,
                   record: record,
@@ -159,30 +159,31 @@ var getActionColumn = function getActionColumn(config) {
     title: locale.ProEditTable.operation,
     key: 'action',
     fixed: 'right',
-    width: actionWidth || (actionDirection === 'vertical' ? '60px' : virtualKey ? '120px' : '60px'),
+    width: actionWidth || (actionDirection === 'vertical' ? 60 : virtualKey ? 120 : 60),
     render: function 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 _jsx(_Space, {
+      return /*#__PURE__*/_jsx(Space, {
         size: "small",
         direction: actionDirection,
         children: actionBtns.map(function (btnConfig) {
-          return _jsx(React.Fragment, {
-            children: _jsx(ActionButton, _objectSpread({}, {
+          return /*#__PURE__*/_jsx(React.Fragment, {
+            children: /*#__PURE__*/_jsx(ActionButton, {
               record: record,
               index: index,
               config: config,
               btnConfig: btnConfig
-            }))
+            })
           }, "".concat(record.rowKey, "-").concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type));
         })
       });
     }
   };
 };
+
 /**
  * 编辑模式分为 多行和单行两种
  * 单行模式下，render 分为component和viewRender两种，对应编辑和非编辑状态下，edit状态不对外
@@ -191,6 +192,7 @@ var getActionColumn = function getActionColumn(config) {
  * @param columns 表格配置数据
  * @param config
  */
+
 export var transformColumns = function transformColumns() {
   var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var config = arguments.length > 1 ? arguments[1] : undefined;
@@ -206,10 +208,10 @@ export var transformColumns = function transformColumns() {
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
-  var _columns = cloneDeepFilterNode(columns);
+  var nextColumns = cloneDeepFilterNode(columns);
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);
-  _columns.forEach(function (item, index) {
+  nextColumns.forEach(function (item, index) {
     var label = item.label,
       names = item.names,
       labelRequired = item.labelRequired,
@@ -223,6 +225,7 @@ export var transformColumns = function transformColumns() {
       suffix = item.suffix,
       before = item.before,
       after = item.after;
+
     // column设置label时，权重最高
     var columnTitle = label || title;
     item.title = columnTitle;
@@ -233,33 +236,40 @@ export var transformColumns = function transformColumns() {
           tooltipTitle = _ref3.title,
           icon = _ref3.icon,
           resetProps = _objectWithoutProperties(_ref3, _excluded2);
-        item.title = _jsxs("span", {
+        item.title = /*#__PURE__*/_jsxs("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
-          children: [before, columnTitle, _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, {
+            children: icon ? ( /*#__PURE__*/React.cloneElement(icon, {
               className: 'icon-tip'
-            })) : _jsx(ReactSVG, {
+            })) : /*#__PURE__*/_jsx(ReactSVG, {
               className: "icon-tip",
               src: tipSvg
             })
           })), suffix || after]
         });
       } else {
-        item.title = _jsxs("span", {
+        item.title = /*#__PURE__*/_jsxs("span", {
           className: "pro-edit-table-title",
           children: [before, columnTitle, suffix || after]
         });
       }
     }
+
+    // width转为数字，兼容虚拟滚动场景
+    if (typeof item.width === 'string' && item.width.includes('px')) {
+      item.width = parseInt(item.width, 10);
+    }
+
     // column设置name时，权重最高
     var columnName = (item === null || item === void 0 ? void 0 : item.name) || dataIndex || key;
     item.dataIndex = columnName;
     item.key = columnName;
     // item.shouldCellUpdate = item.shouldCellUpdate || ((record, perRecord) => !isEqual(record, perRecord));
-    var required = _isBoolean(item.required) ? item.required : false;
-    if (typeof item.required === 'function') {
+
+    var required = isBoolean(item.required) ? item.required : false;
+    if (isFunction(item.required)) {
       var namePath = getNamePath(name, virtualKey);
       var namePathArray = Array.isArray(namePath) ? namePath : [namePath];
       var rowData = form.getFieldValue([].concat(_toConsumableArray(namePathArray), [index])) || {};
@@ -269,6 +279,7 @@ export var transformColumns = function transformColumns() {
         namePath: [].concat(_toConsumableArray(namePathArray), [index])
       });
     }
+
     // 样式处理
     item.className = classnames(_defineProperty({
       'is-hidden': hidden,
@@ -276,24 +287,26 @@ export var transformColumns = function transformColumns() {
       'is-required-left': requiredAlign === 'left',
       'is-required-right': requiredAlign === 'right'
     }, className, className));
+
     // 防止重复渲染导致className重复添加
     if (item.className) {
       item.className = _toConsumableArray(new Set(item.className.split(' '))).join(' ');
     }
     var _render = function _render(text, record, index) {
       var _isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record._addFlag;
-      var namePath = _isArray(name) ? name : [name];
+      var namePath = isArray(name) ? name : [name];
       if (virtualKey && editingKeys.includes(record.rowKey)) {
         namePath = getNamePath(name, virtualKey);
       }
       var namePathArray = Array.isArray(namePath) ? namePath : [namePath];
-      var columnNamePath = _isArray(columnName) ? columnName : [columnName];
+      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 _text = text;
+
       // 当传入组合组件时，name需要重新组合一下，以防names中key与dataIndex重叠
-      if (names === null || names === void 0 ? void 0 : names.length) {
+      if (names !== null && names !== void 0 && names.length) {
         var nextDataIndex = splitNames(names);
         item.dataIndex = nextDataIndex;
         item.key = nextDataIndex;
@@ -304,7 +317,7 @@ export var transformColumns = function transformColumns() {
         });
       }
       if (!_isEditing && ellipsis) {
-        return _jsx(ProTooltip, {
+        return /*#__PURE__*/_jsx(ProTooltip, {
           text: _text,
           line: 1,
           isResponsiveWidth: true
@@ -317,31 +330,33 @@ export var transformColumns = function transformColumns() {
         record['is-view'] = true;
         // 样式处理
         cellClassName = classnames({
-          'is-cell': !_isEqual(cellNamePath, cellName)
+          'is-cell': !isEqual(cellNamePath, cellName)
         });
       }
+
       // 单行多行交互有较大差异
-      return _jsxs("div", {
+      return /*#__PURE__*/_jsxs("div", {
         className: cellClassName,
         onClick: function onClick() {
           isCanEdit && setState({
             cellNamePath: cellName
           });
         },
-        children: [index === 0 && !item.width ? _jsx("div", {
+        children: [index === 0 && !item.width ? /*#__PURE__*/_jsx("div", {
           style: {
             visibility: 'hidden',
             height: 0,
-            paddingLeft: (item === null || item === void 0 ? void 0 : item.required) ? 16 : 0
+            paddingLeft: item !== null && item !== void 0 && item.required ? 16 : 0
           },
           children: columnTitle
-        }) : null, _jsx(RenderField, {
+        }) : null, /*#__PURE__*/_jsx(RenderField, {
           text: _text,
           record: record,
           index: index,
           column: item,
           config: _objectSpread(_objectSpread({}, config), {}, {
             cellName: cellName,
+            // 单元格formItem的namePath
             _isEditing: _isEditing // 是否正在编辑
           })
         })]
@@ -351,15 +366,15 @@ export var transformColumns = function transformColumns() {
   });
   if (disabled || isView) {
     // 查看模式下过滤操作栏
-    _columns = _columns.filter(function (item) {
+    nextColumns = nextColumns.filter(function (item) {
       return item.title !== locale.ProEditTable.operation;
     });
   } else {
-    var validateKeys = _columns.filter(function (i) {
+    var validateKeys = nextColumns.filter(function (i) {
       return i.rules || i.required;
     }).map(function (item) {
       var _item$names;
-      if ((_item$names = item.names) === null || _item$names === void 0 ? void 0 : _item$names.length) {
+      if ((_item$names = item.names) !== null && _item$names !== void 0 && _item$names.length) {
         var nextDataIndex = splitNames(item.names);
         item.dataIndex = nextDataIndex;
         item.key = nextDataIndex;
@@ -369,8 +384,9 @@ export var transformColumns = function transformColumns() {
     var actionColumn = getActionColumn(_objectSpread(_objectSpread({}, config), {}, {
       validateKeys: validateKeys // 需要校验的单元格的formItem的name
     }));
-    actionColumn && _columns.push(actionColumn);
+    actionColumn && nextColumns.push(actionColumn);
   }
+
   // 渲染操作列
-  return _columns;
+  return nextColumns;
 };