From 49e6fbf2ff2deccf36af2151343bf3d290a9cb66 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 11 Apr 2023 16:52:35 +0800
Subject: [PATCH] 修复开启TopNav后一级菜单路由参数设置无效问题(I6T1DK)
---
ruoyi-ui/src/layout/index.vue | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
index 45844fd..cc1063c 100644
--- a/ruoyi-ui/src/layout/index.vue
+++ b/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"/>
- <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 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>
- <app-main />
- <right-panel>
- <settings />
- </right-panel>
- </div>
</div>
</template>
@@ -72,6 +74,18 @@
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;
top: 0;
@@ -101,6 +115,10 @@
width: calc(100% - 54px);
}
+ .sidebarHide .fixed-header {
+ width: 100%;
+ }
+
.mobile .fixed-header {
width: 100%;
}
--
Gitblit v1.9.3