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

Merge pull request !671 from 也曾为你像超人/master

ruoyi-ui/src/layout/components/AppMain.vue

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

ruoyi-ui/src/layout/index.vue

@@ -1,17 +1,19 @@
 <template>
   <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>
-      <app-main />
+    </el-scrollbar>
-      <right-panel>
-        <settings />
-      </right-panel>
-    </div>
   </div>
 </template>
 
@@ -72,6 +74,14 @@ export default {
     height: 100%;
     width: 100%;
 
+    .el-scrollbar{
+      height: 100%;
+    }
+
+    ::v-deep .el-scrollbar__wrap {
+      overflow-x: hidden;
+    }
+
     &.mobile.openSidebar {
       position: fixed;
       top: 0;