From b0087d1a50b45c64669f15bd0996f858cb46b086 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: 星期一, 01 四月 2024 20:59:52 +0800 Subject: [PATCH] #I96DTG update 类型下拉框和java类名下拉框没有联动 --- src/layout/components/AppMain.vue | 46 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 463224d..2b38a4e 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -3,7 +3,7 @@ <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" /> + <component :is="Component" v-if="!route.meta.link" :key="route.path" /> </keep-alive> </transition> </router-view> @@ -12,24 +12,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) => { 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 +45,7 @@ overflow: hidden; } -.fixed-header+.app-main { +.fixed-header + .app-main { padding-top: 50px; } @@ -51,8 +55,30 @@ min-height: calc(100vh - 84px); } - .fixed-header+.app-main { + .fixed-header + .app-main { padding-top: 84px; } } </style> +<style lang="scss"> +// fix css style bug in open el-dialog +.el-popup-parent--hidden { + .fixed-header { + 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