!671 优化弹窗后导航栏偏移的问题

Merge pull request !671 from 也曾为你像超人/master
This commit is contained in:
若依 2023-03-17 06:08:47 +00:00 committed by Gitee
commit 020a2d4670
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 173 additions and 172 deletions

View File

@ -50,12 +50,3 @@ export default {
} }
} }
</style> </style>
<style lang="scss">
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
padding-right: 17px;
}
}
</style>

View File

@ -1,17 +1,19 @@
<template> <template>
<div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}"> <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/> <el-scrollbar>
<sidebar v-if="!sidebar.hide" class="sidebar-container" /> <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
<div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container"> <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
<div :class="{'fixed-header':fixedHeader}"> <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
<navbar /> <div :class="{'fixed-header':fixedHeader}">
<tags-view v-if="needTagsView" /> <navbar/>
<tags-view v-if="needTagsView"/>
</div>
<app-main/>
<right-panel>
<settings/>
</right-panel>
</div> </div>
<app-main /> </el-scrollbar>
<right-panel>
<settings />
</right-panel>
</div>
</div> </div>
</template> </template>
@ -72,6 +74,14 @@ export default {
height: 100%; height: 100%;
width: 100%; width: 100%;
.el-scrollbar{
height: 100%;
}
::v-deep .el-scrollbar__wrap {
overflow-x: hidden;
}
&.mobile.openSidebar { &.mobile.openSidebar {
position: fixed; position: fixed;
top: 0; top: 0;