From eff06c110f49db6c9632b53deb5ea4b6a926d4b2 Mon Sep 17 00:00:00 2001
From: loren-li <loren-li@outlook.com>
Date: 星期四, 20 四月 2023 15:02:38 +0800
Subject: [PATCH] 修复路由跳转被阻止时vue-router内部产生报错信息问题
---
ruoyi-ui/src/layout/index.vue | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
index ab2be3c..b7c9ab0 100644
--- a/ruoyi-ui/src/layout/index.vue
+++ b/ruoyi-ui/src/layout/index.vue
@@ -1,19 +1,19 @@
<template>
<div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
- <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>
+ <el-scrollbar>
+ <div :class="{'fixed-header':fixedHeader}">
+ <navbar/>
+ <tags-view v-if="needTagsView"/>
+ </div>
+ <app-main/>
+ <right-panel>
+ <settings/>
+ </right-panel>
+ </el-scrollbar>
</div>
- </el-scrollbar>
</div>
</template>
@@ -78,6 +78,10 @@
height: 100%;
}
+ ::v-deep .el-scrollbar__bar.is-vertical {
+ z-index: 10;
+ }
+
::v-deep .el-scrollbar__wrap {
overflow-x: hidden;
}
--
Gitblit v1.9.2