From 0a670fdfd735f73d951449081238043729300095 Mon Sep 17 00:00:00 2001
From: e <“>
Date: 星期六, 08 四月 2023 04:47:34 +0800
Subject: [PATCH] 将el-scrollbar移动到main-container下，避免鼠标移出时无法隐藏的问题
---
ruoyi-ui/src/assets/styles/sidebar.scss | 2 +-
ruoyi-ui/src/layout/index.vue | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss
index 43d5f9a..9f39046 100644
--- a/ruoyi-ui/src/assets/styles/sidebar.scss
+++ b/ruoyi-ui/src/assets/styles/sidebar.scss
@@ -1,7 +1,7 @@
#app {
.main-container {
- min-height: 100%;
+ height: 100%;
transition: margin-left .28s;
margin-left: $base-sidebar-width;
position: relative;
diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
index 8f88d86..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>
--
Gitblit v1.9.2