From 3e6d608a2fb2ae09ca486075d4d5c462fccadea2 Mon Sep 17 00:00:00 2001 From: Netfan Date: Thu, 1 May 2025 14:09:37 +0800 Subject: [PATCH] fix: destroyOnClose incorrect default value, fixed #6092 (#6093) --- docs/src/components/common-ui/vben-drawer.md | 2 +- packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue | 2 +- packages/@core/ui-kit/popup-ui/src/drawer/use-drawer.ts | 4 +--- packages/@core/ui-kit/popup-ui/src/modal/modal.vue | 2 +- packages/@core/ui-kit/popup-ui/src/modal/use-modal.ts | 4 +--- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/docs/src/components/common-ui/vben-drawer.md b/docs/src/components/common-ui/vben-drawer.md index 0eedb01b..b66bd3a0 100644 --- a/docs/src/components/common-ui/vben-drawer.md +++ b/docs/src/components/common-ui/vben-drawer.md @@ -78,7 +78,7 @@ const [Drawer, drawerApi] = useVbenDrawer({ | --- | --- | --- | --- | | appendToMain | 是否挂载到内容区域(默认挂载到body) | `boolean` | `false` | | connectedComponent | 连接另一个Modal组件 | `Component` | - | -| destroyOnClose | 关闭时销毁`connectedComponent` | `boolean` | `false` | +| destroyOnClose | 关闭时销毁 | `boolean` | `false` | | title | 标题 | `string\|slot` | - | | titleTooltip | 标题提示信息 | `string\|slot` | - | | description | 描述信息 | `string\|slot` | - | diff --git a/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue b/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue index 25069979..ebd98fa2 100644 --- a/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue +++ b/packages/@core/ui-kit/popup-ui/src/drawer/drawer.vue @@ -35,7 +35,7 @@ interface Props extends DrawerProps { const props = withDefaults(defineProps(), { appendToMain: false, closeIconPlacement: 'right', - destroyOnClose: true, + destroyOnClose: false, drawerApi: undefined, submitting: false, zIndex: 1000, diff --git a/packages/@core/ui-kit/popup-ui/src/drawer/use-drawer.ts b/packages/@core/ui-kit/popup-ui/src/drawer/use-drawer.ts index 59bccbd8..21b11c56 100644 --- a/packages/@core/ui-kit/popup-ui/src/drawer/use-drawer.ts +++ b/packages/@core/ui-kit/popup-ui/src/drawer/use-drawer.ts @@ -21,9 +21,7 @@ import VbenDrawer from './drawer.vue'; const USER_DRAWER_INJECT_KEY = Symbol('VBEN_DRAWER_INJECT'); -const DEFAULT_DRAWER_PROPS: Partial = { - destroyOnClose: true, -}; +const DEFAULT_DRAWER_PROPS: Partial = {}; export function setDefaultDrawerProps(props: Partial) { Object.assign(DEFAULT_DRAWER_PROPS, props); diff --git a/packages/@core/ui-kit/popup-ui/src/modal/modal.vue b/packages/@core/ui-kit/popup-ui/src/modal/modal.vue index 1f3e5468..7fbc2be1 100644 --- a/packages/@core/ui-kit/popup-ui/src/modal/modal.vue +++ b/packages/@core/ui-kit/popup-ui/src/modal/modal.vue @@ -34,7 +34,7 @@ interface Props extends ModalProps { const props = withDefaults(defineProps(), { appendToMain: false, - destroyOnClose: true, + destroyOnClose: false, modalApi: undefined, }); diff --git a/packages/@core/ui-kit/popup-ui/src/modal/use-modal.ts b/packages/@core/ui-kit/popup-ui/src/modal/use-modal.ts index e2c709d0..cafd7b87 100644 --- a/packages/@core/ui-kit/popup-ui/src/modal/use-modal.ts +++ b/packages/@core/ui-kit/popup-ui/src/modal/use-modal.ts @@ -17,9 +17,7 @@ import VbenModal from './modal.vue'; const USER_MODAL_INJECT_KEY = Symbol('VBEN_MODAL_INJECT'); -const DEFAULT_MODAL_PROPS: Partial = { - destroyOnClose: true, -}; +const DEFAULT_MODAL_PROPS: Partial = {}; export function setDefaultModalProps(props: Partial) { Object.assign(DEFAULT_MODAL_PROPS, props);