From 3286323c8cb6f5e8d1a6862e9a5069dae781569d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 17 Mar 2023 14:24:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=B9=E7=AA=97=E5=90=8E?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=81=8F=E7=A7=BB=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98(I3YMWW)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/AppMain.vue |  9 ---------
 src/layout/index.vue              | 28 +++++++++++++++++++---------
 src/main.js                       |  1 +
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 045e49f..c4199b0 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -42,12 +42,3 @@ const tagsViewStore = useTagsViewStore()
   }
 }
 </style>
-
-<style lang="scss">
-// fix css style bug in open el-dialog
-.el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 17px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 52d821b..2df75bd 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,15 +1,17 @@
 <template>
   <div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }">
-    <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <sidebar v-if="!sidebar.hide" class="sidebar-container" />
-    <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
-      <div :class="{ 'fixed-header': fixedHeader }">
-        <navbar @setLayout="setLayout" />
-        <tags-view v-if="needTagsView" />
+    <el-scrollbar>
+      <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
+      <sidebar v-if="!sidebar.hide" class="sidebar-container" />
+      <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
+        <div :class="{ 'fixed-header': fixedHeader }">
+          <navbar @setLayout="setLayout" />
+          <tags-view v-if="needTagsView" />
+        </div>
+        <app-main />
+        <settings ref="settingRef" />
       </div>
-      <app-main />
-      <settings ref="settingRef" />
-    </div>
+    </el-scrollbar>
   </div>
 </template>
 
@@ -72,6 +74,14 @@ function setLayout() {
   height: 100%;
   width: 100%;
 
+  .el-scrollbar{
+    height: 100%;
+  }
+
+  :deep(.el-scrollbar__wrap) {
+    overflow-x: hidden;
+  }
+
   &.mobile.openSidebar {
     position: fixed;
     top: 0;
diff --git a/src/main.js b/src/main.js
index b399777..f349872 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,6 +6,7 @@ import ElementPlus from 'element-plus'
 import locale from 'element-plus/lib/locale/lang/zh-cn' // 中文语言
 
 import '@/assets/styles/index.scss' // global css
+
 import App from './App'
 import store from './store'
 import router from './router'