RuoYi
2023-04-10 2fe7341fa77d95834863dd8e6bd48836bea03b3b
ruoyi-ui/src/layout/index.vue
@@ -1,17 +1,19 @@
<template>
  <div :class="classObj" class="app-wrapper">
    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
    <sidebar class="sidebar-container" />
    <div :class="{hasTagsView:needTagsView}" class="main-container">
      <div :class="{'fixed-header':fixedHeader}">
        <navbar />
        <tags-view v-if="needTagsView" />
  <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>
      <app-main />
      <right-panel v-if="showSettings">
        <settings />
      </right-panel>
    </div>
  </div>
</template>
@@ -20,6 +22,7 @@
import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
import ResizeMixin from './mixin/ResizeHandler'
import { mapState } from 'vuex'
import variables from '@/assets/styles/variables.scss'
export default {
  name: 'Layout',
@@ -34,9 +37,10 @@
  mixins: [ResizeMixin],
  computed: {
    ...mapState({
      theme: state => state.settings.theme,
      sideTheme: state => state.settings.sideTheme,
      sidebar: state => state.app.sidebar,
      device: state => state.app.device,
      showSettings: state => state.settings.showSettings,
      needTagsView: state => state.settings.tagsView,
      fixedHeader: state => state.settings.fixedHeader
    }),
@@ -47,6 +51,9 @@
        withoutAnimation: this.sidebar.withoutAnimation,
        mobile: this.device === 'mobile'
      }
    },
    variables() {
      return variables;
    }
  },
  methods: {
@@ -66,6 +73,18 @@
    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;
@@ -88,12 +107,16 @@
    top: 0;
    right: 0;
    z-index: 9;
    width: calc(100% - #{$sideBarWidth});
    width: calc(100% - #{$base-sidebar-width});
    transition: width 0.28s;
  }
  .hideSidebar .fixed-header {
    width: calc(100% - 54px)
    width: calc(100% - 54px);
  }
  .sidebarHide .fixed-header {
    width: 100%;
  }
  .mobile .fixed-header {