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

package/lib/ProEditTable/components/RenderToolbar/index.js

@@ -5,19 +5,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
+var _antd = require("antd");
 var _config = require("../../utils/config");
 var _ActionButton = _interopRequireDefault(require("../ActionButton"));
 var _tools = require("../../utils/tools");
 var _excluded = ["type", "label", "show", "onHandle", "needConfirm", "onClick"];
+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 RenderToolbar = function RenderToolbar(config) {
   var emptyBtnText = config.emptyBtnText,
@@ -80,22 +80,22 @@ var RenderToolbar = function RenderToolbar(config) {
     toolbar.show = show !== null && show !== void 0 ? show : true;
     toolbar.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     toolbar.onEvent = /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, _ref) {
-        var index, form, name, namePath, tableLength, selectedRows, onEvent, result;
-        return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee(record, _ref) {
+        var index, form, name, namePath, tableLength, selectedRows, onEvent, result, actionHandler;
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
             case 0:
               index = _ref.index, form = _ref.form, name = _ref.name, namePath = _ref.namePath, tableLength = _ref.tableLength, selectedRows = _ref.selectedRows;
               onEvent = onClick || onHandle;
               if (onEvent) {
-                _context.next = 6;
+                _context.n = 1;
                 break;
               }
               result = true;
-              _context.next = 9;
+              _context.n = 3;
               break;
-            case 6:
-              _context.next = 8;
+            case 1:
+              _context.n = 2;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(record, {
                 index: index,
                 form: form,
@@ -104,11 +104,12 @@ var RenderToolbar = function RenderToolbar(config) {
                 tableLength: tableLength,
                 selectedRows: selectedRows
               });
-            case 8:
-              result = _context.sent;
-            case 9:
+            case 2:
+              result = _context.v;
+            case 3:
               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), {}, {
                   index: index,
                   record: record,
                   name: name,
@@ -116,9 +117,8 @@ var RenderToolbar = function RenderToolbar(config) {
                   virtualName: virtualName
                 }));
               }
-            case 10:
-            case "end":
-              return _context.stop();
+            case 4:
+              return _context.a(2);
           }
         }, _callee);
       }));
@@ -141,7 +141,7 @@ var RenderToolbar = function RenderToolbar(config) {
       }, "".concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.label).concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type));
     });
   };
-  return (0, _jsxRuntime.jsx)(_space.default, {
+  return (0, _jsxRuntime.jsx)(_antd.Space, {
     children: renderToolbarBtns()
   });
 };

package/lib/ProEditTable/components/Summary/index.js

@@ -5,12 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-require("antd/es/table/style");
-var _table = _interopRequireDefault(require("antd/es/table"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _utils = require("@zat-design/utils");
 var _utils2 = require("../../../ProUtils/utils");
 var calc = _utils.tools.calc;
@@ -70,17 +67,17 @@ var Summary = function Summary(_ref3) {
   if (!(data === null || data === void 0 ? void 0 : data.length)) {
     return null;
   }
-  return (0, _jsxRuntime.jsx)(_table.default.Summary, {
+  return (0, _jsxRuntime.jsx)(_antd.Table.Summary, {
     fixed: fixed,
-    children: (0, _jsxRuntime.jsx)(_table.default.Summary.Row, {
+    children: (0, _jsxRuntime.jsx)(_antd.Table.Summary.Row, {
       children: nextColumns.map(function (item) {
         var index = item.index,
           colSpan = item.colSpan,
           prefix = item.prefix;
-        return (0, _jsxRuntime.jsx)(_table.default.Summary.Cell, {
+        return (0, _jsxRuntime.jsx)(_antd.Table.Summary.Cell, {
           index: index,
           colSpan: colSpan,
-          children: (0, _jsxRuntime.jsxs)(_space.default, {
+          children: (0, _jsxRuntime.jsxs)(_antd.Space, {
             children: [prefix, (0, _jsxRuntime.jsx)("span", {
               children: renderCell(item)
             })]

package/lib/ProEditTable/components/Validator/index.js

@@ -1,23 +1,19 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/message/style");
-var _message2 = _interopRequireDefault(require("antd/es/message"));
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
+var _antd = require("antd");
 var Validator = function Validator(_ref) {
   var name = _ref.name,
     virtualKey = _ref.virtualKey,
     editingKeys = _ref.editingKeys,
     onlyOneLineMsg = _ref.onlyOneLineMsg;
   return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-    children: name && virtualKey ? (0, _jsxRuntime.jsx)(_form.default.Item, {
+    children: name && virtualKey ? (0, _jsxRuntime.jsx)(_antd.Form.Item, {
       noStyle: true,
       validateFirst: true,
       name: "".concat(name, "-").concat(virtualKey),
@@ -25,7 +21,7 @@ var Validator = function Validator(_ref) {
         // 单行编辑下，校验当前数据是否已保存
         validator: function validator() {
           if (editingKeys === null || editingKeys === void 0 ? void 0 : editingKeys.length) {
-            _message2.default.warning(onlyOneLineMsg);
+            _antd.message.warning(onlyOneLineMsg);
             return Promise.reject();
           }
           return Promise.resolve();

package/lib/ProEditTable/index.js

@@ -6,26 +6,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/affix/style");
-var _affix = _interopRequireDefault(require("antd/es/affix"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-require("antd/es/config-provider/style");
-var _configProvider = _interopRequireDefault(require("antd/es/config-provider"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _set2 = _interopRequireDefault(require("lodash/set"));
+var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
 var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
 var _get2 = _interopRequireDefault(require("lodash/get"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("./utils");
 var _tools = require("./utils/tools");
@@ -34,31 +29,43 @@ var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
 var _RcTable = require("./components/RcTable");
-var _excluded = ["value", "onChange", "onDrag", "onDragEnd", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
+var _excluded = ["value", "onChange", "onDrag", "onDragEnd", "className", "columns", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
+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 ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _resetProps$otherProp;
-  var value = _ref.value,
+  var _ref$value = _ref.value,
+    value = _ref$value === void 0 ? [] : _ref$value,
     onChange = _ref.onChange,
     onDrag = _ref.onDrag,
     onDragEnd = _ref.onDragEnd,
     className = _ref.className,
     columns = _ref.columns,
-    type = _ref.type,
-    mode = _ref.mode,
-    stripe = _ref.stripe,
-    draggable = _ref.draggable,
-    virtual = _ref.virtual,
-    disabled = _ref.disabled,
-    insertType = _ref.insertType,
-    emptyBtnText = _ref.emptyBtnText,
+    _ref$mode = _ref.mode,
+    mode = _ref$mode === void 0 ? 'multiple' : _ref$mode,
+    _ref$stripe = _ref.stripe,
+    stripe = _ref$stripe === void 0 ? true : _ref$stripe,
+    _ref$draggable = _ref.draggable,
+    draggable = _ref$draggable === void 0 ? false : _ref$draggable,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
+    _ref$insertType = _ref.insertType,
+    insertType = _ref$insertType === void 0 ? 'after' : _ref$insertType,
+    _ref$emptyBtnText = _ref.emptyBtnText,
+    emptyBtnText = _ref$emptyBtnText === void 0 ? _locale.default.ProEditTable.clickAdd : _ref$emptyBtnText,
     actionWidth = _ref.actionWidth,
-    actionProps = _ref.actionProps,
-    toolbarProps = _ref.toolbarProps,
+    _ref$actionProps = _ref.actionProps,
+    actionProps = _ref$actionProps === void 0 ? [] : _ref$actionProps,
+    _ref$toolbarProps = _ref.toolbarProps,
+    toolbarProps = _ref$toolbarProps === void 0 ? [] : _ref$toolbarProps,
     toolbarSticky = _ref.toolbarSticky,
     rowSelection = _ref.rowSelection,
-    onlyOneLineMsg = _ref.onlyOneLineMsg,
-    deletePoConfirmMsg = _ref.deletePoConfirmMsg,
-    mulDeletePoConfirmMsg = _ref.mulDeletePoConfirmMsg,
+    _ref$onlyOneLineMsg = _ref.onlyOneLineMsg,
+    onlyOneLineMsg = _ref$onlyOneLineMsg === void 0 ? _locale.default.ProEditTable.onlyOneLineMsg : _ref$onlyOneLineMsg,
+    _ref$deletePoConfirmM = _ref.deletePoConfirmMsg,
+    deletePoConfirmMsg = _ref$deletePoConfirmM === void 0 ? _locale.default.ProEditTable.deletePoConfirmMsg : _ref$deletePoConfirmM,
+    _ref$mulDeletePoConfi = _ref.mulDeletePoConfirmMsg,
+    mulDeletePoConfirmMsg = _ref$mulDeletePoConfi === void 0 ? _locale.default.ProEditTable.mulDeletePoConfirmMsg : _ref$mulDeletePoConfi,
     configRequiredAlign = _ref.requiredAlign,
     summary = _ref.summary,
     max = _ref.max,
@@ -69,11 +76,12 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     rowDraggable = _ref.rowDraggable,
     footerRender = _ref.footerRender,
     scroll = _ref.scroll,
-    actionDirection = _ref.actionDirection,
+    _ref$actionDirection = _ref.actionDirection,
+    actionDirection = _ref$actionDirection === void 0 ? 'horizontal' : _ref$actionDirection,
     diffConfig = _ref.diffConfig,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   // 上下文form
-  var contentForm = _form.default.useFormInstance();
+  var contentForm = _antd.Form.useFormInstance();
   var formFieldProps = _ProForm.default.useFieldProps() || {};
   var affixRef = (0, _react.useRef)(null);
   var form = contentForm || (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.form) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.form);
@@ -89,9 +97,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     disabled = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.disabled) || disabled; // formFieldProps?.disabled可能是函数？？
   }
   var tableRef = (0, _react.useRef)(null);
-  var valueChangeRef = (0, _react.useRef)(0);
-  valueChangeRef.current = 0;
-  var _React$useContext = _react.default.useContext(_configProvider.default.ConfigContext),
+  // const valueChangeRef = useRef<number>(0);
+  // valueChangeRef.current = 0;
+  var _React$useContext = _react.default.useContext(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls;
   var prefixCls = getPrefixCls();
   var _useLocalStorageState = (0, _ahooks.useLocalStorageState)('themeConfig'),
@@ -107,7 +115,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       editingKeys: [],
       selectedRowKeys: [],
       selectedRows: [],
-      virtualKey: type === 'single' || mode === 'single' ? (0, _tools.getRandom)() : '',
+      virtualKey: mode === 'single' ? (0, _tools.getRandom)() : '',
       page: {
         pageNum: 1,
         pageSize: (pagination === null || pagination === void 0 ? void 0 : pagination.pageSize) || 10
@@ -131,14 +139,14 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     'pro-table-no-stripe': !stripe,
     className: className
   });
-  var getRowKey = function getRowKey(record) {
+  var getRowKey = (0, _react.useCallback)(function (record) {
     var key = record.rowKey || (0, _tools.getRandom)();
     if (rowKey) {
       var _ref3;
-      key = (_ref3 = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref3 !== void 0 ? _ref3 : key;
+      key = (_ref3 = (0, _isFunction2.default)(rowKey) ? rowKey(record) : record[rowKey]) !== null && _ref3 !== void 0 ? _ref3 : key;
     }
     return key;
-  };
+  }, [rowKey]);
   var originalValues = (0, _react.useMemo)(function () {
     var _originalArr$every, _originalArr$some;
     var nextOriginalValues;
@@ -163,7 +171,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     }
     return nextOriginalValues;
   }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues]);
-  var getIsNew = function getIsNew(record) {
+  var getIsNew = (0, _react.useCallback)(function (record) {
     var _originalArr$find;
     var originalArr = (0, _get2.default)(originalValues, name);
     if (!(originalArr === null || originalArr === void 0 ? void 0 : originalArr.length)) {
@@ -172,20 +180,21 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return !(originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$find = originalArr.find) === null || _originalArr$find === void 0 ? void 0 : _originalArr$find.call(originalArr, function (item) {
       return getRowKey(item) === getRowKey(record);
     }));
-  };
+  }, [originalValues, name]);
   // 分页变更
   var handlePageChange = (0, _react.useCallback)(/*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(current, pageSize) {
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee(current, pageSize) {
+      var _t;
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.p = _context.n) {
           case 0:
-            _context.prev = 0;
+            _context.p = 0;
             if (!pagination) {
-              _context.next = 8;
+              _context.n = 3;
               break;
             }
             if (!(pageSize !== page.pageSize)) {
-              _context.next = 5;
+              _context.n = 1;
               break;
             }
             setState({
@@ -194,31 +203,30 @@ var ProEditTable = function ProEditTable(_ref, ref) {
                 pageSize: pageSize
               }
             });
-            return _context.abrupt("return");
-          case 5:
-            _context.next = 7;
+            return _context.a(2);
+          case 1:
+            _context.n = 2;
             return form.validateFields([name], {
               recursive: true
             });
-          case 7:
+          case 2:
             setState({
               page: {
                 pageNum: current,
                 pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
               }
             });
-          case 8:
-            _context.next = 13;
+          case 3:
+            _context.n = 5;
             break;
-          case 10:
-            _context.prev = 10;
-            _context.t0 = _context["catch"](0);
+          case 4:
+            _context.p = 4;
+            _t = _context.v;
             (0, _tools.handleScrollToError)();
-          case 13:
-          case "end":
-            return _context.stop();
+          case 5:
+            return _context.a(2);
         }
-      }, _callee, null, [[0, 10]]);
+      }, _callee, null, [[0, 4]]);
     }));
     return function (_x, _x2) {
       return _ref4.apply(this, arguments);
@@ -280,7 +288,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       var addBtnConfig = toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.find(function (item) {
         return item.type === type;
       });
-      if (typeof (addBtnConfig === null || addBtnConfig === void 0 ? void 0 : addBtnConfig.show) === 'function') {
+      if ((0, _isFunction2.default)(addBtnConfig === null || addBtnConfig === void 0 ? void 0 : addBtnConfig.show)) {
         var result = addBtnConfig.show();
         addBtnConfig.show = result;
       }
@@ -294,6 +302,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   var _rowSelection = (0, _objectSpread2.default)({
     fixed: true,
     selectedRowKeys: selectedRowKeys,
+    columnWidth: 48,
     onChange: function onChange(selectedRowKeys, selectedRows) {
       setState({
         selectedRowKeys: selectedRowKeys,
@@ -312,27 +321,29 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     hideSelectAll: isHideCheckBox
   }, rowSelection);
   // 空列表状态
-  var empty = function empty() {
-    var _toolbarProps$filter;
-    return (0, _jsxRuntime.jsxs)("div", {
-      className: "com-empty",
-      children: [(0, _jsxRuntime.jsx)("img", {
-        className: "img",
-        src: _empty.default,
-        alt: "Empty"
-      }), (0, _jsxRuntime.jsx)("div", {
-        className: "content",
-        children: disabled || isForbiddenBtn('add') ? _locale.default.ProEditTable.noData : (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-          children: [_locale.default.ProEditTable.noData, "\uFF0C", (0, _jsxRuntime.jsx)(_components.RenderToolbar, (0, _objectSpread2.default)({}, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
-            toolbarProps: toolbarProps === null || toolbarProps === void 0 ? void 0 : (_toolbarProps$filter = toolbarProps.filter) === null || _toolbarProps$filter === void 0 ? void 0 : _toolbarProps$filter.call(toolbarProps, function (item) {
-              return item.type === 'add' || (item === null || item === void 0 ? void 0 : item.persistence);
-            }),
-            dataSource: []
-          })))]
-        })
-      })]
-    });
-  };
+  var emptyDom = (0, _react.useMemo)(function () {
+    return function () {
+      var _toolbarProps$filter;
+      return (0, _jsxRuntime.jsxs)("div", {
+        className: "com-empty",
+        children: [(0, _jsxRuntime.jsx)("img", {
+          className: "img",
+          src: _empty.default,
+          alt: "Empty"
+        }), (0, _jsxRuntime.jsx)("div", {
+          className: "content",
+          children: disabled || isForbiddenBtn('add') ? _locale.default.ProEditTable.noData : (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+            children: [_locale.default.ProEditTable.noData, "\uFF0C", (0, _jsxRuntime.jsx)(_components.RenderToolbar, (0, _objectSpread2.default)({}, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
+              toolbarProps: toolbarProps === null || toolbarProps === void 0 ? void 0 : (_toolbarProps$filter = toolbarProps.filter) === null || _toolbarProps$filter === void 0 ? void 0 : _toolbarProps$filter.call(toolbarProps, function (item) {
+                return item.type === 'add' || (item === null || item === void 0 ? void 0 : item.persistence);
+              }),
+              dataSource: []
+            })))]
+          })
+        })]
+      });
+    };
+  }, [config, disabled, isForbiddenBtn, toolbarProps]);
   /**
    * 渲染表格选择器
    * @returns rowSelection
@@ -349,23 +360,20 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     }
     return null;
   };
-  (0, _ahooks.useDeepCompareEffect)(function () {
-    valueChangeRef.current += 1;
-    // 在这里根据需要计算新的数组
-  }, [value, config.name]);
   var _columns = (0, _react.useMemo)(function () {
     return (0, _utils.transformColumns)(columns, config);
-  }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath, value === null || value === void 0 ? void 0 : value.length]);
+  }, [disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
   var initDataSource = function initDataSource() {
     var _value$every, _value$some;
+    // 检查每一项是否有 rowKey 或通过 rowKey 字段获取的 key
     var isAllHasKey = value === null || value === void 0 ? void 0 : (_value$every = value.every) === null || _value$every === void 0 ? void 0 : _value$every.call(value, function (item) {
-      return item.rowKey;
+      return item.rowKey || typeof rowKey === 'string' && item[rowKey];
     });
-    // 检测当前rowkey是否与制定key的值是否一致，不一致，则执行覆盖
+    // 检查 rowKey 是否需要覆盖（即当前 rowKey 与 getRowKey 生成的不一致）
     var isNeedCover = value === null || value === void 0 ? void 0 : (_value$some = value.some) === null || _value$some === void 0 ? void 0 : _value$some.call(value, function (item) {
-      return item.rowKey !== getRowKey(item);
+      return item.rowKey !== (getRowKey === null || getRowKey === void 0 ? void 0 : getRowKey(item));
     });
-    // 初始化默认生成row-key
+    // 初始化默认生成 rowKey
     if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover)) {
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
@@ -409,11 +417,11 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       rowSelection: renderRowSelection()
     });
   } : summary;
-  var TableComponent = draggable ? _RcTable.DraggableTable : virtual ? _RcTable.VirtualTable : _RcTable.BaseTable;
+  var TableComponent = draggable ? _RcTable.DraggableTable : _RcTable.BaseTable;
   return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [(0, _jsxRuntime.jsxs)(_configProvider.default, {
-      renderEmpty: (value === null || value === void 0 ? void 0 : value.length) ? undefined : empty,
-      children: [(0, _jsxRuntime.jsx)(TableComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), {}, {
+    children: [(0, _jsxRuntime.jsx)(_antd.ConfigProvider, {
+      renderEmpty: (value === null || value === void 0 ? void 0 : value.length) ? undefined : emptyDom,
+      children: (0, _jsxRuntime.jsx)(TableComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), {}, {
         draggableProps: {
           onChange: onChange,
           onDrag: onDrag,
@@ -421,6 +429,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
           draggable: draggable
         },
         tableProps: {
+          rowKey: rowKey,
           value: value,
           headerRender: headerRender,
           tableRef: tableRef,
@@ -441,36 +450,36 @@ var ProEditTable = function ProEditTable(_ref, ref) {
           locale: _locale.default,
           handlePageChange: handlePageChange
         }
-      })), !isView && (value === null || value === void 0 ? void 0 : value.length) ? toolbarSticky ? (0, _jsxRuntime.jsx)(_affix.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        ref: affixRef
-      }, _toolbarSticky), {}, {
-        children: (0, _jsxRuntime.jsx)("div", {
-          className: "pro-edit-table-toolbar".concat(pagination ? ' pro-edit-table-toolbar-fixed' : ''),
-          children: (0, _jsxRuntime.jsx)(_components.RenderToolbar, (0, _objectSpread2.default)({}, config))
-        })
-      })) : (0, _jsxRuntime.jsx)("div", {
+      }))
+    }), !isView && (value === null || value === void 0 ? void 0 : value.length) ? toolbarSticky ? (0, _jsxRuntime.jsx)(_antd.Affix, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      ref: affixRef
+    }, _toolbarSticky), {}, {
+      children: (0, _jsxRuntime.jsx)("div", {
         className: "pro-edit-table-toolbar".concat(pagination ? ' pro-edit-table-toolbar-fixed' : ''),
         children: (0, _jsxRuntime.jsx)(_components.RenderToolbar, (0, _objectSpread2.default)({}, config))
-      }) : null, footerRender ? (0, _jsxRuntime.jsx)("div", {
-        className: "pro-edit-table-footer",
-        children: footerRender
-      }) : null, pagination ? (0, _jsxRuntime.jsx)("div", {
-        id: "pro-edit-table-pagination-".concat(config.name.join('-')),
-        onClick: function onClick() {
-          (0, _tools.onPageCheck)({
-            form: form,
-            name: name,
-            value: value,
-            columns: columns,
-            page: page,
-            pagination: pagination,
-            isView: isView,
-            disabled: disabled,
-            setState: setState
-          });
-        }
-      }) : null]
-    }), (0, _jsxRuntime.jsx)(_components.Validator, {
+      })
+    })) : (0, _jsxRuntime.jsx)("div", {
+      className: "pro-edit-table-toolbar".concat(pagination ? ' pro-edit-table-toolbar-fixed' : ''),
+      children: (0, _jsxRuntime.jsx)(_components.RenderToolbar, (0, _objectSpread2.default)({}, config))
+    }) : null, footerRender ? (0, _jsxRuntime.jsx)("div", {
+      className: "pro-edit-table-footer",
+      children: footerRender
+    }) : null, pagination ? (0, _jsxRuntime.jsx)("div", {
+      id: "pro-edit-table-pagination-".concat(config.name.join('-')),
+      onClick: function onClick() {
+        (0, _tools.onPageCheck)({
+          form: form,
+          name: name,
+          value: value,
+          columns: columns,
+          page: page,
+          pagination: pagination,
+          isView: isView,
+          disabled: disabled,
+          setState: setState
+        });
+      }
+    }) : null, (0, _jsxRuntime.jsx)(_components.Validator, {
       name: name,
       virtualKey: virtualKey,
       editingKeys: editingKeys,
@@ -479,22 +488,10 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   });
 };
 var ForwardProEditTable = /*#__PURE__*/(0, _react.forwardRef)(ProEditTable);
+// 删除输入就卡顿，需要研究
 ForwardProEditTable.defaultProps = {
-  type: 'multiple',
-  mode: 'multiple',
-  insertType: 'after',
-  actionDirection: 'horizontal',
-  value: [],
   actionProps: [],
-  toolbarProps: [],
-  disabled: false,
-  draggable: false,
-  virtual: false,
-  stripe: true,
-  emptyBtnText: _locale.default.ProEditTable.clickAdd,
-  onlyOneLineMsg: _locale.default.ProEditTable.onlyOneLineMsg,
-  deletePoConfirmMsg: _locale.default.ProEditTable.deletePoConfirmMsg,
-  mulDeletePoConfirmMsg: _locale.default.ProEditTable.mulDeletePoConfirmMsg
+  toolbarProps: []
 };
 // 导出组件
 var _default = exports.default = ForwardProEditTable;

package/lib/ProEditTable/propsType.d.ts

@@ -135,7 +135,7 @@ export type viewRenderFn<T = any> = (text?: any, record?: T, options?: OptionsPr
  * @template Values 值类型
  * @template T 记录类型
  */
-export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemProps<Values>, 'rules' | 'required'>, ColumnType<Values> {
+export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemProps<Values>, 'rules' | 'required' | 'tooltip'>, ColumnType<Values> {
     /** 是否必填 */
     required?: boolean | RequiredFn<T>;
     /** 标签是否必填 */
@@ -259,12 +259,6 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @default multiple
      */
     mode?: ProEditTableMode;
-    /**
-     * 可编辑表格的类型，单行编辑或者多行编辑
-     * @deprecated 将于下个版本 4.0.0 被弃用
-     * @default multiple
-     */
-    type?: ProEditTableMode;
     /**
      * 必填对齐方式, 默认右对齐
      * @default right