From 00f7ab34efc17bf383eecf7bf81844b874ac1a8d Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期二, 03 十二月 2024 11:15:09 +0800 Subject: [PATCH] fix 修复 修复默认关闭Tags-Views时,内链页面打不开 --- src/layout/components/AppMain.vue | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index b9a1564..9f8d706 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,10 +1,13 @@ <template> <section class="app-main"> - <router-view v-slot="{ Component, route }" :key="$route.fullPath"> - <transition :enter-active-class="animante" mode="out-in"> - <keep-alive :include="tagsViewStore.cachedViews"> + <router-view v-slot="{ Component, route }"> + <transition v-if="!route.meta.noCache" :enter-active-class="animante" mode="out-in"> + <keep-alive v-if="!route.meta.noCache" :include="tagsViewStore.cachedViews"> <component :is="Component" v-if="!route.meta.link" :key="route.path" /> </keep-alive> + </transition> + <transition v-if="route.meta.noCache" :enter-active-class="animante" mode="out-in"> + <component :is="Component" v-if="!route.meta.link && route.meta.noCache" :key="route.path" /> </transition> </router-view> <iframe-toggle /> @@ -17,6 +20,7 @@ import IframeToggle from './IframeToggle/index.vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; +const route = useRoute(); const tagsViewStore = useTagsViewStore(); // 闅忔満鍔ㄧ敾闆嗗悎 @@ -24,7 +28,7 @@ const animationEnable = ref(useSettingsStore().animationEnable); watch( () => useSettingsStore().animationEnable, - (val) => { + (val: boolean) => { animationEnable.value = val; if (val) { animante.value = proxy?.animate.animateList[Math.round(Math.random() * proxy?.animate.animateList.length)] as string; @@ -34,6 +38,20 @@ }, { immediate: true } ); + +onMounted(() => { + addIframe() +}) + +watch((route) => { + addIframe() +}) + +function addIframe() { + if (route.meta.link) { + useTagsViewStore().addIframeView(route) + } +} </script> <style lang="scss" scoped> -- Gitblit v1.9.3