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

package/es/FormsProvider/index.d.ts

@@ -11,5 +11,8 @@ export declare const FormsContext: React.Context<Forms>;
 export declare const useForms: () => Forms;
 /** 获取所有表单实例 */
 export declare const useContextForms: () => Forms;
-declare const FormsProvider: React.FC;
+interface FormsProviderProps {
+    children?: React.ReactNode;
+}
+declare const FormsProvider: React.FC<FormsProviderProps>;
 export default FormsProvider;

package/es/ProAction/components/CheckModalContent/index.js

@@ -1,12 +1,3 @@
-/*
- * @Author: za-xuwenli xuwenli@zhongan.io
- * @Date: 2025-02-17 11:49:02
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2025-05-29 13:55:34
- * @FilePath: /zat-wjs-pro-product-web/src/components/CheckModalContent/index.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";

package/es/ProAction/index.js

@@ -1,13 +1,10 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/popconfirm/style";
-import _Popconfirm from "antd/es/popconfirm";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
 import { useSetState } from 'ahooks';
+import { Form, Popconfirm } from 'antd';
 import { isFunction } from 'lodash';
 import CheckModalContent from "./components/CheckModalContent";
 import { ProDrawerForm } from "../index";
@@ -20,7 +17,7 @@ var ProAction = props => {
   var _config$, _config$2, _locale$ProAction2, _config$index;
   var children = props.children,
     config = props.config;
-  var _Form$useForm = _Form.useForm(),
+  var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var _useSetState = useSetState({
@@ -191,7 +188,7 @@ var ProAction = props => {
     return TargetComponent;
   };
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? /*#__PURE__*/_jsx(_Popconfirm, {
+    children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? /*#__PURE__*/_jsx(Popconfirm, {
       onConfirm: () => onActionRun(0, []),
       title: ((_config$2 = config[0]) === null || _config$2 === void 0 ? void 0 : _config$2.title) || (locale === null || locale === void 0 || (_locale$ProAction2 = locale.ProAction) === null || _locale$ProAction2 === void 0 ? void 0 : _locale$ProAction2.defaultTitle),
       children: children

package/es/ProAction/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-action-error-modal {
   .ant-modal-content {

package/es/ProConfigProvider/index.d.ts

@@ -1,6 +1,6 @@
 import React, { FC } from 'react';
 import { FormInstance } from 'antd';
-import 'moment/locale/zh-cn';
+import 'dayjs/locale/zh-cn';
 import type { PropSelectType } from '../ProSelect/propsType';
 import type { ProModalSelectType } from '../ProForm/components/combination/ProModalSelect/propsType';
 import type { ProCascaderType } from '../ProForm/components/combination/ProCascader/propsType';
@@ -21,14 +21,31 @@ interface ConfigContext {
 export declare const ProConfigContext: React.Context<ConfigContext>;
 export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
-type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic' | 'setWithLocal';
-interface Actions {
-    type: ActionsType;
+type Actions = {
+    type: 'setFormRef';
+    name: string;
+    value: FormInstance;
+} | {
+    type: 'deleteFormRef';
+    name: string;
+} | {
+    type: 'set';
+    payload: ProConfigState;
+} | {
+    type: 'setProEnum';
+    payload: Record<string, any>;
+} | {
+    type: 'setProEnumDic';
+    key: string;
     payload: any;
-}
+} | {
+    type: 'setWithLocal';
+    payload: ProConfigState;
+};
 export declare const ProConfigProvider: FC<{
     value?: ProConfigState;
     locale?: string;
     onSuccess?: (data: any, params: any) => void;
+    children?: React.ReactNode;
 }>;
 export default ProConfigProvider;

package/es/ProConfigProvider/index.js

@@ -1,15 +1,15 @@
-import "antd/es/config-provider/style";
-import _ConfigProvider from "antd/es/config-provider";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { useContext, useEffect, useReducer } from 'react';
+import { ConfigProvider } from 'antd';
 import zhCN from 'antd/es/locale/zh_CN';
 import enUS from 'antd/es/locale/en_US';
-import 'moment/locale/zh-cn';
+import 'dayjs/locale/zh-cn';
 import merge from 'lodash/merge';
 import useEnumRequest from "../ProEnum/hooks/useEnumRequest";
 import useFrequentEnumRequest from "../ProEnum/hooks/useFrequentEnumRequest";
 import { setLanguage } from "../locale";
+import { ThemeProvider, useTheme } from "../ProThemeTools/context/ThemeContext";
 import { jsx as _jsx } from "react/jsx-runtime";
 var initialState = {
   ProEnum: {
@@ -37,25 +37,34 @@ export var ProConfigContext = /*#__PURE__*/React.createContext({
 
 // eslint-disable-next-line no-redeclare
 export function useProConfig(name) {
-  var config = useContext(ProConfigContext);
-  return name ? config.state[name] : config;
+  var _useContext = useContext(ProConfigContext),
+    state = _useContext.state,
+    dispatch = _useContext.dispatch;
+  if (name) {
+    return state[name];
+  }
+  return {
+    state,
+    dispatch
+  };
 }
-var antdLangMap = {
-  'zh-CN': zhCN,
-  // zh-CN 中文
-  'en-US': enUS // en-US
-};
 var reducer = (state, action) => {
   var _state$ProEnum;
   switch (action.type) {
+    case 'setFormRef':
+      return _objectSpread(_objectSpread({}, state), {}, {
+        forms: _objectSpread(_objectSpread({}, state.forms), {}, {
+          [action.name]: action.value
+        })
+      });
+    case 'deleteFormRef':
+      return _objectSpread(_objectSpread({}, state), {}, {
+        forms: _objectSpread(_objectSpread({}, state.forms), {}, {
+          [action.name]: undefined
+        })
+      });
     case 'set':
       return _objectSpread(_objectSpread({}, state), action.payload);
-    // 设置的值会被存入localStorage
-    case 'setWithLocal':
-      {
-        var _state = merge({}, state, action.payload);
-        return _state;
-      }
     case 'setProEnum':
       return _objectSpread(_objectSpread({}, state), {}, {
         ProEnum: _objectSpread(_objectSpread({}, state.ProEnum), action.payload)
@@ -66,10 +75,29 @@ var reducer = (state, action) => {
           dics: _objectSpread(_objectSpread({}, ((_state$ProEnum = state.ProEnum) === null || _state$ProEnum === void 0 ? void 0 : _state$ProEnum.dataSource) || {}), action.payload)
         })
       });
+    case 'setWithLocal':
+      // 本地配置合并
+      localStorage.setItem('localConfig', JSON.stringify(action.payload));
+      return _objectSpread({}, state);
     default:
       return _objectSpread({}, state);
   }
 };
+
+// 内部组件，用于监听主题变化并应用到 ConfigProvider
+var ThemeAwareConfigProvider = _ref => {
+  var locale = _ref.locale,
+    children = _ref.children;
+  var _useTheme = useTheme(),
+    themeState = _useTheme.state;
+  return /*#__PURE__*/_jsx(ConfigProvider, {
+    locale: locale,
+    theme: themeState.antdConfig,
+    children: /*#__PURE__*/_jsx("div", {
+      children: children
+    })
+  });
+};
 export var ProConfigProvider = props => {
   var _props$value, _props$value2, _props$value3, _props$value4;
   var _useReducer = useReducer(reducer, initialState),
@@ -93,28 +121,32 @@ export var ProConfigProvider = props => {
   // 如果是用户切换了语言那么优先使用用户切换的，否则从缓存中取用户语言，在取默认值
   var lang = (state === null || state === void 0 ? void 0 : state.locale) || cacheLang || (props === null || props === void 0 ? void 0 : props.locale);
   useEffect(() => {
-    if (lang) setLanguage(lang);
+    setLanguage(lang);
   }, [lang]);
   useEffect(() => {
     if (enumRes !== null && enumRes !== void 0 && enumRes.data) {
       (props === null || props === void 0 ? void 0 : props.onSuccess) && (props === null || props === void 0 ? void 0 : props.onSuccess(enumRes === null || enumRes === void 0 ? void 0 : enumRes.data, enumRes === null || enumRes === void 0 ? void 0 : enumRes.params));
     }
   }, [enumRes === null || enumRes === void 0 ? void 0 : enumRes.loading]);
-
+  var antdLangMap = {
+    'zh-CN': zhCN,
+    // zh-CN 中文
+    'en-US': enUS // en-US
+  };
   // 处理频繁枚举的成功回调
   useEffect(() => {
     if (frequentEnumRes !== null && frequentEnumRes !== void 0 && frequentEnumRes.data) {
       (props === null || props === void 0 ? void 0 : props.onSuccess) && (props === null || props === void 0 ? void 0 : props.onSuccess(frequentEnumRes === null || frequentEnumRes === void 0 ? void 0 : frequentEnumRes.data, frequentEnumRes === null || frequentEnumRes === void 0 ? void 0 : frequentEnumRes.params));
     }
   }, [frequentEnumRes === null || frequentEnumRes === void 0 ? void 0 : frequentEnumRes.loading]);
-  return /*#__PURE__*/_jsx(ProConfigContext.Provider, {
-    value: {
-      state: merge(state, props.value),
-      dispatch
-    },
-    children: /*#__PURE__*/_jsx(_ConfigProvider, {
-      locale: antdLangMap[lang],
-      children: /*#__PURE__*/_jsx("div", {
+  return /*#__PURE__*/_jsx(ThemeProvider, {
+    children: /*#__PURE__*/_jsx(ProConfigContext.Provider, {
+      value: {
+        state: merge(state, props.value),
+        dispatch
+      },
+      children: /*#__PURE__*/_jsx(ThemeAwareConfigProvider, {
+        locale: antdLangMap[lang],
         children: props.children
       })
     })

package/es/ProDownload/index.js

@@ -1,5 +1,3 @@
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
@@ -7,6 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["source", "action", "url", "method", "params", "fileName", "children", "onFinish", "beforeDownload", "className", "transformResponse", "onError"];
 import { useSetState } from 'ahooks';
+import { Button } from 'antd';
 import classNames from 'classnames';
 import _, { isFunction } from 'lodash';
 import { BlobMakeFile, DownloadRequest } from "./utils";
@@ -128,7 +127,7 @@ var ProDownload = props => {
   var cls = classNames(className, {
     'pro-download': true
   });
-  return /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
     className: cls,
     onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var res;

package/es/ProDownload/style/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-download {
 

package/es/ProDownload/utils.js

@@ -1,10 +1,9 @@
 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 _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 /* eslint-disable no-empty */
 /* eslint-disable prefer-promise-reject-errors */
+import { message } from 'antd';
 import { isFunction, get } from 'lodash';
 import locale from "../locale";
 var stringify = data => {
@@ -118,7 +117,7 @@ export var DownloadRequest = /*#__PURE__*/function () {
                       _context.next = 7;
                       break;
                     }
-                    _message.error(`${locale.ProDownload.errorMessage}`);
+                    message.error(`${locale.ProDownload.errorMessage}`);
                     return _context.abrupt("return", Promise.reject(`${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)) {
@@ -126,7 +125,7 @@ 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:

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

@@ -1,15 +1,11 @@
-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 { 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";
@@ -25,7 +21,7 @@ var 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,
@@ -54,9 +50,9 @@ var ProDrawer = _ref => {
     setInitialSnapshot = _useState4[1];
   var noRenderFooter = isView || footer === false || footer === null;
 
-  // 使用 useEffect 在 visible 变更时延迟捕获 初始DOM 快照
+  // 使用 useEffect 在 open 变更时延迟捕获 初始DOM 快照
   useEffect(() => {
-    if (visible) {
+    if (open) {
       // 延迟到下一个事件循环，确保 Drawer 已经渲染
       var timeoutId = setTimeout(() => {
         if (ref.current) {
@@ -67,7 +63,7 @@ var ProDrawer = _ref => {
       return () => clearTimeout(timeoutId); // 清理定时器
     }
     setInitialSnapshot('');
-  }, [visible]); // 当 visible 变化时执行
+  }, [open]); // 当 open 变化时执行
 
   // 快照对比
   var compareSnapshots = () => {
@@ -83,7 +79,7 @@ var 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 || (_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,
@@ -109,7 +105,7 @@ var ProDrawer = _ref => {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.prev = 0;
-          if (!visible) {
+          if (!open) {
             _context2.next = 24;
             break;
           }
@@ -191,13 +187,13 @@ var ProDrawer = _ref => {
    */
   var defaultFooter = /*#__PURE__*/_jsxs("div", {
     className: "pro-drawer-footer",
-    children: [/*#__PURE__*/_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
-    }), /*#__PURE__*/_jsx(_Button, {
+    }), /*#__PURE__*/_jsx(Button, {
       onClick: onCancel,
       children: cancelText
     })]
@@ -225,12 +221,12 @@ var ProDrawer = _ref => {
     }
     return defaultFooter;
   };
-  return /*#__PURE__*/_jsxs(_Drawer, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsxs(Drawer, _objectSpread(_objectSpread({
     width: width,
-    open: visible,
+    open: open,
     maskClosable: maskClosable,
     placement: "right",
-    className: `pro-drawer ${className !== null && className !== void 0 ? className : ''}`,
+    rootClassName: classNames(className, 'pro-drawer'),
     closable: false,
     onClose: onCancel,
     zIndex: zIndex

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

@@ -1,19 +1,12 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/modal/style";
-import _Modal from "antd/es/modal";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 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 React, { useCallback, useState, useRef } from 'react';
+import { Space, Button, Modal } from 'antd';
 import { useScroll, useSize } from 'ahooks';
 import classnames from 'classnames';
 import { isArray } from 'lodash';
-import { ReactSVG } from 'react-svg';
-import closeSvg from "../../../assets/close.svg";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 /**
@@ -24,7 +17,7 @@ var 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,
@@ -60,7 +53,7 @@ var ProModal = _ref => {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.prev = 0;
-          if (!visible) {
+          if (!open) {
             _context.next = 24;
             break;
           }
@@ -141,12 +134,15 @@ var ProModal = _ref => {
    *
    */
   var defaultFooter = /*#__PURE__*/_jsxs("div", {
-    className: extraLeft ? 'pro-modal-footer' : undefined,
-    children: [extraLeft, /*#__PURE__*/_jsxs(_Space, {
-      children: [/*#__PURE__*/_jsx(_Button, {
+    className: classnames({
+      'pro-modal-footer': extraLeft,
+      'pro-modal-footer-123': true
+    }),
+    children: [extraLeft, /*#__PURE__*/_jsxs(Space, {
+      children: [/*#__PURE__*/_jsx(Button, {
         onClick: onCancel,
         children: cancelText
-      }), /*#__PURE__*/_jsx(_Button, {
+      }), /*#__PURE__*/_jsx(Button, {
         type: "primary",
         onClick: handleFinish,
         loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
@@ -178,20 +174,16 @@ var ProModal = _ref => {
     }
     return defaultFooter;
   };
-  return /*#__PURE__*/_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: /*#__PURE__*/_jsx(ReactSVG, {
-      className: "close-icon",
-      src: closeSvg
-    }),
     zIndex: zIndex
   }, modalProps), {}, {
     children: /*#__PURE__*/_jsx("div", {

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,6 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _locale$ProDrawerForm3;
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["open", "mode", "size", "disabled", "isView", "form", "proFormProps", "onCancel", "onCloseClean", "children", "okText", "isConfirmClose", "maskClosable", "cancelText"];
 import React, { createContext, forwardRef, useContext, useImperativeHandle, useMemo } from 'react';
 import { ProDrawer, ProModal } from "./components";
 import ProForm from "../ProForm";
@@ -10,25 +11,32 @@ import { jsx as _jsx } from "react/jsx-runtime";
 var ProDrawerFormContext = /*#__PURE__*/createContext(null);
 export var useProDrawerFormContext = () => useContext(ProDrawerFormContext);
 var ProDrawerForm = /*#__PURE__*/forwardRef((props, ref) => {
-  var _okText, _locale$ProDrawerForm, _locale$ProDrawerForm2;
-  var visible = props.visible,
-    showType = props.showType,
-    okText = props.okText,
-    isView = props.isView;
+  var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3;
   var open = props.open,
-    mode = props.mode,
-    size = props.size,
+    _props$mode = props.mode,
+    mode = _props$mode === void 0 ? 'Drawer' : _props$mode,
+    _props$size = props.size,
+    size = _props$size === void 0 ? 'middle' : _props$size,
     disabled = props.disabled,
+    isView = props.isView,
     originalForm = props.form,
-    proFormProps = props.proFormProps,
+    _props$proFormProps = props.proFormProps,
+    proFormProps = _props$proFormProps === void 0 ? {} : _props$proFormProps,
     onCancel = props.onCancel,
-    onCloseClean = props.onCloseClean,
-    children = props.children;
-  showType = mode || showType;
-  isView = isView || disabled;
-  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;
-  visible = open !== null && open !== void 0 ? open : visible;
-  var width = props.width;
+    _props$onCloseClean = props.onCloseClean,
+    onCloseClean = _props$onCloseClean === void 0 ? true : _props$onCloseClean,
+    children = props.children,
+    okText = props.okText,
+    _props$isConfirmClose = props.isConfirmClose,
+    isConfirmClose = _props$isConfirmClose === void 0 ? true : _props$isConfirmClose,
+    _props$maskClosable = props.maskClosable,
+    maskClosable = _props$maskClosable === void 0 ? false : _props$maskClosable,
+    _props$cancelText = props.cancelText,
+    cancelText = _props$cancelText === void 0 ? locale === null || locale === void 0 || (_locale$ProDrawerForm = locale.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.cancel : _props$cancelText,
+    restProps = _objectWithoutProperties(props, _excluded);
+  var nextIsView = isView || disabled;
+  var nextOkText = okText !== null && okText !== void 0 ? okText : mode === 'Drawer' ? locale === null || locale === void 0 || (_locale$ProDrawerForm2 = locale.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.save : locale === null || locale === void 0 || (_locale$ProDrawerForm3 = locale.ProDrawerForm) === null || _locale$ProDrawerForm3 === void 0 ? void 0 : _locale$ProDrawerForm3.confirm;
+  var width = restProps.width;
   if (!width && size) {
     width = transformBySize(size);
   }
@@ -47,38 +55,32 @@ var ProDrawerForm = /*#__PURE__*/forwardRef((props, ref) => {
 
   // 暴露form实例给用户
   useImperativeHandle(ref, () => form);
-  var Com = useMemo(() => {
+  var DrawerModal = useMemo(() => {
     return {
       Drawer: ProDrawer,
       Modal: ProModal
-    }[showType];
-  }, [showType]);
+    }[mode];
+  }, [mode]);
   return /*#__PURE__*/_jsx(ProDrawerFormContext.Provider, {
     value: {
       source: 'ProDrawerForm'
     },
-    children: visible ? /*#__PURE__*/_jsx(Com, _objectSpread(_objectSpread({}, props), {}, {
-      isView: isView,
-      visible: visible,
+    children: open ? /*#__PURE__*/_jsx(DrawerModal, _objectSpread(_objectSpread({}, restProps), {}, {
+      isView: nextIsView,
+      open: open,
       form: form,
       width: width,
-      okText: okText,
+      okText: nextOkText,
       onCancel: handleCancel,
+      isConfirmClose: isConfirmClose,
+      maskClosable: maskClosable,
+      cancelText: cancelText,
       children: children || /*#__PURE__*/_jsx(ProForm, _objectSpread({
         form: form,
-        disabled: isView,
+        disabled: nextIsView,
         footer: false
       }, proFormProps))
     })) : null
   });
 });
-ProDrawerForm.defaultProps = {
-  showType: 'Drawer',
-  size: 'middle',
-  isConfirmClose: true,
-  onCloseClean: true,
-  maskClosable: false,
-  cancelText: locale === null || locale === void 0 || (_locale$ProDrawerForm3 = locale.ProDrawerForm) === null || _locale$ProDrawerForm3 === void 0 ? void 0 : _locale$ProDrawerForm3.cancel,
-  proFormProps: {}
-};
 export default ProDrawerForm;