update code
parent
3f2741c473
commit
4507369487
|
@ -1,18 +1,17 @@
|
|||
<template>
|
||||
<section class="app-main">
|
||||
<el-scrollbar height="calc(100vh - 76px)">
|
||||
<router-view>
|
||||
<template #default="{ Component, route }">
|
||||
<transition
|
||||
enter-active-class="animate__animated animate__fadeIn"
|
||||
mode="out-in"
|
||||
>
|
||||
<keep-alive :include="cachedViews">
|
||||
<component :is="Component" :key="route.path" />
|
||||
</keep-alive>
|
||||
</transition>
|
||||
</template>
|
||||
</router-view>
|
||||
<router-view>
|
||||
<template #default="{ Component, route }">
|
||||
<transition enter-active-class="animate__animated animate__fadeIn" mode="out-in">
|
||||
<keep-alive :include="cachedViews">
|
||||
<div>
|
||||
<component :is="Component" :key="route.path" />
|
||||
</div>
|
||||
</keep-alive>
|
||||
</transition>
|
||||
</template>
|
||||
</router-view>
|
||||
</el-scrollbar>
|
||||
</section>
|
||||
</template>
|
||||
|
@ -28,8 +27,9 @@ const cachedViews = computed(() => useTagsViewStore().cachedViews); // 缓存页
|
|||
position: relative;
|
||||
width: 100%;
|
||||
min-height: calc(100vh - 100px);
|
||||
overflow: hidden;
|
||||
:deep(.el-scrollbar__view){
|
||||
overflow: hidden;
|
||||
|
||||
:deep(.el-scrollbar__view) {
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
|
@ -38,19 +38,19 @@ const cachedViews = computed(() => useTagsViewStore().cachedViews); // 缓存页
|
|||
min-height: calc(100vh - $navbar-height - $tags-view-height);
|
||||
}
|
||||
|
||||
.fixed-header + .app-main {
|
||||
.fixed-header+.app-main {
|
||||
min-height: 100vh;
|
||||
padding-top: $navbar-height;
|
||||
}
|
||||
|
||||
.hasTagsView .fixed-header + .app-main {
|
||||
.hasTagsView .fixed-header+.app-main {
|
||||
min-height: 100vh;
|
||||
padding-top: $navbar-height + $tags-view-height;
|
||||
}
|
||||
|
||||
.layout-mix,
|
||||
.layout-top {
|
||||
.fixed-header + .app-main {
|
||||
.fixed-header+.app-main {
|
||||
padding-top: 0;
|
||||
}
|
||||
}
|
||||
|
@ -67,11 +67,11 @@ const cachedViews = computed(() => useTagsViewStore().cachedViews); // 缓存页
|
|||
min-height: calc(100vh - $navbar-height - $tags-view-height);
|
||||
}
|
||||
|
||||
.fixed-header + .app-main {
|
||||
.fixed-header+.app-main {
|
||||
min-height: calc(100vh - $navbar-height);
|
||||
}
|
||||
|
||||
.hasTagsView .fixed-header + .app-main {
|
||||
.hasTagsView .fixed-header+.app-main {
|
||||
height: calc(100vh - $navbar-height);
|
||||
min-height: calc(100vh - $navbar-height);
|
||||
padding-top: $tags-view-height;
|
||||
|
@ -79,7 +79,7 @@ const cachedViews = computed(() => useTagsViewStore().cachedViews); // 缓存页
|
|||
}
|
||||
|
||||
.layout-top {
|
||||
.hasTagsView .fixed-header + .app-main {
|
||||
.hasTagsView .fixed-header+.app-main {
|
||||
padding-top: $tags-view-height;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue