@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

package/es/ProDownload/utils.js

@@ -1,14 +1,12 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import "antd/es/message/style";
-import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _get from "lodash/get";
-import _isFunction from "lodash/isFunction";
 /* eslint-disable no-empty */
 /* eslint-disable prefer-promise-reject-errors */
-import locale from '../locale';
+import { message } from 'antd';
+import { isFunction, get } from 'lodash';
+import locale from "../locale";
 var stringify = function stringify(data) {
   var result = '';
   if (data && Object.keys(data).length) {
@@ -44,6 +42,9 @@ export function BlobMakeFile(_ref) {
   ele.click();
   doc.body.removeChild(ele);
 }
+
+// base64转Blob
+
 export var convertBase64ToBlob = function convertBase64ToBlob(base64, fileType) {
   var _atob$match;
   var slice = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1024;
@@ -55,6 +56,7 @@ export var convertBase64ToBlob = function convertBase64ToBlob(base64, fileType)
     type: fileType
   });
 };
+
 /**
  * 从Content-Disposition获取filename
  * @param contentDisposition string
@@ -71,9 +73,10 @@ export function getFilenameFromContentDisposition(contentDisposition) {
   }
   return null;
 }
+
 // 发起请求获取下载文件
 export var DownloadRequest = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
     var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, onError, config, res, fileBlob, data, contentFileName;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -100,8 +103,8 @@ export var DownloadRequest = /*#__PURE__*/function () {
             config.headers = _objectSpread(_objectSpread({}, config.headers), headers);
           }
           _context2.next = 7;
-          return fetch(url, config).then(/*#__PURE__*/function () {
-            var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
+          return fetch(url, config).then( /*#__PURE__*/function () {
+            var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
               var _data, errorMsg;
               return _regeneratorRuntime().wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {
@@ -115,7 +118,7 @@ export var DownloadRequest = /*#__PURE__*/function () {
                       _context.next = 7;
                       break;
                     }
-                    _message.error("".concat(locale.ProDownload.errorMessage));
+                    message.error("".concat(locale.ProDownload.errorMessage));
                     return _context.abrupt("return", Promise.reject("".concat(locale.ProDownload.errorMessage)));
                   case 7:
                     if (!((_data === null || _data === void 0 ? void 0 : _data.status) > 200 || (_data === null || _data === void 0 ? void 0 : _data.code) === 401)) {
@@ -123,11 +126,11 @@ export var DownloadRequest = /*#__PURE__*/function () {
                       break;
                     }
                     errorMsg = (_data === null || _data === void 0 ? void 0 : _data.message) || (_data === null || _data === void 0 ? void 0 : _data.msg);
-                    errorMsg && _message.error(errorMsg);
+                    errorMsg && message.error(errorMsg);
                     onError && onError(_data);
                     return _context.abrupt("return", Promise.reject(errorMsg));
                   case 12:
-                    if (!_isFunction(transformResponse)) {
+                    if (!isFunction(transformResponse)) {
                       _context.next = 14;
                       break;
                     }
@@ -160,12 +163,12 @@ export var DownloadRequest = /*#__PURE__*/function () {
           res = _context2.sent;
           data = null;
           contentFileName = '';
-          if (_isFunction(transformResponse)) {
+          if (isFunction(transformResponse)) {
             data = res;
           } else {
             // 优先获取Content-Disposition中filename
             contentFileName = getFilenameFromContentDisposition(res.headers.get('Content-Disposition'));
-            data = _get(res, 'data');
+            data = get(res, 'data');
           }
           if (!data) {
             _context2.next = 15;
@@ -181,7 +184,7 @@ export var DownloadRequest = /*#__PURE__*/function () {
           fileBlob = _context2.sent;
         case 18:
           // 完成回调
-          onFinish === null || onFinish === void 0 ? void 0 : onFinish(res, params);
+          onFinish === null || onFinish === void 0 || onFinish(res, params);
           BlobMakeFile({
             blob: fileBlob,
             fileName: fileName || contentFileName

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

@@ -1,29 +1,27 @@
-import "antd/es/drawer/style";
-import _Drawer from "antd/es/drawer";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-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 _isArray from "lodash/isArray";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Button, Drawer, Modal } from 'antd';
 import React, { useCallback, useState, useRef, useEffect } from 'react';
 import { useScroll } from 'ahooks';
+import classNames from 'classnames';
+import { isArray } from 'lodash';
 import { ReactSVG } from 'react-svg';
-import closeSvg from '../../../assets/close.svg';
-import locale from '../../../locale';
+import closeSvg from "../../../assets/close.svg";
+import locale from "../../../locale";
+
 /**
  * 抽屉组件
  */
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var ProDrawer = function ProDrawer(_ref) {
   var form = _ref.form,
     title = _ref.title,
     width = _ref.width,
     footer = _ref.footer,
-    visible = _ref.visible,
+    open = _ref.open,
     isView = _ref.isView,
     maskClosable = _ref.maskClosable,
     isConfirmClose = _ref.isConfirmClose,
@@ -51,27 +49,30 @@ var ProDrawer = function ProDrawer(_ref) {
     initialSnapshot = _useState4[0],
     setInitialSnapshot = _useState4[1];
   var noRenderFooter = isView || footer === false || footer === null;
-  // 使用 useEffect 在 visible 变更时延迟捕获 初始DOM 快照
+
+  // 使用 useEffect 在 open 变更时延迟捕获 初始DOM 快照
   useEffect(function () {
-    if (visible) {
+    if (open) {
       // 延迟到下一个事件循环，确保 Drawer 已经渲染
       var timeoutId = setTimeout(function () {
         if (ref.current) {
           setInitialSnapshot(ref.current.innerHTML); // 捕获 DOM 快照
         }
       }, 100); // 使用 setTimeout 让 DOM 渲染完成后再执行
+
       return function () {
         return clearTimeout(timeoutId);
       }; // 清理定时器
     }
     setInitialSnapshot('');
-  }, [visible]); // 当 visible 变化时执行
+  }, [open]); // 当 open 变化时执行
+
   // 快照对比
   var compareSnapshots = function compareSnapshots() {
     if (!ref.current) return false;
     return ref.current.innerHTML === initialSnapshot;
   };
-  var onConfirm = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var onConfirm = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -80,12 +81,12 @@ var ProDrawer = function ProDrawer(_ref) {
           if (isView || !isConfirmClose || compareSnapshots()) {
             onCancel && onCancel();
           } else if (!modalRef.current) {
-            modalRef.current = _Modal.confirm(_objectSpread({
+            modalRef.current = Modal.confirm(_objectSpread({
               className: 'width430',
-              title: locale === null || locale === void 0 ? void 0 : (_locale$ProDrawerForm = locale.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.isSureClose,
-              okText: locale === null || locale === void 0 ? void 0 : (_locale$ProDrawerForm2 = locale.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.confirm,
-              cancelText: locale === null || locale === void 0 ? void 0 : (_locale$ProDrawerForm3 = locale.ProDrawerForm) === null || _locale$ProDrawerForm3 === void 0 ? void 0 : _locale$ProDrawerForm3.cancel,
-              content: locale === null || locale === void 0 ? void 0 : (_locale$ProDrawerForm4 = locale.ProDrawerForm) === null || _locale$ProDrawerForm4 === void 0 ? void 0 : _locale$ProDrawerForm4.secondTipsWhenSave,
+              title: locale === null || locale === void 0 || (_locale$ProDrawerForm = locale.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.isSureClose,
+              okText: locale === null || locale === void 0 || (_locale$ProDrawerForm2 = locale.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.confirm,
+              cancelText: locale === null || locale === void 0 || (_locale$ProDrawerForm3 = locale.ProDrawerForm) === null || _locale$ProDrawerForm3 === void 0 ? void 0 : _locale$ProDrawerForm3.cancel,
+              content: locale === null || locale === void 0 || (_locale$ProDrawerForm4 = locale.ProDrawerForm) === null || _locale$ProDrawerForm4 === void 0 ? void 0 : _locale$ProDrawerForm4.secondTipsWhenSave,
               onOk: function onOk() {
                 onCancel && onCancel();
               },
@@ -100,13 +101,13 @@ var ProDrawer = function ProDrawer(_ref) {
       }
     }, _callee);
   })), [onCancel, modalRef.current, ref.current]);
-  var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+  var handleFinish = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var values;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.prev = 0;
-          if (!visible) {
+          if (!open) {
             _context2.next = 24;
             break;
           }
@@ -164,7 +165,7 @@ var ProDrawer = function ProDrawer(_ref) {
           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 && _context2.t4 !== null && _context2.t4 !== void 0 && (_error$errorFields = _context2.t4.errorFields) !== null && _error$errorFields !== void 0 && _error$errorFields.length) {
               errorElement.scrollIntoView({
                 behavior: 'smooth',
                 block: 'center'
@@ -181,19 +182,20 @@ var ProDrawer = function ProDrawer(_ref) {
       }
     }, _callee2, null, [[0, 26, 29, 32]]);
   })), [onOk, onCancel, form]);
+
   /**
    * 描述：默认底部操作按钮
    *
    */
-  var defaultFooter = _jsxs("div", {
+  var defaultFooter = /*#__PURE__*/_jsxs("div", {
     className: "pro-drawer-footer",
-    children: [_jsx(_Button, {
+    children: [/*#__PURE__*/_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, {
+    }), /*#__PURE__*/_jsx(Button, {
       onClick: onCancel,
       children: cancelText
     })]
@@ -202,17 +204,17 @@ var ProDrawer = function ProDrawer(_ref) {
     if (noRenderFooter) {
       return null;
     }
-    if (/*#__PURE__*/React.isValidElement(footer)) {
-      return _jsx("div", {
+    if ( /*#__PURE__*/React.isValidElement(footer)) {
+      return /*#__PURE__*/_jsx("div", {
         className: "pro-drawer-footer",
         children: footer
       });
     }
-    if (_isArray(footer) && (footer === null || footer === void 0 ? void 0 : footer.length)) {
-      return _jsx("div", {
+    if (isArray(footer) && footer !== null && footer !== void 0 && footer.length) {
+      return /*#__PURE__*/_jsx("div", {
         className: "pro-drawer-footer",
         children: footer.map(function (item) {
-          if (/*#__PURE__*/React.isValidElement(item)) {
+          if ( /*#__PURE__*/React.isValidElement(item)) {
             return item;
           }
           return false;
@@ -221,27 +223,27 @@ var ProDrawer = function ProDrawer(_ref) {
     }
     return defaultFooter;
   };
-  return _jsxs(_Drawer, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsxs(Drawer, _objectSpread(_objectSpread({
     width: width,
-    open: visible,
+    open: open,
     maskClosable: maskClosable,
     placement: "right",
-    className: "pro-drawer ".concat(className !== null && className !== void 0 ? className : ''),
+    rootClassName: classNames(className, 'pro-drawer'),
     closable: false,
     onClose: onCancel,
     zIndex: zIndex
   }, drawerProps), {}, {
-    children: [_jsx("div", {
+    children: [/*#__PURE__*/_jsx("div", {
       className: "pro-drawer-close",
       onClick: onConfirm,
-      children: _jsx(ReactSVG, {
+      children: /*#__PURE__*/_jsx(ReactSVG, {
         className: "close-icon",
         src: closeSvg
       })
-    }), title ? _jsx("div", {
+    }), title ? /*#__PURE__*/_jsx("div", {
       className: "pro-drawer-title ".concat(top > 0 ? 'pro-drawer-scrolling' : ''),
       children: title
-    }) : null, _jsx("div", {
+    }) : null, /*#__PURE__*/_jsx("div", {
       ref: ref,
       className: "pro-drawer-content",
       style: {

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

@@ -1,20 +1,14 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/modal/style";
-import _Modal from "antd/es/modal";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import "antd/es/space/style";
-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 _isArray from "lodash/isArray";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useCallback, useState, useRef } from 'react';
+import { Space, Button, Modal } from 'antd';
 import { useScroll, useSize } from 'ahooks';
 import classnames from 'classnames';
-import { ReactSVG } from 'react-svg';
-import closeSvg from '../../../assets/close.svg';
+import { isArray } from 'lodash';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * 弹窗组件
  */
@@ -23,7 +17,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,
@@ -53,13 +47,13 @@ var ProModal = function ProModal(_ref) {
     'pro-modal-no-footer': noRenderFooter,
     'pro-modal-footer-shadow': height >= 450
   }]);
-  var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var handleFinish = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var values;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
-          if (!visible) {
+          if (!open) {
             _context.next = 24;
             break;
           }
@@ -117,7 +111,7 @@ var ProModal = function ProModal(_ref) {
           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 && _context.t4 !== null && _context.t4 !== void 0 && (_error$errorFields = _context.t4.errorFields) !== null && _error$errorFields !== void 0 && _error$errorFields.length) {
               errorElement.scrollIntoView({
                 behavior: 'smooth',
                 block: 'center'
@@ -134,17 +128,21 @@ var ProModal = function ProModal(_ref) {
       }
     }, _callee, null, [[0, 26, 29, 32]]);
   })), [onOk, onCancel, form]);
+
   /**
    * 描述：默认底部操作按钮
    *
    */
-  var defaultFooter = _jsxs("div", {
-    className: extraLeft ? 'pro-modal-footer' : undefined,
-    children: [extraLeft, _jsxs(_Space, {
-      children: [_jsx(_Button, {
+  var defaultFooter = /*#__PURE__*/_jsxs("div", {
+    className: classnames({
+      'pro-modal-footer': extraLeft,
+      'pro-modal-footer-123': true
+    }),
+    children: [extraLeft, /*#__PURE__*/_jsxs(Space, {
+      children: [/*#__PURE__*/_jsx(Button, {
         onClick: onCancel,
         children: cancelText
-      }), _jsx(_Button, {
+      }), /*#__PURE__*/_jsx(Button, {
         type: "primary",
         onClick: handleFinish,
         loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
@@ -157,17 +155,17 @@ var ProModal = function ProModal(_ref) {
     if (noRenderFooter) {
       return null;
     }
-    if (/*#__PURE__*/React.isValidElement(footer)) {
-      return _jsx("div", {
+    if ( /*#__PURE__*/React.isValidElement(footer)) {
+      return /*#__PURE__*/_jsx("div", {
         className: "pro-drawer-footer",
         children: footer
       });
     }
-    if (_isArray(footer) && (footer === null || footer === void 0 ? void 0 : footer.length)) {
-      return _jsx("div", {
+    if (isArray(footer) && footer !== null && footer !== void 0 && footer.length) {
+      return /*#__PURE__*/_jsx("div", {
         className: "pro-drawer-footer",
         children: footer.map(function (item) {
-          if (/*#__PURE__*/React.isValidElement(item)) {
+          if ( /*#__PURE__*/React.isValidElement(item)) {
             return item;
           }
           return false;
@@ -176,23 +174,19 @@ var ProModal = function ProModal(_ref) {
     }
     return defaultFooter;
   };
-  return _jsx(_Modal, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
     className: _className,
     title: title,
     width: width,
-    open: visible,
+    open: open,
     maskClosable: maskClosable,
     onCancel: onCancel,
     footer: renderFooter(),
     okText: okText,
     cancelText: cancelText,
-    closeIcon: _jsx(ReactSVG, {
-      className: "close-icon",
-      src: closeSvg
-    }),
     zIndex: zIndex
   }, modalProps), {}, {
-    children: _jsx("div", {
+    children: /*#__PURE__*/_jsx("div", {
       ref: ref,
       children: children
     })

package/es/ProDrawerForm/components/index.js

@@ -1,2 +1,2 @@
-export { default as ProDrawer } from './ProDrawer';
-export { default as ProModal } from './ProModal';
+export { default as ProDrawer } from "./ProDrawer";
+export { default as ProModal } from "./ProModal";

package/es/ProDrawerForm/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { FormInstance } from 'antd/es/form/Form';
+import { ProDrawerFormType } from './propsType';
 export declare const useProDrawerFormContext: () => any;
-declare const ProDrawerForm: React.ForwardRefExoticComponent<import("./propsType").ProDrawerFormPropsType & React.RefAttributes<FormInstance<any>>>;
+declare const ProDrawerForm: React.ForwardRefExoticComponent<ProDrawerFormType & React.RefAttributes<FormInstance<any>>>;
 export default ProDrawerForm;

package/es/ProDrawerForm/index.js

@@ -1,20 +1,19 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _locale$ProDrawerForm3;
+import React, { createContext, forwardRef, useContext, useImperativeHandle, useMemo } from 'react';
+import { ProDrawer, ProModal } from "./components";
+import ProForm from "../ProForm";
+import { transformBySize } from "./utils";
+import locale from "../locale";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createContext, forwardRef, useContext, useImperativeHandle, useMemo } from 'react';
-import { ProDrawer, ProModal } from './components';
-import ProForm from '../ProForm';
-import { transformBySize } from './utils';
-import locale from '../locale';
 var ProDrawerFormContext = /*#__PURE__*/createContext(null);
 export var useProDrawerFormContext = function useProDrawerFormContext() {
   return useContext(ProDrawerFormContext);
 };
 var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
   var _okText, _locale$ProDrawerForm, _locale$ProDrawerForm2;
-  var visible = props.visible,
-    showType = props.showType,
+  var showType = props.showType,
     okText = props.okText,
     isView = props.isView;
   var open = props.open,
@@ -28,12 +27,12 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
     children = props.children;
   showType = mode || showType;
   isView = isView || disabled;
-  okText = (_okText = okText) !== null && _okText !== void 0 ? _okText : showType === 'Drawer' ? locale === null || locale === void 0 ? void 0 : (_locale$ProDrawerForm = locale.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.save : locale === null || locale === void 0 ? void 0 : (_locale$ProDrawerForm2 = locale.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.confirm;
-  visible = open !== null && open !== void 0 ? open : visible;
+  okText = (_okText = okText) !== null && _okText !== void 0 ? _okText : showType === 'Drawer' ? locale === null || locale === void 0 || (_locale$ProDrawerForm = locale.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.save : locale === null || locale === void 0 || (_locale$ProDrawerForm2 = locale.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.confirm;
   var width = props.width;
   if (!width && size) {
     width = transformBySize(size);
   }
+
   // 强转string 类型
   if (!Number.isNaN(+width)) {
     width = "".concat(width, "px");
@@ -43,30 +42,31 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
     form = _ProForm$useForm2[0];
   var handleCancel = function handleCancel() {
     onCloseClean && form.resetFields();
-    onCancel === null || onCancel === void 0 ? void 0 : onCancel();
+    onCancel === null || onCancel === void 0 || onCancel();
   };
+
   // 暴露form实例给用户
   useImperativeHandle(ref, function () {
     return form;
   });
-  var Com = useMemo(function () {
+  var DrawerModal = useMemo(function () {
     return {
       Drawer: ProDrawer,
       Modal: ProModal
     }[showType];
   }, [showType]);
-  return _jsx(ProDrawerFormContext.Provider, {
+  return /*#__PURE__*/_jsx(ProDrawerFormContext.Provider, {
     value: {
       source: 'ProDrawerForm'
     },
-    children: visible ? _jsx(Com, _objectSpread(_objectSpread({}, props), {}, {
+    children: open ? /*#__PURE__*/_jsx(DrawerModal, _objectSpread(_objectSpread({}, props), {}, {
       isView: isView,
-      visible: visible,
+      open: open,
       form: form,
       width: width,
       okText: okText,
       onCancel: handleCancel,
-      children: children || _jsx(ProForm, _objectSpread({
+      children: children || /*#__PURE__*/_jsx(ProForm, _objectSpread({
         form: form,
         disabled: isView,
         footer: false
@@ -80,7 +80,7 @@ ProDrawerForm.defaultProps = {
   isConfirmClose: true,
   onCloseClean: true,
   maskClosable: false,
-  cancelText: locale === null || locale === void 0 ? void 0 : (_locale$ProDrawerForm3 = locale.ProDrawerForm) === null || _locale$ProDrawerForm3 === void 0 ? void 0 : _locale$ProDrawerForm3.cancel,
+  cancelText: locale === null || locale === void 0 || (_locale$ProDrawerForm3 = locale.ProDrawerForm) === null || _locale$ProDrawerForm3 === void 0 ? void 0 : _locale$ProDrawerForm3.cancel,
   proFormProps: {}
 };
 export default ProDrawerForm;

package/es/ProDrawerForm/propsType.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import type { ModalProps, DrawerProps, FormInstance } from 'antd';
+import type { ModalProps, DrawerProps, FormInstance, ModalFuncProps } from 'antd';
 import type { ProFormType } from '../ProForm/propsType';
 /**
  * 抽屉尺寸类型定义
@@ -11,17 +11,11 @@ export type DrawerSizeType = DrawerSizePropsType;
  */
 export type ShowTypePropsType = 'Modal' | 'Drawer';
 export type ShowType = ShowTypePropsType;
-/**
- * 为了保持向后兼容，保留原有接口名称
- * @deprecated ProDrawerFormType
- */
-export interface ProDrawerFormPropsType {
+export interface ProDrawerFormType {
     /** @name 内部form实例 */
     form?: FormInstance<any>;
     /** @name 自定义className */
     className?: string;
-    /** @name 控制显示隐藏（兼容旧版API） */
-    visible?: ModalProps['open'] | DrawerProps['open'];
     /** @name 控制显示隐藏 */
     open: ModalProps['open'] | DrawerProps['open'];
     /** @name 标题 */
@@ -33,7 +27,7 @@ export interface ProDrawerFormPropsType {
     /** @name 是否查看模式 */
     isView?: boolean | undefined;
     /** @name 宽度 */
-    width?: ModalProps['width'] | DrawerProps['width'];
+    width?: string | number;
     /** @name 取消按钮文字 */
     cancelText?: ModalProps['cancelText'];
     /** @name 确认按钮文字 */
@@ -62,7 +56,7 @@ export interface ProDrawerFormPropsType {
      * @name 关闭时二次确认弹框的属性
      * @description 只对Drawer的类型有效
      */
-    isConfirmCloseModalProps?: ModalProps;
+    isConfirmCloseModalProps?: Omit<ModalFuncProps, 'content' | 'onOk' | 'onCancel'>;
     /**
      * @name 底部默认取消按钮事件
      * @returns 返回Promise或布尔值可控制弹窗关闭行为
@@ -90,14 +84,12 @@ export interface ProDrawerFormPropsType {
     proFormProps?: Omit<ProFormType, 'form'>;
     /**
      * @name 弹框的属性
-     * @description 不支持'visible'，请使用全局的visible/open
      */
-    modalProps?: Omit<ModalProps, 'visible'>;
+    modalProps?: ModalProps;
     /**
      * @name 抽屉的属性
-     * @description 不支持'visible'，请使用全局的visible/open
      */
-    drawerProps?: Omit<DrawerProps, 'visible'>;
+    drawerProps?: DrawerProps;
     /**
      * @name 关闭时弹框或者抽屉是否清空formValues
      */
@@ -107,7 +99,4 @@ export interface ProDrawerFormPropsType {
     /** @name z轴层级 */
     zIndex?: number;
 }
-/**
- * 抽屉表单属性类型定义
- */
-export type ProDrawerFormType = ProDrawerFormPropsType;
+export type ProDrawerFormPropsType = ProDrawerFormType;