From a4fe88ca611435ee33a6c872734c6f9da7489928 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Sun, 23 Apr 2023 14:53:45 +0800
Subject: [PATCH] !707 恢复翻页/切换路由滚动功能 Merge pull request !707 from 也曾为你像超人/master
---
ruoyi-ui/src/layout/index.vue | 36 +++++++++++-------------------------
1 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
index b7c9ab0..dba4393 100644
--- a/ruoyi-ui/src/layout/index.vue
+++ b/ruoyi-ui/src/layout/index.vue
@@ -1,19 +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">
- <el-scrollbar>
- <div :class="{'fixed-header':fixedHeader}">
- <navbar/>
- <tags-view v-if="needTagsView"/>
- </div>
- <app-main/>
- <right-panel>
- <settings/>
- </right-panel>
- </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/>
+ <tags-view v-if="needTagsView"/>
</div>
+ <app-main/>
+ <right-panel>
+ <settings/>
+ </right-panel>
+ </div>
</div>
</template>
@@ -73,18 +71,6 @@
position: relative;
height: 100%;
width: 100%;
-
- .el-scrollbar{
- height: 100%;
- }
-
- ::v-deep .el-scrollbar__bar.is-vertical {
- z-index: 10;
- }
-
- ::v-deep .el-scrollbar__wrap {
- overflow-x: hidden;
- }
&.mobile.openSidebar {
position: fixed;
--
Gitblit v1.9.2