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

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

@@ -1,12 +1,10 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/table/style";
-import _Table from "antd/es/table";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Table } from 'antd';
 import { memo } from 'react';
 import { RenderEmptyText, RenderSummary, TableResizable } from '../../../index';
-import '../../../../style/index.less';
 var BaseTable = function BaseTable(_ref) {
   var dataSource = _ref.dataSource,
     tableProps = _ref.tableProps,
@@ -24,7 +22,7 @@ var BaseTable = function BaseTable(_ref) {
     }
     return null;
   };
-  return _jsx(_Table, _objectSpread(_objectSpread({
+  return _jsx(Table, _objectSpread(_objectSpread({
     components: renderComponents(),
     columns: columns,
     locale: {

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

@@ -1,10 +1,11 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _isFunction from "lodash/isFunction";
 var _excluded = ["disabled", "children"];
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+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); }
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { DndContext, closestCorners } from '@dnd-kit/core';
 import { arrayMove, useSortable, SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
@@ -38,24 +39,27 @@ export var Row = function Row(props) {
     ref: setNodeRef,
     style: style
   }, attributes), {}, {
-    children: React.Children.map(children, function (child) {
-      if (child.key === 'RC_TABLE_KEY') {
+    children: React.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.cloneElement(child, {
-          children: _jsxs("span", {
-            className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
-            children: [_jsx(ProIcon, _objectSpread({
-              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: _jsxs(_Fragment, {
+            children: [_jsx("span", {
+              className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
+              children: _jsx(ProIcon, _objectSpread({
+                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)]
           })
         });
       }
@@ -74,14 +78,14 @@ var DndWrapper = function DndWrapper(_ref2) {
     onDragStartGuard = _ref2.onDragStartGuard,
     onDragEndGuard = _ref2.onDragEndGuard;
   var onDragStart = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref3) {
       var active, _transformedValue, activeObject;
-      return _regeneratorRuntime().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 && _isFunction(onDragStartGuard))) {
-              _context.next = 6;
+              _context.n = 1;
               break;
             }
             // 为数据源划分层级及parentId
@@ -89,14 +93,13 @@ var DndWrapper = function DndWrapper(_ref2) {
             activeObject = 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);
     }));
@@ -105,16 +108,16 @@ var DndWrapper = function DndWrapper(_ref2) {
     };
   }();
   var onDragEnd = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref5) {
       var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
-      return _regeneratorRuntime().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 = 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 = treeNodeFind(transformedValue, function (t) {
@@ -124,14 +127,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;
             }
             // 将树平铺
@@ -154,23 +157,22 @@ var DndWrapper = function DndWrapper(_ref2) {
             });
             // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
             if (!(onDragEndGuard && _isFunction(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/es/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/es/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -1,13 +1,11 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/table/style";
-import _Table from "antd/es/table";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Table } from 'antd';
 import { memo } from 'react';
 import DndWrapper, { Row } from './components/DndWrapper';
 import { RenderEmptyText, RenderSummary } from '../../../index';
-import '../../../../style/index.less';
 var DraggableTable = function DraggableTable(_ref) {
   var dataSource = _ref.dataSource,
     tableProps = _ref.tableProps,
@@ -32,7 +30,7 @@ var DraggableTable = function DraggableTable(_ref) {
     rowKey: rowKey,
     onDragStartGuard: onDragStartGuard,
     onDragEndGuard: onDragEndGuard,
-    children: _jsx(_Table, _objectSpread(_objectSpread({
+    children: _jsx(Table, _objectSpread(_objectSpread({
       className: "pro-edit-table-drag",
       components: {
         body: {

package/es/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/es/ProTable/components/RenderColumn/index.js

@@ -1,14 +1,9 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import "antd/es/typography/style";
-import _Typography from "antd/es/typography";
 import _isBoolean from "lodash/isBoolean";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useRef } from 'react';
+import { Tooltip, Typography, Space } from 'antd';
 import { useSetState } from 'ahooks';
 import classNames from 'classnames';
 import { CheckOutlined } from '@ant-design/icons';
@@ -16,8 +11,8 @@ import { ReactSVG } from 'react-svg';
 import { parseWidth } from '../../utils';
 import { isEmpty, isEllipsisActive } from '../../../utils';
 import copySvg from '../../../assets/copy.svg';
-var Paragraph = _Typography.Paragraph,
-  Text = _Typography.Text;
+var Paragraph = Typography.Paragraph,
+  Text = Typography.Text;
 // @ts-ignore
 var RenderColumn = function RenderColumn(props) {
   var valueType = props.valueType,
@@ -93,7 +88,7 @@ var RenderColumn = function RenderColumn(props) {
       });
       if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
         if (ellipsis) {
-          return _jsx(_Tooltip, _objectSpread(_objectSpread({
+          return _jsx(Tooltip, _objectSpread(_objectSpread({
             title: currentValue,
             onOpenChange: function onOpenChange(open) {
               setState({
@@ -125,27 +120,29 @@ var RenderColumn = function RenderColumn(props) {
         }
         return !isEmpty(originalValue) ? originalValue : '-';
       };
-      return _jsx(_Tooltip, _objectSpread(_objectSpread({
+      return _jsx(Tooltip, _objectSpread(_objectSpread({
         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: _jsx(_Space, {
+        title: _jsx(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) ? _jsxs(_Fragment, {
-            children: [_jsxs(_Space, {
+            children: [_jsxs(Space, {
               align: "start",
               className: "original-value-container",
               children: ["\u521D\u59CB\u503C\uFF1A", originalValueCalc()]
-            }), _jsx(_Space, {
+            }), _jsx(Space, {
               className: "current-value-container",
-              children: ellipsis ? _jsxs(_Space, {
+              children: ellipsis ? _jsxs(Space, {
                 children: ["\u5F53\u524D\u503C\uFF1A", currentValue]
               }) : null
             })]
@@ -196,9 +193,9 @@ var RenderColumn = function RenderColumn(props) {
       });
     }
     var calculatedWidth = updateCalculatedWidth(textRef.current);
-    return _jsx(_Tooltip, _objectSpread(_objectSpread({
+    return _jsx(Tooltip, _objectSpread(_objectSpread({
       title: value,
-      destroyTooltipOnHide: true,
+      destroyOnHidden: true,
       onOpenChange: function onOpenChange() {
         setState({
           tooltip: false

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

@@ -1,8 +1,7 @@
-import "antd/es/table/style";
-import _Table from "antd/es/table";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _get from "lodash/get";
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { Table } from 'antd';
 import { tools } from '@zat-design/utils';
 import { valueTypeRender } from '../../../ProUtils/utils';
 var renderSummary = function renderSummary(props) {
@@ -18,9 +17,9 @@ var renderSummary = function renderSummary(props) {
   if (!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.length)) {
     return null;
   }
-  return _typeof(summary) === 'object' ? _jsx(_Table.Summary, {
+  return _typeof(summary) === 'object' ? _jsx(Table.Summary, {
     fixed: fixed,
-    children: _jsx(_Table.Summary.Row, {
+    children: _jsx(Table.Summary.Row, {
       children: columns === null || columns === void 0 ? void 0 : columns.map(function (_ref2) {
         var key = _ref2.key,
           index = _ref2.index,
@@ -43,7 +42,7 @@ var renderSummary = function renderSummary(props) {
           text = format ? format(sum, precision !== null && precision !== void 0 ? precision : 2) : sum;
         }
         var _key = key;
-        return _jsxs(_Table.Summary.Cell, {
+        return _jsxs(Table.Summary.Cell, {
           index: index,
           colSpan: colSpan,
           children: [prefix, text, suffix]

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

@@ -1,6 +1,5 @@
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Button } from 'antd';
 import { ReactSVG } from 'react-svg';
 import { ProTreeModal } from '../../../index';
 var RenderTableHeader = function RenderTableHeader(props) {
@@ -28,7 +27,7 @@ var RenderTableHeader = function RenderTableHeader(props) {
       children: headerRender ? typeof headerRender === 'function' ? headerRender() : headerRender : null
     }), _jsxs("div", {
       className: "right-actions",
-      children: [resizeColumn && _jsx(_Button, {
+      children: [resizeColumn && _jsx(Button, {
         icon: _jsx(ReactSVG, {
           className: "anticon",
           wrapper: "span",
@@ -45,7 +44,7 @@ var RenderTableHeader = function RenderTableHeader(props) {
         value: checkColumns,
         allValue: "all",
         onChange: handleColumnConfig,
-        trigger: _jsx(_Button, {
+        trigger: _jsx(Button, {
           className: "custom-column-btn",
           icon: _jsx(ReactSVG, {
             className: "anticon",

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

@@ -1,12 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/tabs/style";
-import _Tabs from "antd/es/tabs";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { Tabs, Form } from 'antd';
 import { useMemo, useState, useEffect, memo } from 'react';
 import useEnum from '../../../ProEnum/hooks/useEnum';
 var RenderTabs = function RenderTabs(props) {
@@ -28,7 +25,7 @@ var RenderTabs = function RenderTabs(props) {
   var _useEnum = useEnum(code),
     _useEnum2 = _slicedToArray(_useEnum, 1),
     options = _useEnum2[0];
-  var fieldValue = _Form.useWatch(name, form);
+  var fieldValue = Form.useWatch(name, form);
   // 使用useMemo计算派生状态
   var tabItems = useMemo(function () {
     var defaultItems = [].concat(_toConsumableArray(dataSource), _toConsumableArray(options || []));
@@ -62,7 +59,7 @@ var RenderTabs = function RenderTabs(props) {
   if (!(tabItems === null || tabItems === void 0 ? void 0 : tabItems.length)) {
     return null;
   }
-  return _jsx(_Tabs, _objectSpread(_objectSpread({
+  return _jsx(Tabs, _objectSpread(_objectSpread({
     className: "pro-table-tabs",
     onChange: function onChange(key) {
       var fieldsValues = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {};

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

@@ -22,7 +22,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 _jsx("th", _objectSpread({}, restProps));
   }
-  return _jsx(Resizable, {
+  var ResizableComponent = Resizable;
+  return _jsx(ResizableComponent, {
     width: Number(width) + Number(offset),
     minConstraints: [minwidth, 0],
     height: 0,

package/es/ProTable/components/TooltipTitle/index.js

@@ -1,6 +1,5 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Tooltip } from 'antd';
 import { ReactSVG } from 'react-svg';
 import tipSvg from '../../../assets/tip.svg';
 var TooltipTitle = function TooltipTitle(props) {
@@ -11,7 +10,7 @@ var TooltipTitle = function TooltipTitle(props) {
     icon = _ref.icon;
   return _jsxs("span", {
     className: "pro-table-tooltip",
-    children: [title, _jsx(_Tooltip, {
+    children: [title, _jsx(Tooltip, {
       title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip,
       children: _jsx(ReactSVG, {
         className: "icon-tip",

package/es/ProTable/hooks/useAntdTable.js

@@ -1,11 +1,6 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import "antd/es/message/style";
-import _message from "antd/es/message";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _omit from "lodash/omit";
@@ -15,8 +10,11 @@ import _merge from "lodash/merge";
 import _isObject from "lodash/isObject";
 import _pickBy from "lodash/pickBy";
 var _excluded = ["page", "filters", "sorter"];
+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); }
 import { useEffect, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect, usePrevious } from 'ahooks';
+import { Form, message } from 'antd';
 import { defaultPage } from '../index';
 import { isListResult, removeEmptyKeys, isNonEmptyObject } from '../utils';
 import locale, { formatMessage } from '../../locale';
@@ -73,7 +71,7 @@ function useAntdTable(service, options, useRequestOptions) {
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
-  var _Form$useForm = _Form.useForm(_form),
+  var _Form$useForm = Form.useForm(_form),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var _ref = useRequestOptions || {},
@@ -133,7 +131,7 @@ function useAntdTable(service, options, useRequestOptions) {
         total = _ref2$total === void 0 ? 0 : _ref2$total;
       if (list !== null && !Array.isArray(list)) {
         var _locale$ProTable;
-        return _message.error(locale === null || locale === void 0 ? void 0 : (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.transformResponseMsg);
+        return message.error(locale === null || locale === void 0 ? void 0 : (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.transformResponseMsg);
       }
       setState({
         total: total,
@@ -314,24 +312,23 @@ function useAntdTable(service, options, useRequestOptions) {
     }
   };
   var handleRefresh = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
       var res;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             setState({
               allSelected: false,
               selectedRecords: [],
               selectedRowKeys: []
             });
-            _context.next = 3;
+            _context.n = 1;
             return refreshAsync();
-          case 3:
-            res = _context.sent;
+          case 1:
+            res = _context.v;
             refreshPage(res);
-          case 5:
-          case "end":
-            return _context.stop();
+          case 2:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -404,9 +401,9 @@ function useAntdTable(service, options, useRequestOptions) {
         total: total
       }),
       onSelect: function () {
-        var _onSelect = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
-          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-            while (1) switch (_context2.prev = _context2.next) {
+        var _onSelect = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(changeableRowKeys) {
+          return _regenerator().w(function (_context2) {
+            while (1) switch (_context2.n) {
               case 0:
                 setState({
                   allSelected: true,
@@ -414,8 +411,7 @@ function useAntdTable(service, options, useRequestOptions) {
                   selectedRowKeys: changeableRowKeys
                 });
               case 1:
-              case "end":
-                return _context2.stop();
+                return _context2.a(2);
             }
           }, _callee2);
         }));
@@ -428,9 +424,9 @@ function useAntdTable(service, options, useRequestOptions) {
       key: 'uncheckAll',
       text: locale === null || locale === void 0 ? void 0 : (_locale$ProTable4 = locale.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.deselect,
       onSelect: function () {
-        var _onSelect2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-            while (1) switch (_context3.prev = _context3.next) {
+        var _onSelect2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+          return _regenerator().w(function (_context3) {
+            while (1) switch (_context3.n) {
               case 0:
                 setState({
                   allSelected: false,
@@ -438,8 +434,7 @@ function useAntdTable(service, options, useRequestOptions) {
                   selectedRowKeys: []
                 });
               case 1:
-              case "end":
-                return _context3.stop();
+                return _context3.a(2);
             }
           }, _callee3);
         }));

package/es/ProTable/index.js

@@ -1,4 +1,3 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
@@ -13,6 +12,8 @@ import _keyBy from "lodash/keyBy";
 import _get from "lodash/get";
 var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "diffConfig", "onDragStart", "onDragEnd", "tabs"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
+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); }
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
 import { useDebounceEffect, useDeepCompareEffect, useSetState } from 'ahooks';
@@ -257,10 +258,10 @@ var ProTable = function ProTable(props) {
     _scroll = props === null || props === void 0 ? void 0 : props.scroll;
   }
   var handleColumnConfig = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             newColumns = [];
             if (checkList === 'all') {
@@ -271,7 +272,7 @@ var ProTable = function ProTable(props) {
               });
             }
             if (!_isObject(columnConfig)) {
-              _context.next = 6;
+              _context.n = 1;
               break;
             }
             catchColumns = _defineProperty({}, pathKey, {
@@ -282,13 +283,12 @@ var ProTable = function ProTable(props) {
                 };
               })
             });
-            _context.next = 6;
+            _context.n = 1;
             return columnConfig === null || columnConfig === void 0 ? void 0 : (_columnConfig$onColum = columnConfig.onColumnOk) === null || _columnConfig$onColum === void 0 ? void 0 : _columnConfig$onColum.call(columnConfig, catchColumns, newColumns);
-          case 6:
+          case 1:
             setCurColumns(newColumns);
-          case 7:
-          case "end":
-            return _context.stop();
+          case 2:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -366,18 +366,17 @@ var ProTable = function ProTable(props) {
     return _rowSelection;
   };
   var onDataSourceChange = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(nextDataSource) {
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(nextDataSource) {
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
           case 0:
             setState({
               dataSource: nextDataSource
             });
             // 覆盖引用值
             _assign(dataSource, nextDataSource);
-          case 2:
-          case "end":
-            return _context2.stop();
+          case 1:
+            return _context2.a(2);
         }
       }, _callee2);
     }));