Ver código fonte

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

RuoYi 3 anos atrás
pai
commit
33a0806cbe

+ 0 - 9
ruoyi-ui/src/layout/components/AppMain.vue

@@ -50,12 +50,3 @@ export default {
50 50
   }
51 51
 }
52 52
 </style>
53
-
54
-<style lang="scss">
55
-// fix css style bug in open el-dialog
56
-.el-popup-parent--hidden {
57
-  .fixed-header {
58
-    padding-right: 17px;
59
-  }
60
-}
61
-</style>

+ 21 - 11
ruoyi-ui/src/layout/index.vue

@@ -1,17 +1,19 @@
1 1
 <template>
2 2
   <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
3
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
4
-    <sidebar v-if="!sidebar.hide" class="sidebar-container" />
5
-    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
6
-      <div :class="{'fixed-header':fixedHeader}">
7
-        <navbar />
8
-        <tags-view v-if="needTagsView" />
3
+    <el-scrollbar>
4
+      <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
5
+      <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
6
+      <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
7
+        <div :class="{'fixed-header':fixedHeader}">
8
+          <navbar/>
9
+          <tags-view v-if="needTagsView"/>
10
+        </div>
11
+        <app-main/>
12
+        <right-panel>
13
+          <settings/>
14
+        </right-panel>
9 15
       </div>
10
-      <app-main />
11
-      <right-panel>
12
-        <settings />
13
-      </right-panel>
14
-    </div>
16
+    </el-scrollbar>
15 17
   </div>
16 18
 </template>
17 19
 
@@ -72,6 +74,14 @@ export default {
72 74
     height: 100%;
73 75
     width: 100%;
74 76
 
77
+    .el-scrollbar{
78
+      height: 100%;
79
+    }
80
+
81
+    ::v-deep .el-scrollbar__wrap {
82
+      overflow-x: hidden;
83
+    }
84
+
75 85
     &.mobile.openSidebar {
76 86
       position: fixed;
77 87
       top: 0;