将el-scrollbar移动到main-container下,避免鼠标移出时无法隐藏的问题

master
e 1 year ago
parent a33090c90e
commit 0a670fdfd7
  1. 2
      ruoyi-ui/src/assets/styles/sidebar.scss
  2. 20
      ruoyi-ui/src/layout/index.vue

@ -1,7 +1,7 @@
#app {
.main-container {
min-height: 100%;
height: 100%;
transition: margin-left .28s;
margin-left: $base-sidebar-width;
position: relative;

@ -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>

Loading…
Cancel
Save