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

package/lib/ProEditTable/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-edit-table {
   td[rowspan]{
@@ -382,14 +382,10 @@
         display: flex;
         align-items: center;
         padding: 0 var(--zaui-space-size-xs, 4px);
-
+        gap: 4px;
         &:first-child {
           padding-left: 0;
         }
-
-        span:nth-child(2) {
-          margin-left: var(--zaui-space-size-xs, 4px);
-        }
       }
     }
   }

package/lib/ProEditTable/utils/config.js

@@ -5,19 +5,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.iconMap = exports.defaultToolbarKeys = exports.defaultSingleActionKeys = exports.defaultMultipleActionKeys = exports.defaultEditingActionKeys = exports.defaultBtnNameMap = exports.actions = void 0;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-require("antd/es/message/style");
-var _message2 = _interopRequireDefault(require("antd/es/message"));
 var _set2 = _interopRequireDefault(require("lodash/set"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _icons = require("@ant-design/icons");
 var _utils = require("@zat-design/utils");
+var _antd = require("antd");
 var _tools = require("./tools");
 var _locale = _interopRequireDefault(require("../../locale"));
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
 var defaultBtnNameMap = exports.defaultBtnNameMap = {
   add: _locale.default.ProEditTable.add,
   edit: _locale.default.ProEditTable.edit,
@@ -52,7 +52,7 @@ var actions = exports.actions = {
       onlyOneLineMsg = _ref.onlyOneLineMsg;
     // 单行编辑时，需要先保存，才能进行下面的编辑
     if (virtualKey && editingKeys.length >= 1) {
-      _message2.default.warning(onlyOneLineMsg);
+      _antd.message.warning(onlyOneLineMsg);
       return false;
     }
     var nextEditingKeys = (0, _toConsumableArray2.default)(editingKeys);
@@ -71,10 +71,10 @@ var actions = exports.actions = {
     });
   },
   save: function () {
-    var _save = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref2) {
+    var _save = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee(_ref2) {
       var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             record = _ref2.record, editingKeys = _ref2.editingKeys, setState = _ref2.setState, form = _ref2.form, rowName = _ref2.rowName, virtualRowName = _ref2.virtualRowName, result = _ref2.result;
             // 保存返回数据与当前行内数据做合并
@@ -97,9 +97,8 @@ var actions = exports.actions = {
             setState({
               editingKeys: nextEditingKeys
             });
-          case 10:
-          case "end":
-            return _context.stop();
+          case 1:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -153,7 +152,7 @@ var actions = exports.actions = {
       onlyOneLineMsg = _ref4.onlyOneLineMsg;
     // 单行编辑时，需要先保存，才能进行下面的编辑
     if (virtualKey && editingKeys.length >= 1) {
-      _message2.default.warning(onlyOneLineMsg);
+      _antd.message.warning(onlyOneLineMsg);
       return false;
     }
     // 删除当前行数据
@@ -174,21 +173,21 @@ var actions = exports.actions = {
     }
   },
   add: function () {
-    var _add = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(_ref5) {
-      var _tableRef$current$que, _tableRef$current$que2;
+    var _add = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee4(_ref5) {
+      var _tableRef$current, _tableRef$current$chi, _tableRef$current$chi2, _tableRef$current$chi3;
       var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, page, handlePageChange, nextData, rowKey, addData, nextPageNum, nextEditingKeys;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regenerator().w(function (_context4) {
+        while (1) switch (_context4.n) {
           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 = (0, _toConsumableArray2.default)(form.getFieldValue(name) || []); // 单行编辑时，需要先保存，才能进行下面的编辑
             if (!(virtualKey && editingKeys.length >= 1)) {
-              _context4.next = 5;
+              _context4.n = 1;
               break;
             }
-            _message2.default.warning(onlyOneLineMsg);
-            return _context4.abrupt("return", false);
-          case 5:
+            _antd.message.warning(onlyOneLineMsg);
+            return _context4.a(2, false);
+          case 1:
             rowKey = (0, _tools.getRandom)(); // 添加新增对象数据
             addData = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _typeof2.default)(result) === 'object' ? result : {}), {}, {
               rowKey: rowKey
@@ -199,28 +198,26 @@ var actions = exports.actions = {
             }
             if (insertType === 'before') {
               nextData.unshift(addData);
-              setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
-                return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-                  while (1) switch (_context2.prev = _context2.next) {
+              setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee2() {
+                return _regenerator().w(function (_context2) {
+                  while (1) switch (_context2.n) {
                     case 0:
                       handlePageChange(1, page.pageSize);
                     case 1:
-                    case "end":
-                      return _context2.stop();
+                      return _context2.a(2);
                   }
                 }, _callee2);
               })), 0);
             } else {
               nextData.push(addData);
               nextPageNum = Math.ceil(_utils.tools.calc(nextData.length, '/', page.pageSize));
-              setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
-                return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
-                  while (1) switch (_context3.prev = _context3.next) {
+              setTimeout(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee3() {
+                return _regenerator().w(function (_context3) {
+                  while (1) switch (_context3.n) {
                     case 0:
                       handlePageChange(nextPageNum, page.pageSize);
                     case 1:
-                    case "end":
-                      return _context3.stop();
+                      return _context3.a(2);
                   }
                 }, _callee3);
               })), 0);
@@ -235,19 +232,18 @@ var actions = exports.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 ? void 0 : (_tableRef$current$chi = _tableRef$current.children[0]) === null || _tableRef$current$chi === void 0 ? void 0 : (_tableRef$current$chi2 = _tableRef$current$chi.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current$chi2 === void 0 ? void 0 : (_tableRef$current$chi3 = _tableRef$current$chi2.scrollTo) === null || _tableRef$current$chi3 === void 0 ? void 0 : _tableRef$current$chi3.call(_tableRef$current$chi2, {
               top: insertType === 'before' ? -10000 : 10000,
               behavior: 'smooth'
             });
             if (!virtualKey) {
-              _context4.next = 15;
+              _context4.n = 2;
               break;
             }
-            _context4.next = 15;
+            _context4.n = 2;
             return form.validateFields([name]);
-          case 15:
-          case "end":
-            return _context4.stop();
+          case 2:
+            return _context4.a(2);
         }
       }, _callee4);
     }));

package/lib/ProEditTable/utils/index.js

@@ -6,21 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.transformColumns = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-require("antd/es/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
 var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
 var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
 var _cloneDeepWith3 = _interopRequireDefault(require("lodash/cloneDeepWith"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
+var _antd = require("antd");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _reactSvg = require("react-svg");
 var _utils = require("@zat-design/utils");
@@ -32,6 +29,8 @@ var _tip = _interopRequireDefault(require("../../assets/tip.svg"));
 var _locale = _interopRequireDefault(require("../../locale"));
 var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
   _excluded2 = ["title", "icon"];
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
 // 渲染操作栏
 var getActionColumn = function getActionColumn(config) {
   var _cloneDeepWith2 = (0, _cloneDeepWith3.default)(config, function (value) {
@@ -92,43 +91,43 @@ 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 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, _ref) {
+      var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee(record, _ref) {
         var _form$getFieldValue;
-        var index, form, name, namePath, tableLength, selectedRows, rowName, _record, onEvent, result;
-        return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        var index, form, name, namePath, tableLength, selectedRows, rowName, _record, onEvent, result, actionHandler, _t;
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.p = _context.n) {
             case 0:
               index = _ref.index, form = _ref.form, name = _ref.name, namePath = _ref.namePath, tableLength = _ref.tableLength, selectedRows = _ref.selectedRows;
               index = _utils.tools.calc(firstIndex, '+', index);
               rowName = [].concat((0, _toConsumableArray2.default)(virtualRowName), [index]);
               if (!(type === 'save')) {
-                _context.next = 13;
+                _context.n = 4;
                 break;
               }
-              _context.prev = 4;
-              _context.next = 7;
+              _context.p = 1;
+              _context.n = 2;
               return (0, _tools.customValidate)(validateKeys, form, rowName);
-            case 7:
-              _context.next = 13;
+            case 2:
+              _context.n = 4;
               break;
-            case 9:
-              _context.prev = 9;
-              _context.t0 = _context["catch"](4);
+            case 3:
+              _context.p = 3;
+              _t = _context.v;
               (0, _tools.handleScrollToError)();
-              return _context.abrupt("return", Promise.reject(_context.t0));
-            case 13:
+              return _context.a(2, Promise.reject(_t));
+            case 4:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
               if (onEvent) {
-                _context.next = 19;
+                _context.n = 5;
                 break;
               }
               result = true;
-              _context.next = 22;
+              _context.n = 7;
               break;
-            case 19:
-              _context.next = 21;
+            case 5:
+              _context.n = 6;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, {
                 form: form,
                 index: index,
@@ -137,11 +136,12 @@ var getActionColumn = function getActionColumn(config) {
                 namePath: namePath,
                 selectedRows: selectedRows
               });
-            case 21:
-              result = _context.sent;
-            case 22:
+            case 6:
+              result = _context.v;
+            case 7:
               if (result !== false && type !== 'custom') {
-                _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
+                actionHandler = _config.actions[type];
+                actionHandler((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   rowName: [].concat((0, _toConsumableArray2.default)(name), [index]),
                   virtualRowName: rowName,
                   record: record,
@@ -149,11 +149,10 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 23:
-            case "end":
-              return _context.stop();
+            case 8:
+              return _context.a(2);
           }
-        }, _callee, null, [[4, 9]]);
+        }, _callee, null, [[1, 3]]);
       }));
       return function (_x, _x2) {
         return _ref2.apply(this, arguments);
@@ -166,14 +165,14 @@ var getActionColumn = function getActionColumn(config) {
     title: _locale.default.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 (0, _jsxRuntime.jsx)(_space.default, {
+      return (0, _jsxRuntime.jsx)(_antd.Space, {
         size: "small",
         direction: actionDirection,
         children: actionBtns.map(function (btnConfig) {
@@ -213,10 +212,10 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
-  var _columns = (0, _tools.cloneDeepFilterNode)(columns);
+  var nextColumns = (0, _tools.cloneDeepFilterNode)(columns);
   var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
   var firstIndex = _utils.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,
@@ -242,7 +241,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
           resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
         item.title = (0, _jsxRuntime.jsxs)("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
-          children: [before, columnTitle, (0, _jsxRuntime.jsx)(_tooltip.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+          children: [before, columnTitle, (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
             children: icon ? (/*#__PURE__*/_react.default.cloneElement(icon, {
@@ -260,13 +259,17 @@ var transformColumns = exports.transformColumns = function transformColumns() {
         });
       }
     }
+    // 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 = (0, _isBoolean2.default)(item.required) ? item.required : false;
-    if (typeof item.required === 'function') {
+    if ((0, _isFunction2.default)(item.required)) {
       var namePath = (0, _tools.getNamePath)(name, virtualKey);
       var namePathArray = Array.isArray(namePath) ? namePath : [namePath];
       var rowData = form.getFieldValue([].concat((0, _toConsumableArray2.default)(namePathArray), [index])) || {};
@@ -358,11 +361,11 @@ var transformColumns = exports.transformColumns = function transformColumns() {
   });
   if (disabled || isView) {
     // 查看模式下过滤操作栏
-    _columns = _columns.filter(function (item) {
+    nextColumns = nextColumns.filter(function (item) {
       return item.title !== _locale.default.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;
@@ -376,8 +379,8 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     var actionColumn = getActionColumn((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
       validateKeys: validateKeys // 需要校验的单元格的formItem的name
     }));
-    actionColumn && _columns.push(actionColumn);
+    actionColumn && nextColumns.push(actionColumn);
   }
   // 渲染操作列
-  return _columns;
+  return nextColumns;
 };