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

package/lib/ProTable/components/FormatColumn/index.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getParentElement = exports.formatColumn = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
@@ -16,16 +14,17 @@ var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
-var _moment15 = _interopRequireDefault(require("moment"));
+var _dayjs13 = _interopRequireDefault(require("dayjs"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
+var _antd = require("antd");
 var _utils = require("@zat-design/utils");
 var _TooltipTitle = _interopRequireDefault(require("../TooltipTitle"));
 var _RenderColumn = _interopRequireDefault(require("../RenderColumn"));
 var _utils2 = require("../../utils");
 var _utils3 = require("../../../utils");
 var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEnumLabel"));
-var _ProForm = _interopRequireDefault(require("../../../ProForm"));
+var _index = require("../../../ProForm/components/index");
 var _excluded = ["title", "valueType", "format", "precision", "ellipsis", "code", "copyable", "width", "tooltip", "transform", "prefix", "suffix", "dataIndex", "toolTipProps", "minWidth", "onDiff"];
 /**
  * 调整点：
@@ -252,7 +251,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           children: "-"
         });
       }
-      var node = (0, _jsxRuntime.jsxs)(_space.default, {
+      var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -286,7 +285,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       if ((0, _utils3.isEmpty)(originalValue)) {
         originalRenderValue = '-';
       }
-      var node = (0, _jsxRuntime.jsxs)(_space.default, {
+      var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -315,34 +314,34 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
     column.render = function (value, record, index) {
-      var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
-      var renderValue = (_moment = (0, _moment15.default)(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
+      var _dayjs, _dayjs2, _dayjs3, _dayjs4, _dayjs5, _dayjs6, _dayjs7, _dayjs8, _dayjs9, _dayjs0, _dayjs1, _dayjs10, _dayjs11, _dayjs12;
+      var renderValue = (_dayjs = (0, _dayjs13.default)(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format(format);
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       var isChanged = originalResult.isChanged,
         originalValue = originalResult.originalValue,
         isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
-      var originalRenderValue = (_moment2 = (0, _moment15.default)(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
+      var originalRenderValue = (_dayjs2 = (0, _dayjs13.default)(originalValue)) === null || _dayjs2 === void 0 ? void 0 : _dayjs2.format(format);
       switch (valueType) {
         case 'date':
-          renderValue = (_moment3 = (0, _moment15.default)(value)) === null || _moment3 === void 0 ? void 0 : _moment3.format('YYYY-MM-DD');
-          originalRenderValue = (_moment4 = (0, _moment15.default)(originalValue)) === null || _moment4 === void 0 ? void 0 : _moment4.format('YYYY-MM-DD');
+          renderValue = (_dayjs3 = (0, _dayjs13.default)(value)) === null || _dayjs3 === void 0 ? void 0 : _dayjs3.format('YYYY-MM-DD');
+          originalRenderValue = (_dayjs4 = (0, _dayjs13.default)(originalValue)) === null || _dayjs4 === void 0 ? void 0 : _dayjs4.format('YYYY-MM-DD');
           break;
         case 'dateTime':
-          renderValue = (_moment5 = (0, _moment15.default)(value)) === null || _moment5 === void 0 ? void 0 : _moment5.format('YYYY-MM-DD HH:mm:ss');
-          originalRenderValue = (_moment6 = (0, _moment15.default)(originalValue)) === null || _moment6 === void 0 ? void 0 : _moment6.format('YYYY-MM-DD HH:mm:ss');
+          renderValue = (_dayjs5 = (0, _dayjs13.default)(value)) === null || _dayjs5 === void 0 ? void 0 : _dayjs5.format('YYYY-MM-DD HH:mm:ss');
+          originalRenderValue = (_dayjs6 = (0, _dayjs13.default)(originalValue)) === null || _dayjs6 === void 0 ? void 0 : _dayjs6.format('YYYY-MM-DD HH:mm:ss');
           break;
         case 'dateStartTime':
-          renderValue = "".concat((_moment7 = (0, _moment15.default)(value)) === null || _moment7 === void 0 ? void 0 : _moment7.format('YYYY-MM-DD'), " 00:00:00");
-          originalRenderValue = "".concat((_moment8 = (0, _moment15.default)(originalValue)) === null || _moment8 === void 0 ? void 0 : _moment8.format('YYYY-MM-DD'), " 00:00:00");
+          renderValue = "".concat((_dayjs7 = (0, _dayjs13.default)(value)) === null || _dayjs7 === void 0 ? void 0 : _dayjs7.format('YYYY-MM-DD'), " 00:00:00");
+          originalRenderValue = "".concat((_dayjs8 = (0, _dayjs13.default)(originalValue)) === null || _dayjs8 === void 0 ? void 0 : _dayjs8.format('YYYY-MM-DD'), " 00:00:00");
           break;
         case 'dateEndTime':
-          renderValue = "".concat((_moment9 = (0, _moment15.default)(value)) === null || _moment9 === void 0 ? void 0 : _moment9.format('YYYY-MM-DD'), " 23:59:59");
-          originalRenderValue = "".concat((_moment10 = (0, _moment15.default)(originalValue)) === null || _moment10 === void 0 ? void 0 : _moment10.format('YYYY-MM-DD'), " 23:59:59");
+          renderValue = "".concat((_dayjs9 = (0, _dayjs13.default)(value)) === null || _dayjs9 === void 0 ? void 0 : _dayjs9.format('YYYY-MM-DD'), " 23:59:59");
+          originalRenderValue = "".concat((_dayjs0 = (0, _dayjs13.default)(originalValue)) === null || _dayjs0 === void 0 ? void 0 : _dayjs0.format('YYYY-MM-DD'), " 23:59:59");
           break;
         case 'dateStartEndTime':
-          renderValue = "".concat((_moment11 = (0, _moment15.default)(value === null || value === void 0 ? void 0 : value[0])) === null || _moment11 === void 0 ? void 0 : _moment11.format('YYYY-MM-DD'), " 00:00:00~").concat((_moment12 = (0, _moment15.default)(value === null || value === void 0 ? void 0 : value[1])) === null || _moment12 === void 0 ? void 0 : _moment12.format('YYYY-MM-DD'), " 23:59:59");
-          originalRenderValue = "".concat((_moment13 = (0, _moment15.default)(originalValue === null || originalValue === void 0 ? void 0 : originalValue[0])) === null || _moment13 === void 0 ? void 0 : _moment13.format('YYYY-MM-DD'), " 00:00:00~").concat((_moment14 = (0, _moment15.default)(originalValue === null || originalValue === void 0 ? void 0 : originalValue[1])) === null || _moment14 === void 0 ? void 0 : _moment14.format('YYYY-MM-DD'), " 23:59:59");
+          renderValue = "".concat((_dayjs1 = (0, _dayjs13.default)(value === null || value === void 0 ? void 0 : value[0])) === null || _dayjs1 === void 0 ? void 0 : _dayjs1.format('YYYY-MM-DD'), " 00:00:00~").concat((_dayjs10 = (0, _dayjs13.default)(value === null || value === void 0 ? void 0 : value[1])) === null || _dayjs10 === void 0 ? void 0 : _dayjs10.format('YYYY-MM-DD'), " 23:59:59");
+          originalRenderValue = "".concat((_dayjs11 = (0, _dayjs13.default)(originalValue === null || originalValue === void 0 ? void 0 : originalValue[0])) === null || _dayjs11 === void 0 ? void 0 : _dayjs11.format('YYYY-MM-DD'), " 00:00:00~").concat((_dayjs12 = (0, _dayjs13.default)(originalValue === null || originalValue === void 0 ? void 0 : originalValue[1])) === null || _dayjs12 === void 0 ? void 0 : _dayjs12.format('YYYY-MM-DD'), " 23:59:59");
           break;
       }
       if (!value) {
@@ -351,7 +350,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       if (!originalValue) {
         originalRenderValue = '-';
       }
-      var node = (0, _jsxRuntime.jsxs)(_space.default, {
+      var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -404,7 +403,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           });
         }
       }
-      var node = (0, _jsxRuntime.jsxs)(_space.default, {
+      var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -432,7 +431,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
-      var node = (0, _jsxRuntime.jsxs)(_space.default, {
+      var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
       });
@@ -486,23 +485,25 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var className = (0, _classnames.default)({
         'empty-cell': isEmpty
       });
-      var renderValue = (0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
+      // 处理 code 为函数的情况
+      var realCode = typeof code === 'function' ? code(value, record) : code;
+      var renderValue = (0, _jsxRuntime.jsx)(_index.ProCascader, {
         isView: true,
         mode: "address",
-        code: code,
+        code: realCode,
         value: realValue
       });
-      var originalRenderValue = (0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
+      var originalRenderValue = (0, _jsxRuntime.jsx)(_index.ProCascader, {
         isView: true,
         mode: "address",
-        code: code,
+        code: realCode,
         value: originalRealValue
       });
-      var renderNode = (0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
+      var renderNode = (0, _jsxRuntime.jsx)(_index.ProCascader, {
         className: className,
         isView: true,
         mode: "address",
-        code: code,
+        code: realCode,
         value: realValue,
         tooltip: false
       });
@@ -524,7 +525,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
   } else if (copyable) {
     column.render = function (value, record, index) {
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsxs)(_space.default, {
+      return (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
           valueType: valueType,
@@ -556,7 +557,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         });
       }
       var isInNewRowFlag = isInNewRow(record);
-      return (0, _jsxRuntime.jsxs)(_space.default, {
+      return (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
           valueType: valueType,
@@ -580,7 +581,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         originalValue = originalResult.originalValue,
         isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
-      var node = (0, _jsxRuntime.jsxs)(_space.default, {
+      var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
       });

package/lib/ProTable/components/RcTable/components/BaseTable/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-import '../../../../style/index.less';
 declare const _default: import("react").MemoExoticComponent<({ dataSource, tableProps, draggableProps, summaryProps, emptyTextProps, ...restProps }: {
     [x: string]: any;
     dataSource: any;

package/lib/ProTable/components/RcTable/components/BaseTable/index.js

@@ -6,13 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/table/style");
-var _table = _interopRequireDefault(require("antd/es/table"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _react = require("react");
 var _index = require("../../../index");
-require("../../../../style/index.less");
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
 var BaseTable = function BaseTable(_ref) {
   var dataSource = _ref.dataSource,
@@ -31,7 +29,7 @@ var BaseTable = function BaseTable(_ref) {
     }
     return null;
   };
-  return (0, _jsxRuntime.jsx)(_table.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     components: renderComponents(),
     columns: columns,
     locale: {

package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Row = void 0;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -18,6 +17,8 @@ var _utilities = require("@dnd-kit/utilities");
 var _index = require("./utils/index");
 var _ProIcon = _interopRequireDefault(require("../../../../../../../ProIcon"));
 var _excluded = ["disabled", "children"];
+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 Row = exports.Row = function Row(props) {
   var disabled = props.disabled,
     children = props.children,
@@ -45,24 +46,27 @@ var Row = exports.Row = function Row(props) {
     ref: setNodeRef,
     style: style
   }, attributes), {}, {
-    children: _react.default.Children.map(children, function (child) {
-      if (child.key === 'RC_TABLE_KEY') {
+    children: _react.default.Children.map(children, function (child, index) {
+      // 在第一列（通常是rowSelection列）显示拖拽图标
+      if (index === 0) {
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,
           record = _ref.record,
           renderIndex = _ref.renderIndex;
         return /*#__PURE__*/_react.default.cloneElement(child, {
-          children: (0, _jsxRuntime.jsxs)("span", {
-            className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
-            children: [(0, _jsxRuntime.jsx)(_ProIcon.default, (0, _objectSpread2.default)({
-              className: "drag-icon",
-              style: {
-                touchAction: 'none',
-                cursor: disabled ? 'no-drop' : 'move'
-              },
-              type: "drag",
-              size: 20
-            }, listeners)), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+          children: (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+            children: [(0, _jsxRuntime.jsx)("span", {
+              className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
+              children: (0, _jsxRuntime.jsx)(_ProIcon.default, (0, _objectSpread2.default)({
+                className: "drag-icon",
+                style: {
+                  touchAction: 'none',
+                  cursor: disabled ? 'no-drop' : 'move'
+                },
+                type: "drag",
+                size: 20
+              }, listeners))
+            }), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
           })
         });
       }
@@ -81,14 +85,14 @@ var DndWrapper = function DndWrapper(_ref2) {
     onDragStartGuard = _ref2.onDragStartGuard,
     onDragEndGuard = _ref2.onDragEndGuard;
   var onDragStart = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref3) {
+    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee(_ref3) {
       var active, _transformedValue, activeObject;
-      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:
             active = _ref3.active;
             if (!(onDragStartGuard && (0, _isFunction2.default)(onDragStartGuard))) {
-              _context.next = 6;
+              _context.n = 1;
               break;
             }
             // 为数据源划分层级及parentId
@@ -96,14 +100,13 @@ var DndWrapper = function DndWrapper(_ref2) {
             activeObject = (0, _index.treeNodeFind)(_transformedValue, function (t) {
               return t.rowKey === active.id;
             });
-            _context.next = 6;
+            _context.n = 1;
             return onDragStartGuard({
               activeObject: activeObject,
               currentDataSource: value
             });
-          case 6:
-          case "end":
-            return _context.stop();
+          case 1:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -112,16 +115,16 @@ var DndWrapper = function DndWrapper(_ref2) {
     };
   }();
   var onDragEnd = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
+    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee2(_ref5) {
       var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
           case 0:
             active = _ref5.active, over = _ref5.over;
             // 为数据源划分层级及parentId
             transformedValue = (0, _index.addLevelAndParentId)(value, rowKey); // 同一level层级的且parentId相同的，可以互相之间拖拽替换
             if (!(active.id !== (over === null || over === void 0 ? void 0 : over.id))) {
-              _context2.next = 20;
+              _context2.n = 3;
               break;
             }
             activeObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
@@ -131,14 +134,14 @@ var DndWrapper = function DndWrapper(_ref2) {
               return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
             });
             if (!(activeObject && overObject)) {
-              _context2.next = 20;
+              _context2.n = 3;
               break;
             }
             activeLevel = activeObject.level, activeParentId = activeObject.parentId;
             overLevel = overObject.level, overParentId = overObject.parentId;
             nextDataSource = value;
             if (!(activeLevel === overLevel && activeParentId === overParentId)) {
-              _context2.next = 20;
+              _context2.n = 3;
               break;
             }
             // 将树平铺
@@ -161,23 +164,22 @@ var DndWrapper = function DndWrapper(_ref2) {
             });
             // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
             if (!(onDragEndGuard && (0, _isFunction2.default)(onDragEndGuard))) {
-              _context2.next = 19;
+              _context2.n = 2;
               break;
             }
-            _context2.next = 18;
+            _context2.n = 1;
             return onDragEndGuard({
               activeObject: activeObject,
               overObject: overObject,
               originDataSource: value,
               currentDataSource: nextDataSource
             });
-          case 18:
-            nextDataSource = _context2.sent;
-          case 19:
+          case 1:
+            nextDataSource = _context2.v;
+          case 2:
             onChange((_nextDataSource = nextDataSource) !== null && _nextDataSource !== void 0 ? _nextDataSource : []);
-          case 20:
-          case "end":
-            return _context2.stop();
+          case 3:
+            return _context2.a(2);
         }
       }, _callee2);
     }));

package/lib/ProTable/components/RcTable/components/DraggableTable/index.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
-import '../../../../style/index.less';
 declare const _default: import("react").MemoExoticComponent<({ dataSource, tableProps, draggableProps, summaryProps, emptyTextProps, ...restProps }: {
     [x: string]: any;
     dataSource: any;

package/lib/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -7,14 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/table/style");
-var _table = _interopRequireDefault(require("antd/es/table"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _react = require("react");
 var _DndWrapper = _interopRequireWildcard(require("./components/DndWrapper"));
 var _index = require("../../../index");
-require("../../../../style/index.less");
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
 var DraggableTable = function DraggableTable(_ref) {
   var dataSource = _ref.dataSource,
@@ -40,7 +38,7 @@ var DraggableTable = function DraggableTable(_ref) {
     rowKey: rowKey,
     onDragStartGuard: onDragStartGuard,
     onDragEndGuard: onDragEndGuard,
-    children: (0, _jsxRuntime.jsx)(_table.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    children: (0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       className: "pro-edit-table-drag",
       components: {
         body: {

package/lib/ProTable/components/RenderColumn/index.d.ts

@@ -9,7 +9,7 @@ interface Props {
     ellipsis?: any;
     width?: number | string;
     originalValue?: any;
-    toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
+    toolTipProps?: TooltipProps;
     minWidth?: number;
     isInNewRowFlag?: boolean;
     isChanged?: boolean;

package/lib/ProTable/components/RenderColumn/index.js

@@ -5,17 +5,12 @@ 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/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-require("antd/es/typography/style");
-var _typography = _interopRequireDefault(require("antd/es/typography"));
 var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
+var _antd = require("antd");
 var _ahooks = require("ahooks");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _icons = require("@ant-design/icons");
@@ -23,8 +18,8 @@ var _reactSvg = require("react-svg");
 var _utils = require("../../utils");
 var _utils2 = require("../../../utils");
 var _copy = _interopRequireDefault(require("../../../assets/copy.svg"));
-var Paragraph = _typography.default.Paragraph,
-  Text = _typography.default.Text;
+var Paragraph = _antd.Typography.Paragraph,
+  Text = _antd.Typography.Text;
 // @ts-ignore
 var RenderColumn = function RenderColumn(props) {
   var valueType = props.valueType,
@@ -100,7 +95,7 @@ var RenderColumn = function RenderColumn(props) {
       });
       if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
         if (ellipsis) {
-          return (0, _jsxRuntime.jsx)(_tooltip.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+          return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
             title: currentValue,
             onOpenChange: function onOpenChange(open) {
               setState({
@@ -132,27 +127,29 @@ var RenderColumn = function RenderColumn(props) {
         }
         return !(0, _utils2.isEmpty)(originalValue) ? originalValue : '-';
       };
-      return (0, _jsxRuntime.jsx)(_tooltip.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         className: cellDiffCls,
         style: {
           width: width,
           minWidth: minWidth
         },
-        overlayClassName: "original-value-tooltip",
-        destroyTooltipOnHide: true,
+        classNames: {
+          root: 'original-value-tooltip'
+        },
+        destroyOnHidden: true,
         placement: "topLeft",
         autoAdjustOverflow: false,
-        title: (0, _jsxRuntime.jsx)(_space.default, {
+        title: (0, _jsxRuntime.jsx)(_antd.Space, {
           direction: "vertical",
           className: "changed-tooltip",
           children: (props === null || props === void 0 ? void 0 : props.isChanged) && !(props === null || props === void 0 ? void 0 : props.isAddCell) ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-            children: [(0, _jsxRuntime.jsxs)(_space.default, {
+            children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
               align: "start",
               className: "original-value-container",
               children: ["\u521D\u59CB\u503C\uFF1A", originalValueCalc()]
-            }), (0, _jsxRuntime.jsx)(_space.default, {
+            }), (0, _jsxRuntime.jsx)(_antd.Space, {
               className: "current-value-container",
-              children: ellipsis ? (0, _jsxRuntime.jsxs)(_space.default, {
+              children: ellipsis ? (0, _jsxRuntime.jsxs)(_antd.Space, {
                 children: ["\u5F53\u524D\u503C\uFF1A", currentValue]
               }) : null
             })]
@@ -203,9 +200,9 @@ var RenderColumn = function RenderColumn(props) {
       });
     }
     var calculatedWidth = updateCalculatedWidth(textRef.current);
-    return (0, _jsxRuntime.jsx)(_tooltip.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       title: value,
-      destroyTooltipOnHide: true,
+      destroyOnHidden: true,
       onOpenChange: function onOpenChange() {
         setState({
           tooltip: false

package/lib/ProTable/components/RenderSummary/index.js

@@ -5,11 +5,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/table/style");
-var _table = _interopRequireDefault(require("antd/es/table"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _get3 = _interopRequireDefault(require("lodash/get"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _utils = require("@zat-design/utils");
 var _utils2 = require("../../../ProUtils/utils");
 var renderSummary = function renderSummary(props) {
@@ -25,9 +24,9 @@ var renderSummary = function renderSummary(props) {
   if (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length)) {
     return null;
   }
-  return (0, _typeof2.default)(summary) === 'object' ? (0, _jsxRuntime.jsx)(_table.default.Summary, {
+  return (0, _typeof2.default)(summary) === 'object' ? (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: columns === null || columns === void 0 ? void 0 : columns.map(function (_ref2) {
         var key = _ref2.key,
           index = _ref2.index,
@@ -50,7 +49,7 @@ var renderSummary = function renderSummary(props) {
           text = format ? format(sum, precision !== null && precision !== void 0 ? precision : 2) : sum;
         }
         var _key = key;
-        return (0, _jsxRuntime.jsxs)(_table.default.Summary.Cell, {
+        return (0, _jsxRuntime.jsxs)(_antd.Table.Summary.Cell, {
           index: index,
           colSpan: colSpan,
           children: [prefix, text, suffix]

package/lib/ProTable/components/RenderTableHeader/index.js

@@ -1,13 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _reactSvg = require("react-svg");
 var _index = require("../../../index");
 var RenderTableHeader = function RenderTableHeader(props) {
@@ -35,7 +33,7 @@ var RenderTableHeader = function RenderTableHeader(props) {
       children: headerRender ? typeof headerRender === 'function' ? headerRender() : headerRender : null
     }), (0, _jsxRuntime.jsxs)("div", {
       className: "right-actions",
-      children: [resizeColumn && (0, _jsxRuntime.jsx)(_button.default, {
+      children: [resizeColumn && (0, _jsxRuntime.jsx)(_antd.Button, {
         icon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
           className: "anticon",
           wrapper: "span",
@@ -52,7 +50,7 @@ var RenderTableHeader = function RenderTableHeader(props) {
         value: checkColumns,
         allValue: "all",
         onChange: handleColumnConfig,
-        trigger: (0, _jsxRuntime.jsx)(_button.default, {
+        trigger: (0, _jsxRuntime.jsx)(_antd.Button, {
           className: "custom-column-btn",
           icon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
             className: "anticon",

package/lib/ProTable/components/RenderTabs/index.js

@@ -7,13 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/tabs/style");
-var _tabs = _interopRequireDefault(require("antd/es/tabs"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _react = require("react");
 var _useEnum3 = _interopRequireDefault(require("../../../ProEnum/hooks/useEnum"));
 var RenderTabs = function RenderTabs(props) {
@@ -35,7 +32,7 @@ var RenderTabs = function RenderTabs(props) {
   var _useEnum = (0, _useEnum3.default)(code),
     _useEnum2 = (0, _slicedToArray2.default)(_useEnum, 1),
     options = _useEnum2[0];
-  var fieldValue = _form.default.useWatch(name, form);
+  var fieldValue = _antd.Form.useWatch(name, form);
   // 使用useMemo计算派生状态
   var tabItems = (0, _react.useMemo)(function () {
     var defaultItems = [].concat((0, _toConsumableArray2.default)(dataSource), (0, _toConsumableArray2.default)(options || []));
@@ -69,7 +66,7 @@ var RenderTabs = function RenderTabs(props) {
   if (!(tabItems === null || tabItems === void 0 ? void 0 : tabItems.length)) {
     return null;
   }
-  return (0, _jsxRuntime.jsx)(_tabs.default, (0, _objectSpread3.default)((0, _objectSpread3.default)({
+  return (0, _jsxRuntime.jsx)(_antd.Tabs, (0, _objectSpread3.default)((0, _objectSpread3.default)({
     className: "pro-table-tabs",
     onChange: function onChange(key) {
       var fieldsValues = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {};

package/lib/ProTable/components/TableResizable/index.js

@@ -29,7 +29,8 @@ var ResizableTitle = function ResizableTitle(props) {
   if (restProps === null || restProps === void 0 ? void 0 : (_restProps$className = restProps.className) === null || _restProps$className === void 0 ? void 0 : _restProps$className.includes('ant-table-selection-column')) {
     return (0, _jsxRuntime.jsx)("th", (0, _objectSpread2.default)({}, restProps));
   }
-  return (0, _jsxRuntime.jsx)(_reactResizable.Resizable, {
+  var ResizableComponent = _reactResizable.Resizable;
+  return (0, _jsxRuntime.jsx)(ResizableComponent, {
     width: Number(width) + Number(offset),
     minConstraints: [minwidth, 0],
     height: 0,