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

package/lib/ProDownload/utils.js

@@ -7,18 +7,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.BlobMakeFile = BlobMakeFile;
 exports.convertBase64ToBlob = exports.DownloadRequest = void 0;
 exports.getFilenameFromContentDisposition = getFilenameFromContentDisposition;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-require("antd/es/message/style");
-var _message2 = _interopRequireDefault(require("antd/es/message"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _get2 = _interopRequireDefault(require("lodash/get"));
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
+var _antd = require("antd");
 var _locale = _interopRequireDefault(require("../locale"));
-/* eslint-disable no-empty */
-/* eslint-disable prefer-promise-reject-errors */
-
+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); } /* eslint-disable no-empty */ /* eslint-disable prefer-promise-reject-errors */
 var stringify = function stringify(data) {
   var result = '';
   if (data && Object.keys(data).length) {
@@ -83,10 +80,10 @@ function getFilenameFromContentDisposition(contentDisposition) {
 }
 // 发起请求获取下载文件
 var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref2) {
+  var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee2(_ref2) {
     var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, onError, config, res, fileBlob, data, contentFileName;
-    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:
           url = _ref2.url, _ref2$method = _ref2.method, method = _ref2$method === void 0 ? 'post' : _ref2$method, params = _ref2.params, headers = _ref2.headers, transformResponse = _ref2.transformResponse, fileName = _ref2.fileName, onFinish = _ref2.onFinish, onError = _ref2.onError;
           config = {
@@ -109,65 +106,62 @@ var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
           if (headers && (0, _typeof2.default)(headers) === 'object' && Object.keys(headers).length > 0) {
             config.headers = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, config.headers), headers);
           }
-          _context2.next = 7;
+          _context2.n = 1;
           return fetch(url, config).then(/*#__PURE__*/function () {
-            var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(response) {
-              var _data, errorMsg;
-              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(response) {
+              var _data, errorMsg, _t;
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.p = _context.n) {
                   case 0:
-                    _context.prev = 0;
-                    _context.next = 3;
+                    _context.p = 0;
+                    _context.n = 1;
                     return response.clone().json();
-                  case 3:
-                    _data = _context.sent;
+                  case 1:
+                    _data = _context.v;
                     if (_data) {
-                      _context.next = 7;
+                      _context.n = 2;
                       break;
                     }
-                    _message2.default.error("".concat(_locale.default.ProDownload.errorMessage));
-                    return _context.abrupt("return", Promise.reject("".concat(_locale.default.ProDownload.errorMessage)));
-                  case 7:
+                    _antd.message.error("".concat(_locale.default.ProDownload.errorMessage));
+                    return _context.a(2, Promise.reject("".concat(_locale.default.ProDownload.errorMessage)));
+                  case 2:
                     if (!((_data === null || _data === void 0 ? void 0 : _data.status) > 200 || (_data === null || _data === void 0 ? void 0 : _data.code) === 401)) {
-                      _context.next = 12;
+                      _context.n = 3;
                       break;
                     }
                     errorMsg = (_data === null || _data === void 0 ? void 0 : _data.message) || (_data === null || _data === void 0 ? void 0 : _data.msg);
-                    errorMsg && _message2.default.error(errorMsg);
+                    errorMsg && _antd.message.error(errorMsg);
                     onError && onError(_data);
-                    return _context.abrupt("return", Promise.reject(errorMsg));
-                  case 12:
+                    return _context.a(2, Promise.reject(errorMsg));
+                  case 3:
                     if (!(0, _isFunction2.default)(transformResponse)) {
-                      _context.next = 14;
+                      _context.n = 4;
                       break;
                     }
-                    return _context.abrupt("return", Promise.resolve(transformResponse(_data)));
-                  case 14:
+                    return _context.a(2, Promise.resolve(transformResponse(_data)));
+                  case 4:
                     Promise.resolve(_data);
-                    _context.next = 21;
+                    _context.n = 6;
                     break;
-                  case 17:
-                    _context.prev = 17;
-                    _context.t0 = _context["catch"](0);
+                  case 5:
+                    _context.p = 5;
+                    _t = _context.v;
                     if (!response.ok) {
-                      _context.next = 21;
+                      _context.n = 6;
                       break;
                     }
-                    return _context.abrupt("return", Promise.resolve(response));
-                  case 21:
-                    return _context.abrupt("return", Promise.reject("".concat(_locale.default.ProDownload.errorMessage)));
-                  case 22:
-                  case "end":
-                    return _context.stop();
+                    return _context.a(2, Promise.resolve(response));
+                  case 6:
+                    return _context.a(2, Promise.reject("".concat(_locale.default.ProDownload.errorMessage)));
                 }
-              }, _callee, null, [[0, 17]]);
+              }, _callee, null, [[0, 5]]);
             }));
             return function (_x2) {
               return _ref4.apply(this, arguments);
             };
           }());
-        case 7:
-          res = _context2.sent;
+        case 1:
+          res = _context2.v;
           data = null;
           contentFileName = '';
           if ((0, _isFunction2.default)(transformResponse)) {
@@ -178,28 +172,25 @@ var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
             data = (0, _get2.default)(res, 'data');
           }
           if (!data) {
-            _context2.next = 15;
+            _context2.n = 2;
             break;
           }
           fileBlob = convertBase64ToBlob(data);
-          _context2.next = 18;
+          _context2.n = 4;
           break;
-        case 15:
-          _context2.next = 17;
+        case 2:
+          _context2.n = 3;
           return res.blob();
-        case 17:
-          fileBlob = _context2.sent;
-        case 18:
+        case 3:
+          fileBlob = _context2.v;
+        case 4:
           // 完成回调
           onFinish === null || onFinish === void 0 ? void 0 : onFinish(res, params);
           BlobMakeFile({
             blob: fileBlob,
             fileName: fileName || contentFileName
           });
-          return _context2.abrupt("return", Promise.resolve(res));
-        case 21:
-        case "end":
-          return _context2.stop();
+          return _context2.a(2, Promise.resolve(res));
       }
     }, _callee2);
   }));

package/lib/ProDrawerForm/components/ProDrawer/index.js

@@ -6,23 +6,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/drawer/style");
-var _drawer = _interopRequireDefault(require("antd/es/drawer"));
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/modal/style");
-var _modal = _interopRequireDefault(require("antd/es/modal"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _reactSvg = require("react-svg");
 var _close = _interopRequireDefault(require("../../../assets/close.svg"));
 var _locale = _interopRequireDefault(require("../../../locale"));
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
 /**
  * 抽屉组件
  */
@@ -31,7 +28,7 @@ var ProDrawer = function ProDrawer(_ref) {
     title = _ref.title,
     width = _ref.width,
     footer = _ref.footer,
-    visible = _ref.visible,
+    open = _ref.open,
     isView = _ref.isView,
     maskClosable = _ref.maskClosable,
     isConfirmClose = _ref.isConfirmClose,
@@ -59,9 +56,9 @@ var ProDrawer = function ProDrawer(_ref) {
     initialSnapshot = _useState4[0],
     setInitialSnapshot = _useState4[1];
   var noRenderFooter = isView || footer === false || footer === null;
-  // 使用 useEffect 在 visible 变更时延迟捕获 初始DOM 快照
+  // 使用 useEffect 在 open 变更时延迟捕获 初始DOM 快照
   (0, _react.useEffect)(function () {
-    if (visible) {
+    if (open) {
       // 延迟到下一个事件循环，确保 Drawer 已经渲染
       var timeoutId = setTimeout(function () {
         if (ref.current) {
@@ -73,22 +70,22 @@ var ProDrawer = function ProDrawer(_ref) {
       }; // 清理定时器
     }
     setInitialSnapshot('');
-  }, [visible]); // 当 visible 变化时执行
+  }, [open]); // 当 open 变化时执行
   // 快照对比
   var compareSnapshots = function compareSnapshots() {
     if (!ref.current) return false;
     return ref.current.innerHTML === initialSnapshot;
   };
-  var onConfirm = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+  var onConfirm = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee() {
     var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
-    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:
           // 如果当前是查看状态，或者不需要确认关闭，或者快照对比一致，则直接关闭
           if (isView || !isConfirmClose || compareSnapshots()) {
             onCancel && onCancel();
           } else if (!modalRef.current) {
-            modalRef.current = _modal.default.confirm((0, _objectSpread2.default)({
+            modalRef.current = _antd.Modal.confirm((0, _objectSpread2.default)({
               className: 'width430',
               title: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProDrawerForm = _locale.default.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.isSureClose,
               okText: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProDrawerForm2 = _locale.default.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.confirm,
@@ -103,91 +100,89 @@ var ProDrawer = function ProDrawer(_ref) {
             }, isConfirmCloseModalProps));
           }
         case 1:
-        case "end":
-          return _context.stop();
+          return _context.a(2);
       }
     }, _callee);
   })), [onCancel, modalRef.current, ref.current]);
-  var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
-    var values;
-    return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+  var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee2() {
+    var values, _t, _t2, _t3, _t4, _t5;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.p = _context2.n) {
         case 0:
-          _context2.prev = 0;
-          if (!visible) {
-            _context2.next = 24;
+          _context2.p = 0;
+          if (!open) {
+            _context2.n = 8;
             break;
           }
-          _context2.next = 4;
+          _context2.n = 1;
           return form.validateFields();
-        case 4:
-          values = _context2.sent;
+        case 1:
+          values = _context2.v;
           if (!(okLoading !== undefined)) {
-            _context2.next = 15;
+            _context2.n = 5;
             break;
           }
-          _context2.t0 = onOk;
-          if (!_context2.t0) {
-            _context2.next = 12;
+          _t = onOk;
+          if (!_t) {
+            _context2.n = 3;
             break;
           }
-          _context2.next = 10;
+          _context2.n = 2;
           return onOk(values, form);
-        case 10:
-          _context2.t1 = _context2.sent;
-          _context2.t0 = _context2.t1 === true;
-        case 12:
-          if (!_context2.t0) {
-            _context2.next = 14;
+        case 2:
+          _t2 = _context2.v;
+          _t = _t2 === true;
+        case 3:
+          if (!_t) {
+            _context2.n = 4;
             break;
           }
           onCancel && onCancel();
-        case 14:
-          return _context2.abrupt("return", true);
-        case 15:
+        case 4:
+          return _context2.a(2, true);
+        case 5:
           toggleLoading(true);
-          _context2.t2 = onOk;
-          if (!_context2.t2) {
-            _context2.next = 22;
+          _t3 = onOk;
+          if (!_t3) {
+            _context2.n = 7;
             break;
           }
-          _context2.next = 20;
+          _context2.n = 6;
           return onOk(values, form);
-        case 20:
-          _context2.t3 = _context2.sent;
-          _context2.t2 = _context2.t3 === true;
-        case 22:
-          if (!_context2.t2) {
-            _context2.next = 24;
+        case 6:
+          _t4 = _context2.v;
+          _t3 = _t4 === true;
+        case 7:
+          if (!_t3) {
+            _context2.n = 8;
             break;
           }
           onCancel && onCancel();
-        case 24:
-          _context2.next = 29;
+        case 8:
+          _context2.n = 10;
           break;
-        case 26:
-          _context2.prev = 26;
-          _context2.t4 = _context2["catch"](0);
+        case 9:
+          _context2.p = 9;
+          _t5 = _context2.v;
           /** 使用setTimeout确保DOM已经更新，错误标记已经渲染 */
           setTimeout(function () {
             var _ref$current, _error$errorFields;
             var errorElement = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.querySelector('[class*="form-item-has-error"]');
-            if (errorElement && (_context2.t4 === null || _context2.t4 === void 0 ? void 0 : (_error$errorFields = _context2.t4.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
+            if (errorElement && (_t5 === null || _t5 === void 0 ? void 0 : (_error$errorFields = _t5.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
               errorElement.scrollIntoView({
                 behavior: 'smooth',
                 block: 'center'
               });
             }
           }, 100);
-        case 29:
-          _context2.prev = 29;
+        case 10:
+          _context2.p = 10;
           toggleLoading(false);
-          return _context2.finish(29);
-        case 32:
-        case "end":
-          return _context2.stop();
+          return _context2.f(10);
+        case 11:
+          return _context2.a(2);
       }
-    }, _callee2, null, [[0, 26, 29, 32]]);
+    }, _callee2, null, [[0, 9, 10, 11]]);
   })), [onOk, onCancel, form]);
   /**
    * 描述：默认底部操作按钮
@@ -195,13 +190,13 @@ var ProDrawer = function ProDrawer(_ref) {
    */
   var defaultFooter = (0, _jsxRuntime.jsxs)("div", {
     className: "pro-drawer-footer",
-    children: [(0, _jsxRuntime.jsx)(_button.default, {
+    children: [(0, _jsxRuntime.jsx)(_antd.Button, {
       type: "primary",
       onClick: handleFinish,
       loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
       disabled: okDisabled !== null && okDisabled !== void 0 ? okDisabled : loading,
       children: okText
-    }), (0, _jsxRuntime.jsx)(_button.default, {
+    }), (0, _jsxRuntime.jsx)(_antd.Button, {
       onClick: onCancel,
       children: cancelText
     })]
@@ -229,12 +224,12 @@ var ProDrawer = function ProDrawer(_ref) {
     }
     return defaultFooter;
   };
-  return (0, _jsxRuntime.jsxs)(_drawer.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsxs)(_antd.Drawer, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     width: width,
-    open: visible,
+    open: open,
     maskClosable: maskClosable,
     placement: "right",
-    className: "pro-drawer ".concat(className !== null && className !== void 0 ? className : ''),
+    rootClassName: (0, _classnames.default)(className, 'pro-drawer'),
     closable: false,
     onClose: onCancel,
     zIndex: zIndex

package/lib/ProDrawerForm/components/ProModal/index.js

@@ -7,22 +7,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/modal/style");
-var _modal = _interopRequireDefault(require("antd/es/modal"));
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
-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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _ahooks = require("ahooks");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _reactSvg = require("react-svg");
-var _close = _interopRequireDefault(require("../../../assets/close.svg"));
+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); }
 /**
  * 弹窗组件
  */
@@ -31,7 +25,7 @@ var ProModal = function ProModal(_ref) {
   var form = _ref.form,
     title = _ref.title,
     width = _ref.width,
-    visible = _ref.visible,
+    open = _ref.open,
     footer = _ref.footer,
     isView = _ref.isView,
     maskClosable = _ref.maskClosable,
@@ -61,98 +55,100 @@ var ProModal = function ProModal(_ref) {
     'pro-modal-no-footer': noRenderFooter,
     'pro-modal-footer-shadow': height >= 450
   }]);
-  var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var values;
-    return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  var handleFinish = (0, _react.useCallback)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee() {
+    var values, _t, _t2, _t3, _t4, _t5;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
-          _context.prev = 0;
-          if (!visible) {
-            _context.next = 24;
+          _context.p = 0;
+          if (!open) {
+            _context.n = 8;
             break;
           }
-          _context.next = 4;
+          _context.n = 1;
           return form.validateFields();
-        case 4:
-          values = _context.sent;
+        case 1:
+          values = _context.v;
           if (!(okLoading !== undefined)) {
-            _context.next = 15;
+            _context.n = 5;
             break;
           }
-          _context.t0 = onOk;
-          if (!_context.t0) {
-            _context.next = 12;
+          _t = onOk;
+          if (!_t) {
+            _context.n = 3;
             break;
           }
-          _context.next = 10;
+          _context.n = 2;
           return onOk(values, form);
-        case 10:
-          _context.t1 = _context.sent;
-          _context.t0 = _context.t1 === true;
-        case 12:
-          if (!_context.t0) {
-            _context.next = 14;
+        case 2:
+          _t2 = _context.v;
+          _t = _t2 === true;
+        case 3:
+          if (!_t) {
+            _context.n = 4;
             break;
           }
           onCancel && onCancel();
-        case 14:
-          return _context.abrupt("return", true);
-        case 15:
+        case 4:
+          return _context.a(2, true);
+        case 5:
           toggleLoading(true);
-          _context.t2 = onOk;
-          if (!_context.t2) {
-            _context.next = 22;
+          _t3 = onOk;
+          if (!_t3) {
+            _context.n = 7;
             break;
           }
-          _context.next = 20;
+          _context.n = 6;
           return onOk(values, form);
-        case 20:
-          _context.t3 = _context.sent;
-          _context.t2 = _context.t3 === true;
-        case 22:
-          if (!_context.t2) {
-            _context.next = 24;
+        case 6:
+          _t4 = _context.v;
+          _t3 = _t4 === true;
+        case 7:
+          if (!_t3) {
+            _context.n = 8;
             break;
           }
           onCancel && onCancel();
-        case 24:
-          _context.next = 29;
+        case 8:
+          _context.n = 10;
           break;
-        case 26:
-          _context.prev = 26;
-          _context.t4 = _context["catch"](0);
+        case 9:
+          _context.p = 9;
+          _t5 = _context.v;
           /** 使用setTimeout确保DOM已经更新，错误标记已经渲染 */
           setTimeout(function () {
             var _ref$current2, _error$errorFields;
             var errorElement = (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.querySelector('[class*="form-item-has-error"]');
-            if (errorElement && (_context.t4 === null || _context.t4 === void 0 ? void 0 : (_error$errorFields = _context.t4.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
+            if (errorElement && (_t5 === null || _t5 === void 0 ? void 0 : (_error$errorFields = _t5.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
               errorElement.scrollIntoView({
                 behavior: 'smooth',
                 block: 'center'
               });
             }
           }, 100);
-        case 29:
-          _context.prev = 29;
+        case 10:
+          _context.p = 10;
           toggleLoading(false);
-          return _context.finish(29);
-        case 32:
-        case "end":
-          return _context.stop();
+          return _context.f(10);
+        case 11:
+          return _context.a(2);
       }
-    }, _callee, null, [[0, 26, 29, 32]]);
+    }, _callee, null, [[0, 9, 10, 11]]);
   })), [onOk, onCancel, form]);
   /**
    * 描述：默认底部操作按钮
    *
    */
   var defaultFooter = (0, _jsxRuntime.jsxs)("div", {
-    className: extraLeft ? 'pro-modal-footer' : undefined,
-    children: [extraLeft, (0, _jsxRuntime.jsxs)(_space.default, {
-      children: [(0, _jsxRuntime.jsx)(_button.default, {
+    className: (0, _classnames.default)({
+      'pro-modal-footer': extraLeft,
+      'pro-modal-footer-123': true
+    }),
+    children: [extraLeft, (0, _jsxRuntime.jsxs)(_antd.Space, {
+      children: [(0, _jsxRuntime.jsx)(_antd.Button, {
         onClick: onCancel,
         children: cancelText
-      }), (0, _jsxRuntime.jsx)(_button.default, {
+      }), (0, _jsxRuntime.jsx)(_antd.Button, {
         type: "primary",
         onClick: handleFinish,
         loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
@@ -184,20 +180,16 @@ var ProModal = function ProModal(_ref) {
     }
     return defaultFooter;
   };
-  return (0, _jsxRuntime.jsx)(_modal.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsx)(_antd.Modal, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     className: _className,
     title: title,
     width: width,
-    open: visible,
+    open: open,
     maskClosable: maskClosable,
     onCancel: onCancel,
     footer: renderFooter(),
     okText: okText,
     cancelText: cancelText,
-    closeIcon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
-      className: "close-icon",
-      src: _close.default
-    }),
     zIndex: zIndex
   }, modalProps), {}, {
     children: (0, _jsxRuntime.jsx)("div", {