@zat-design/sisyphus-react 3.0.16-beta.2 → 3.1.4

package/es/ProDownload/{DownloadHelper.js → utils.js}

@@ -6,6 +6,7 @@ import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 /* eslint-disable no-empty */
 /* eslint-disable prefer-promise-reject-errors */
+import { isFunction, get } from 'lodash';
 var stringify = function stringify(data) {
   var result = '';
   if (data && Object.keys(data).length) {
@@ -41,14 +42,39 @@ export function BlobMakeFile(_ref) {
   ele.click();
   doc.body.removeChild(ele);
 }
+export var convertBase64ToBlob = function convertBase64ToBlob(base64, fileType) {
+  var _atob$match;
+  var slice = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1024;
+  return new Blob((_atob$match = atob(base64).match(new RegExp("([\\s\\S]{".concat(slice, "})|([\\s\\S]{1,").concat(slice, "})"), 'g'))) === null || _atob$match === void 0 ? void 0 : _atob$match.map(function (item) {
+    return new Uint8Array(item.split('').map(function (s, i) {
+      return item.charCodeAt(i);
+    }));
+  }), {
+    type: fileType
+  });
+};
+/**
+ * 从Content-Disposition获取filename
+ * @param contentDisposition string
+ * @returns string
+ */
+export function getFilenameFromContentDisposition(contentDisposition) {
+  var pattern = /filename=([^;]+)/i;
+  var matches = pattern.exec(contentDisposition);
+  if (matches && matches[1]) {
+    // remove double quotes if filename is quoted
+    return matches[1].replace(/^"?(.+?)"?$/, '$1');
+  }
+  return null;
+}
 // 发起请求获取下载文件
 export var DownloadRequest = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-    var url, _ref2$method, method, payload, headers, config;
+    var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, config, res, fileBlob, data, contentFileName;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          url = _ref2.url, _ref2$method = _ref2.method, method = _ref2$method === void 0 ? 'post' : _ref2$method, payload = _ref2.payload, headers = _ref2.headers;
+          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;
           config = {
             method: method,
             credentials: 'include',
@@ -57,21 +83,22 @@ export var DownloadRequest = /*#__PURE__*/function () {
               accept: 'application/json;charset=UTF-8'
             },
             body: null
-          }; // method = post and payload, add it to the fetch request
-          if (method === 'post' && payload) {
-            config.body = JSON.stringify(payload);
+          }; // method = post and params, add it to the fetch request
+          if (method === 'post' && params) {
+            config.body = JSON.stringify(params);
           }
           // 处理get请求入参
-          if (method === 'get' && payload) {
-            url = "".concat(url).concat(url.indexOf('?') !== -1 ? '&' : '?').concat(stringify(payload));
+          if (method === 'get' && params) {
+            url = "".concat(url).concat(url.indexOf('?') !== -1 ? '&' : '?').concat(stringify(params));
           }
           // if custom headers need to be set for the specific request
           if (headers && _typeof(headers) === 'object' && Object.keys(headers).length > 0) {
             config.headers = _objectSpread(_objectSpread({}, config.headers), headers);
           }
-          return _context2.abrupt("return", fetch(url, config).then( /*#__PURE__*/function () {
+          _context2.next = 7;
+          return fetch(url, config).then( /*#__PURE__*/function () {
             var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
-              var data, errorMsg;
+              var _data, errorMsg;
               return _regeneratorRuntime().wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {
                   case 0:
@@ -79,39 +106,83 @@ export var DownloadRequest = /*#__PURE__*/function () {
                     _context.next = 3;
                     return response.clone().json();
                   case 3:
-                    data = _context.sent;
-                    if (!((data === null || data === void 0 ? void 0 : data.status) > 200 || (data === null || data === void 0 ? void 0 : data.code) === 401)) {
-                      _context.next = 8;
+                    _data = _context.sent;
+                    if (_data) {
+                      _context.next = 7;
+                      break;
+                    }
+                    _message.error('请求失败！');
+                    return _context.abrupt("return", Promise.reject('请求失败！'));
+                  case 7:
+                    if (!((_data === null || _data === void 0 ? void 0 : _data.status) > 200 || (_data === null || _data === void 0 ? void 0 : _data.code) === 401)) {
+                      _context.next = 11;
                       break;
                     }
-                    errorMsg = (data === null || data === void 0 ? void 0 : data.message) || (data === null || data === void 0 ? void 0 : data.msg);
+                    errorMsg = (_data === null || _data === void 0 ? void 0 : _data.message) || (_data === null || _data === void 0 ? void 0 : _data.msg);
                     errorMsg && _message.error(errorMsg);
                     return _context.abrupt("return", Promise.reject(errorMsg));
-                  case 8:
-                    Promise.resolve(data);
-                    _context.next = 15;
-                    break;
                   case 11:
-                    _context.prev = 11;
+                    if (!isFunction(transformResponse)) {
+                      _context.next = 13;
+                      break;
+                    }
+                    return _context.abrupt("return", Promise.resolve(transformResponse(_data)));
+                  case 13:
+                    Promise.resolve(_data);
+                    _context.next = 20;
+                    break;
+                  case 16:
+                    _context.prev = 16;
                     _context.t0 = _context["catch"](0);
                     if (!response.ok) {
-                      _context.next = 15;
+                      _context.next = 20;
                       break;
                     }
                     return _context.abrupt("return", Promise.resolve(response));
-                  case 15:
+                  case 20:
                     return _context.abrupt("return", Promise.reject('请求失败！'));
-                  case 16:
+                  case 21:
                   case "end":
                     return _context.stop();
                 }
-              }, _callee, null, [[0, 11]]);
+              }, _callee, null, [[0, 16]]);
             }));
             return function (_x2) {
               return _ref4.apply(this, arguments);
             };
-          }()));
-        case 6:
+          }());
+        case 7:
+          res = _context2.sent;
+          data = null;
+          contentFileName = '';
+          if (isFunction(transformResponse)) {
+            data = res;
+          } else {
+            // 优先获取Content-Disposition中filename
+            contentFileName = getFilenameFromContentDisposition(res.headers.get('Content-Disposition'));
+            data = get(res, 'data');
+          }
+          if (!data) {
+            _context2.next = 15;
+            break;
+          }
+          fileBlob = convertBase64ToBlob(data);
+          _context2.next = 18;
+          break;
+        case 15:
+          _context2.next = 17;
+          return res.blob();
+        case 17:
+          fileBlob = _context2.sent;
+        case 18:
+          // 完成回调
+          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();
       }
@@ -120,53 +191,4 @@ export var DownloadRequest = /*#__PURE__*/function () {
   return function DownloadRequest(_x) {
     return _ref3.apply(this, arguments);
   };
-}();
-export function postDownloadFile(_ref5) {
-  var url = _ref5.url,
-    params = _ref5.params,
-    cb = _ref5.cb;
-  if (!url) {
-    return false;
-  }
-  // 删除重复创建的Form
-  var downloadForm = document.querySelector('#downloadForm');
-  if (downloadForm) {
-    document.body.removeChild(downloadForm);
-  }
-  try {
-    var form = document.createElement('form');
-    form.action = url;
-    form.id = 'downloadForm';
-    form.style = 'display:none';
-    form.method = 'post';
-    form.target = '_blank';
-    // eslint-disable-next-line no-restricted-syntax
-    for (var key in params) {
-      if (Object.prototype.hasOwnProperty.call(params, key)) {
-        var newInput = document.createElement('input');
-        newInput.type = 'hidden';
-        newInput.name = key;
-        newInput.value = params[key];
-        form.appendChild(newInput);
-      }
-    }
-    document.body.appendChild(form);
-    form.submit();
-    setTimeout(function () {
-      cb && cb();
-    }, 3000);
-  } catch (e) {
-    console.warn(e);
-  }
-}
-export var convertBase64ToBlob = function convertBase64ToBlob(base64, fileType) {
-  var _atob$match;
-  var slice = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1024;
-  return new Blob((_atob$match = atob(base64).match(new RegExp("([\\s\\S]{".concat(slice, "})|([\\s\\S]{1,").concat(slice, "})"), 'g'))) === null || _atob$match === void 0 ? void 0 : _atob$match.map(function (item) {
-    return new Uint8Array(item.split('').map(function (s, i) {
-      return item.charCodeAt(i);
-    }));
-  }), {
-    type: fileType
-  });
-};
+}();

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

@@ -8,6 +8,7 @@ import "antd/es/modal/style";
 import _Modal from "antd/es/modal";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useCallback, useState, useRef } from 'react';
 import { useScroll } from 'ahooks';
 import { isArray } from 'lodash';
@@ -22,7 +23,7 @@ var ProDrawer = function ProDrawer(_ref) {
     width = _ref.width,
     footer = _ref.footer,
     visible = _ref.visible,
-    disabled = _ref.disabled,
+    isView = _ref.isView,
     maskClosable = _ref.maskClosable,
     isConfirmClose = _ref.isConfirmClose,
     isConfirmCloseModalProps = _ref.isConfirmCloseModalProps,
@@ -43,12 +44,12 @@ var ProDrawer = function ProDrawer(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     toggleLoading = _useState2[1];
-  var noRenderFooter = disabled || footer === false || footer === null;
+  var noRenderFooter = isView || footer === false || footer === null;
   var onConfirm = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (disabled || !isConfirmClose) {
+          if (isView || !isConfirmClose) {
             onCancel && onCancel();
           } else if (!modalRef.current) {
             modalRef.current = _Modal.confirm(_objectSpread({
@@ -146,38 +147,43 @@ var ProDrawer = function ProDrawer(_ref) {
    * 描述：默认底部操作按钮
    *
    */
-  var defaultFooter = /*#__PURE__*/React.createElement("div", {
-    className: "pro-drawer-footer"
-  }, /*#__PURE__*/React.createElement(_Button, {
-    type: "primary",
-    onClick: handleFinish,
-    loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
-    disabled: okDisabled !== null && okDisabled !== void 0 ? okDisabled : loading
-  }, okText), /*#__PURE__*/React.createElement(_Button, {
-    onClick: onCancel
-  }, cancelText));
+  var defaultFooter = _jsxs("div", {
+    className: "pro-drawer-footer",
+    children: [_jsx(_Button, {
+      type: "primary",
+      onClick: handleFinish,
+      loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
+      disabled: okDisabled !== null && okDisabled !== void 0 ? okDisabled : loading,
+      children: okText
+    }), _jsx(_Button, {
+      onClick: onCancel,
+      children: cancelText
+    })]
+  });
   var renderFooter = function renderFooter() {
     if (noRenderFooter) {
       return null;
     }
     if ( /*#__PURE__*/React.isValidElement(footer)) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "pro-drawer-footer"
-      }, footer);
+      return _jsx("div", {
+        className: "pro-drawer-footer",
+        children: footer
+      });
     }
     if (isArray(footer) && (footer === null || footer === void 0 ? void 0 : footer.length)) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "pro-drawer-footer"
-      }, footer.map(function (item) {
-        if ( /*#__PURE__*/React.isValidElement(item)) {
-          return item;
-        }
-        return false;
-      }));
+      return _jsx("div", {
+        className: "pro-drawer-footer",
+        children: footer.map(function (item) {
+          if ( /*#__PURE__*/React.isValidElement(item)) {
+            return item;
+          }
+          return false;
+        })
+      });
     }
     return defaultFooter;
   };
-  return /*#__PURE__*/React.createElement(_Drawer, _objectSpread({
+  return _jsxs(_Drawer, _objectSpread(_objectSpread({
     width: width,
     open: visible,
     maskClosable: maskClosable,
@@ -185,22 +191,27 @@ var ProDrawer = function ProDrawer(_ref) {
     className: "pro-drawer ".concat(className !== null && className !== void 0 ? className : ''),
     closable: false,
     onClose: onCancel
-  }, drawerProps), /*#__PURE__*/React.createElement("div", {
-    className: "pro-drawer-close",
-    onClick: onConfirm
-  }, /*#__PURE__*/React.createElement(ReactSVG, {
-    className: "close-icon",
-    src: closeSvg
-  })), title ? /*#__PURE__*/React.createElement("div", {
-    className: "pro-drawer-title ".concat(top > 0 ? 'pro-drawer-scrolling' : '')
-  }, title) : null, /*#__PURE__*/React.createElement("div", {
-    ref: ref,
-    className: "pro-drawer-content",
-    style: {
-      marginTop: title ? 64 : 0,
-      paddingBottom: noRenderFooter ? 0 : 64,
-      height: "calc(100% - ".concat(title ? 64 : 0, "px)")
-    }
-  }, children), renderFooter());
+  }, drawerProps), {}, {
+    children: [_jsx("div", {
+      className: "pro-drawer-close",
+      onClick: onConfirm,
+      children: _jsx(ReactSVG, {
+        className: "close-icon",
+        src: closeSvg
+      })
+    }), title ? _jsx("div", {
+      className: "pro-drawer-title ".concat(top > 0 ? 'pro-drawer-scrolling' : ''),
+      children: title
+    }) : null, _jsx("div", {
+      ref: ref,
+      className: "pro-drawer-content",
+      style: {
+        marginTop: title ? 64 : 0,
+        paddingBottom: noRenderFooter ? 0 : 64,
+        height: "calc(100% - ".concat(title ? 64 : 0, "px)")
+      },
+      children: children
+    }), renderFooter()]
+  }));
 };
 export default ProDrawer;

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

@@ -8,8 +8,10 @@ import _Space from "antd/es/space";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useCallback, useState, useRef } from 'react';
-import { useScroll } from 'ahooks';
+import { useScroll, useSize } from 'ahooks';
+import classnames from 'classnames';
 import { isArray } from 'lodash';
 import { ReactSVG } from 'react-svg';
 import closeSvg from '../../../assets/close.svg';
@@ -23,7 +25,7 @@ var ProModal = function ProModal(_ref) {
     width = _ref.width,
     visible = _ref.visible,
     footer = _ref.footer,
-    disabled = _ref.disabled,
+    isView = _ref.isView,
     maskClosable = _ref.maskClosable,
     okText = _ref.okText,
     cancelText = _ref.cancelText,
@@ -38,11 +40,18 @@ var ProModal = function ProModal(_ref) {
   var ref = useRef(null);
   var _ref2 = useScroll((_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.parentNode) || {},
     top = _ref2.top;
-  var noRenderFooter = disabled || footer === false || footer === null;
+  var _ref3 = useSize(ref) || {},
+    height = _ref3.height;
+  var noRenderFooter = isView || footer === false || footer === null;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     toggleLoading = _useState2[1];
+  var _className = classnames(['pro-modal', className, {
+    'pro-modal-scrolling': top > 0,
+    'pro-modal-no-footer': noRenderFooter,
+    'pro-modal-footer-shadow': height >= 450
+  }]);
   var handleFinish = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var values, _error$errorFields, _error$errorFields$;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -118,39 +127,46 @@ var ProModal = function ProModal(_ref) {
    * 描述：默认底部操作按钮
    *
    */
-  var defaultFooter = /*#__PURE__*/React.createElement("div", {
-    className: extraLeft ? 'pro-modal-footer' : undefined
-  }, extraLeft, /*#__PURE__*/React.createElement(_Space, null, /*#__PURE__*/React.createElement(_Button, {
-    onClick: onCancel
-  }, cancelText), /*#__PURE__*/React.createElement(_Button, {
-    type: "primary",
-    onClick: handleFinish,
-    loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
-    disabled: okDisabled !== null && okDisabled !== void 0 ? okDisabled : loading
-  }, okText)));
+  var defaultFooter = _jsxs("div", {
+    className: extraLeft ? 'pro-modal-footer' : undefined,
+    children: [extraLeft, _jsxs(_Space, {
+      children: [_jsx(_Button, {
+        onClick: onCancel,
+        children: cancelText
+      }), _jsx(_Button, {
+        type: "primary",
+        onClick: handleFinish,
+        loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
+        disabled: okDisabled !== null && okDisabled !== void 0 ? okDisabled : loading,
+        children: okText
+      })]
+    })]
+  });
   var renderFooter = function renderFooter() {
     if (noRenderFooter) {
       return null;
     }
     if ( /*#__PURE__*/React.isValidElement(footer)) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "pro-drawer-footer"
-      }, footer);
+      return _jsx("div", {
+        className: "pro-drawer-footer",
+        children: footer
+      });
     }
     if (isArray(footer) && (footer === null || footer === void 0 ? void 0 : footer.length)) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "pro-drawer-footer"
-      }, footer.map(function (item) {
-        if ( /*#__PURE__*/React.isValidElement(item)) {
-          return item;
-        }
-        return false;
-      }));
+      return _jsx("div", {
+        className: "pro-drawer-footer",
+        children: footer.map(function (item) {
+          if ( /*#__PURE__*/React.isValidElement(item)) {
+            return item;
+          }
+          return false;
+        })
+      });
     }
     return defaultFooter;
   };
-  return /*#__PURE__*/React.createElement(_Modal, _objectSpread({
-    className: "pro-modal ".concat(top > 0 ? 'pro-modal-scrolling' : '', " ").concat(className !== null && className !== void 0 ? className : ''),
+  return _jsx(_Modal, _objectSpread(_objectSpread({
+    className: _className,
     title: title,
     width: width,
     open: visible,
@@ -160,12 +176,15 @@ var ProModal = function ProModal(_ref) {
     okText: okText,
     cancelText: cancelText,
     centered: true,
-    closeIcon: /*#__PURE__*/React.createElement(ReactSVG, {
+    closeIcon: _jsx(ReactSVG, {
       className: "close-icon",
       src: closeSvg
     })
-  }, modalProps), /*#__PURE__*/React.createElement("div", {
-    ref: ref
-  }, children));
+  }, modalProps), {}, {
+    children: _jsx("div", {
+      ref: ref,
+      children: children
+    })
+  }));
 };
 export default ProModal;

package/es/ProDrawerForm/index.js

@@ -1,21 +1,27 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
 import { ProDrawer, ProModal } from './components';
 import ProForm from '../ProForm';
 import { transformBySize } from './utils';
 var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
-  var visible = props.visible;
-  var open = props.open,
+  var _okText;
+  var visible = props.visible,
     showType = props.showType,
+    okText = props.okText,
+    isView = props.isView;
+  var open = props.open,
+    mode = props.mode,
     size = props.size,
     disabled = props.disabled,
     originalForm = props.form,
     proFormProps = props.proFormProps,
     onCancel = props.onCancel,
     children = props.children;
+  showType = mode || showType;
+  isView = isView || disabled;
+  okText = (_okText = okText) !== null && _okText !== void 0 ? _okText : showType === 'Drawer' ? '保存' : '确定';
   visible = open !== null && open !== void 0 ? open : visible;
   var width = props.width;
   if (!width && size) {
@@ -25,9 +31,9 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
   if (!Number.isNaN(+width)) {
     width = "".concat(width, "px");
   }
-  var _Form$useForm = _Form.useForm(originalForm),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    form = _Form$useForm2[0];
+  var _ProForm$useForm = ProForm.useForm(originalForm),
+    _ProForm$useForm2 = _slicedToArray(_ProForm$useForm, 1),
+    form = _ProForm$useForm2[0];
   var handleCancel = function handleCancel() {
     form.resetFields();
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
@@ -42,23 +48,41 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
       Modal: ProModal
     }[showType];
   }, [showType]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, visible ? /*#__PURE__*/React.createElement(Com, _objectSpread(_objectSpread({}, props), {}, {
-    visible: visible,
-    form: form,
-    width: width,
-    onCancel: handleCancel
-  }), children || /*#__PURE__*/React.createElement(ProForm, _objectSpread({
-    form: form,
-    disabled: disabled,
-    footer: false
-  }, proFormProps))) : null);
+  var removeStyle = function removeStyle() {
+    var styleTags = document.getElementsByTagName('style');
+    for (var i = 0; i < styleTags.length; i++) {
+      var rcUtilKey = styleTags[i].getAttribute('rc-util-key');
+      if ((rcUtilKey === null || rcUtilKey === void 0 ? void 0 : rcUtilKey.indexOf('rc-util-locker')) === 0) {
+        styleTags[i].remove();
+      }
+    }
+  };
+  useEffect(function () {
+    if (!visible) {
+      removeStyle();
+    }
+  }, [visible]);
+  return _jsx(_Fragment, {
+    children: visible ? _jsx(Com, _objectSpread(_objectSpread({}, props), {}, {
+      isView: isView,
+      visible: visible,
+      form: form,
+      width: width,
+      okText: okText,
+      onCancel: handleCancel,
+      children: children || _jsx(ProForm, _objectSpread({
+        form: form,
+        disabled: isView,
+        footer: false
+      }, proFormProps))
+    })) : null
+  });
 });
 ProDrawerForm.defaultProps = {
   showType: 'Drawer',
   size: 'middle',
   isConfirmClose: true,
   maskClosable: false,
-  okText: '保存',
   cancelText: '取消',
   proFormProps: {}
 };

package/es/ProDrawerForm/propsType.d.ts

@@ -21,6 +21,8 @@ export interface ProDrawerFormPropsType {
     maskClosable?: ModalProps['maskClosable'] | DrawerProps['maskClosable'];
     /** @name 禁止选项 */
     disabled?: boolean | undefined;
+    /** @name 是否查看模式 */
+    isView?: boolean | undefined;
     /** @name 宽度 */
     width?: ModalProps['width'] | DrawerProps['width'];
     /**
@@ -39,8 +41,10 @@ export interface ProDrawerFormPropsType {
      * @name 确认按钮disabled
      */
     okDisabled?: boolean;
-    /** @name 显示方式 */
+    /** @name 显示方式 (废弃) */
     showType?: ShowTypePropsType;
+    /** @name 显示方式 */
+    mode?: ShowTypePropsType;
     /** @name 尺寸 */
     size?: DrawerSizePropsType;
     /**
@@ -61,11 +65,11 @@ export interface ProDrawerFormPropsType {
     /**
      * @name 底部默认取消按钮事件
      */
-    onCancel?: () => Promise<boolean | void> | boolean | void;
+    onCancel?: () => Promise<boolean | void | unknown> | boolean | void | unknown;
     /**
      * @name 底部默认确定按钮事件
      */
-    onOk?: (values?: any, form?: FormInstance) => Promise<boolean | void> | boolean | void;
+    onOk?: (values?: any, form?: FormInstance) => Promise<boolean | void | unknown> | boolean | void | unknown;
     /**
      * @name 底部自定义按钮配置
      */