fix: keepAlive not working for popup appendToMain (#5666)

* 修复弹窗和抽屉 `appendToMain` 时且启用`keepAlive` 时未能正确缓存的问题
This commit is contained in:
Netfan 2025-03-06 22:22:45 +08:00 committed by GitHub
parent 31a6ab59fb
commit f86c9f90ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 23 additions and 4 deletions

View File

@ -127,7 +127,9 @@ function handleFocusOutside(e: Event) {
} }
const getAppendTo = computed(() => { const getAppendTo = computed(() => {
return appendToMain.value ? `#${ELEMENT_ID_MAIN_CONTENT}` : undefined; return appendToMain.value
? `#${ELEMENT_ID_MAIN_CONTENT}>div:not(.absolute)>div`
: undefined;
}); });
</script> </script>
<template> <template>

View File

@ -172,7 +172,9 @@ function handleFocusOutside(e: Event) {
e.stopPropagation(); e.stopPropagation();
} }
const getAppendTo = computed(() => { const getAppendTo = computed(() => {
return appendToMain.value ? `#${ELEMENT_ID_MAIN_CONTENT}` : undefined; return appendToMain.value
? `#${ELEMENT_ID_MAIN_CONTENT}>div:not(.absolute)>div`
: undefined;
}); });
</script> </script>
<template> <template>

View File

@ -213,6 +213,7 @@ const routes: RouteRecordRaw[] = [
component: () => import('#/views/examples/modal/index.vue'), component: () => import('#/views/examples/modal/index.vue'),
meta: { meta: {
icon: 'system-uicons:window-content', icon: 'system-uicons:window-content',
keepAlive: true,
title: $t('examples.modal.title'), title: $t('examples.modal.title'),
}, },
}, },
@ -222,6 +223,7 @@ const routes: RouteRecordRaw[] = [
component: () => import('#/views/examples/drawer/index.vue'), component: () => import('#/views/examples/drawer/index.vue'),
meta: { meta: {
icon: 'iconoir:drawer', icon: 'iconoir:drawer',
keepAlive: true,
title: $t('examples.drawer.title'), title: $t('examples.drawer.title'),
}, },
}, },

View File

@ -1,7 +1,11 @@
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue';
import { useVbenDrawer } from '@vben/common-ui'; import { useVbenDrawer } from '@vben/common-ui';
import { message } from 'ant-design-vue'; import { Input, message } from 'ant-design-vue';
const value = ref('');
const [Drawer, drawerApi] = useVbenDrawer({ const [Drawer, drawerApi] = useVbenDrawer({
onCancel() { onCancel() {
@ -17,5 +21,6 @@ const [Drawer, drawerApi] = useVbenDrawer({
<Drawer append-to-main title="基础抽屉示例" title-tooltip="标题提示内容"> <Drawer append-to-main title="基础抽屉示例" title-tooltip="标题提示内容">
<template #extra> extra </template> <template #extra> extra </template>
本抽屉指定在内容区域打开 本抽屉指定在内容区域打开
<Input v-model="value" placeholder="KeepAlive测试" />
</Drawer> </Drawer>
</template> </template>

View File

@ -13,6 +13,7 @@ import FormDrawerDemo from './form-drawer-demo.vue';
import inContentDemo from './in-content-demo.vue'; import inContentDemo from './in-content-demo.vue';
import SharedDataDemo from './shared-data-demo.vue'; import SharedDataDemo from './shared-data-demo.vue';
defineOptions({ name: 'DrawerExample' });
const [BaseDrawer, baseDrawerApi] = useVbenDrawer({ const [BaseDrawer, baseDrawerApi] = useVbenDrawer({
// //
connectedComponent: BaseDemo, connectedComponent: BaseDemo,

View File

@ -1,9 +1,12 @@
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue';
import { useVbenModal } from '@vben/common-ui'; import { useVbenModal } from '@vben/common-ui';
import { message } from 'ant-design-vue'; import { Input, message } from 'ant-design-vue';
const [Modal, modalApi] = useVbenModal({ const [Modal, modalApi] = useVbenModal({
destroyOnClose: false,
onCancel() { onCancel() {
modalApi.close(); modalApi.close();
}, },
@ -12,6 +15,7 @@ const [Modal, modalApi] = useVbenModal({
// modalApi.close(); // modalApi.close();
}, },
}); });
const value = ref();
</script> </script>
<template> <template>
<Modal <Modal
@ -21,5 +25,6 @@ const [Modal, modalApi] = useVbenModal({
title-tooltip="标题提示内容" title-tooltip="标题提示内容"
> >
此弹窗指定在内容区域打开 此弹窗指定在内容区域打开
<Input v-model="value" placeholder="KeepAlive测试" />
</Modal> </Modal>
</template> </template>

View File

@ -14,6 +14,8 @@ import InContentModalDemo from './in-content-demo.vue';
import NestedDemo from './nested-demo.vue'; import NestedDemo from './nested-demo.vue';
import SharedDataDemo from './shared-data-demo.vue'; import SharedDataDemo from './shared-data-demo.vue';
defineOptions({ name: 'ModalExample' });
const [BaseModal, baseModalApi] = useVbenModal({ const [BaseModal, baseModalApi] = useVbenModal({
// //
connectedComponent: BaseDemo, connectedComponent: BaseDemo,