From f95f6e8390c355bd601849de26b338bb64c97b90 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: 星期五, 07 六月 2024 21:38:17 +0800 Subject: [PATCH] update 优化审批按钮判断 --- src/layout/components/AppMain.vue | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 8a73232..d634935 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -2,9 +2,12 @@ <section class="app-main"> <router-view v-slot="{ Component, route }"> <transition :enter-active-class="animante" mode="out-in"> - <keep-alive :include="tagsViewStore.cachedViews"> - <component v-if="!route.meta.link" :is="Component" :key="route.path" /> - </keep-alive> + <div> + <keep-alive :include="tagsViewStore.cachedViews" v-if="!route.meta.noCache"> + <component v-if="!route.meta.link" :is="Component" :key="route.path" /> + </keep-alive> + <component v-if="!route.meta.link && route.meta.noCache" :is="Component" :key="route.path" /> + </div> </transition> </router-view> <iframe-toggle /> @@ -12,24 +15,28 @@ </template> <script setup name="AppMain" lang="ts"> -import useTagsViewStore from '@/store/modules/tagsView'; import useSettingsStore from '@/store/modules/settings'; -import IframeToggle from './IframeToggle/index.vue' -import { ComponentInternalInstance } from "vue"; +import useTagsViewStore from '@/store/modules/tagsView'; + +import IframeToggle from './IframeToggle/index.vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const tagsViewStore = useTagsViewStore(); // 闅忔満鍔ㄧ敾闆嗗悎 const animante = ref<string>(''); const animationEnable = ref(useSettingsStore().animationEnable); -watch(()=> useSettingsStore().animationEnable, (val) => { +watch( + () => useSettingsStore().animationEnable, + (val: boolean) => { animationEnable.value = val; if (val) { - animante.value = proxy?.animate.animateList[Math.round(Math.random() * proxy?.animate.animateList.length)] as string; + animante.value = proxy?.animate.animateList[Math.round(Math.random() * proxy?.animate.animateList.length)] as string; } else { - animante.value = proxy?.animate.defaultAnimate as string; + animante.value = proxy?.animate.defaultAnimate as string; } -}, { immediate: true }); + }, + { immediate: true } +); </script> <style lang="scss" scoped> @@ -41,7 +48,7 @@ overflow: hidden; } -.fixed-header+.app-main { +.fixed-header + .app-main { padding-top: 50px; } @@ -51,7 +58,7 @@ min-height: calc(100vh - 84px); } - .fixed-header+.app-main { + .fixed-header + .app-main { padding-top: 84px; } } -- Gitblit v1.9.3