From 8c866f4596b187a97d75bfdc5a1ca4eb063dc6ad Mon Sep 17 00:00:00 2001 From: LiuHao <liuhaoai545@gmail.com> Date: 星期二, 04 四月 2023 14:28:24 +0800 Subject: [PATCH] fix name --- src/layout/components/AppMain.vue | 32 +++++++++++++++++++++++--------- 1 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 5b51fcf..9587457 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,9 +1,9 @@ <template> <section class="app-main"> <router-view v-slot="{ Component, route }"> - <transition name="fade-transform" mode="out-in"> + <transition :enter-active-class="animante" mode="out-in"> <keep-alive :include="tagsViewStore.cachedViews"> - <component v-if="!route.meta.link" :is="Component" :key="route.path"/> + <component v-if="!route.meta.link" :is="Component" :key="route.path" /> </keep-alive> </transition> </router-view> @@ -11,11 +11,25 @@ </section> </template> -<script setup> -import iframeToggle from "./IframeToggle/index" -import useTagsViewStore from '@/store/modules/tagsView' +<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"; +const { proxy } = getCurrentInstance() as ComponentInternalInstance; +const tagsViewStore = useTagsViewStore(); -const tagsViewStore = useTagsViewStore() +// 闅忔満鍔ㄧ敾闆嗗悎 +const animante = ref<string>(''); +const animationEnable = ref(useSettingsStore().animationEnable); +watch(()=> useSettingsStore().animationEnable, (val) => { + animationEnable.value = val; + if (val) { + animante.value = proxy?.animate.animateList[Math.round(Math.random() * proxy?.animate.animateList.length)] as string; + } else { + animante.value = proxy?.animate.defaultAnimate as string; + } +}, { immediate: true }); </script> <style lang="scss" scoped> @@ -27,7 +41,7 @@ overflow: hidden; } -.fixed-header + .app-main { +.fixed-header+.app-main { padding-top: 50px; } @@ -37,7 +51,7 @@ min-height: calc(100vh - 84px); } - .fixed-header + .app-main { + .fixed-header+.app-main { padding-top: 84px; } } @@ -50,4 +64,4 @@ padding-right: 17px; } } -</style> \ No newline at end of file +</style> -- Gitblit v1.9.3