From 3286323c8cb6f5e8d1a6862e9a5069dae781569d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 17 三月 2023 14:24:54 +0800
Subject: [PATCH] 优化弹窗后导航栏偏移的问题(I3YMWW)
---
src/main.js | 1 +
src/layout/index.vue | 28 +++++++++++++++++++---------
src/layout/components/AppMain.vue | 9 ---------
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 @@
}
}
</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 @@
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 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'
--
Gitblit v1.9.3