From f801f4fb11ff8ca08417a9ddf0231fb570fa26e3 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 24 七月 2023 16:47:51 +0800 Subject: [PATCH] fix 修复 固定页面header穿模问题 --- src/layout/components/AppMain.vue | 61 +++++++++++++++++------------- 1 files changed, 34 insertions(+), 27 deletions(-) diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index e600479..8a73232 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,10 +1,17 @@ -<script lang="ts"> -export default { - name: 'AppMin' -} -</script> +<template> + <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> + </transition> + </router-view> + <iframe-toggle /> + </section> +</template> -<script setup lang="ts"> +<script setup name="AppMain" lang="ts"> import useTagsViewStore from '@/store/modules/tagsView'; import useSettingsStore from '@/store/modules/settings'; import IframeToggle from './IframeToggle/index.vue' @@ -16,27 +23,14 @@ 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; - } + 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> - -<template> - <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> - </transition> - </router-view> - <iframe-toggle /> - </section> -</template> <style lang="scss" scoped> .app-main { @@ -62,12 +56,25 @@ } } </style> - <style lang="scss"> // fix css style bug in open el-dialog .el-popup-parent--hidden { .fixed-header { - padding-right: 17px; + padding-right: 6px; } } + +::-webkit-scrollbar { + width: 6px; + height: 6px; +} + +::-webkit-scrollbar-track { + background-color: #f1f1f1; +} + +::-webkit-scrollbar-thumb { + background-color: #c0c0c0; + border-radius: 3px; +} </style> -- Gitblit v1.9.3