|
@@ -2,9 +2,9 @@
|
|
|
<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}">
|
|
|
+ <sidebar v-if="!sidebar.hide && handleNavigationBarShow()" class="sidebar-container"/>
|
|
|
+ <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container" :style="cssVar">
|
|
|
+ <div v-if="handleNavigationBarShow()" :class="{'fixed-header':fixedHeader}">
|
|
|
<navbar/>
|
|
|
<tags-view v-if="needTagsView"/>
|
|
|
</div>
|
|
@@ -54,11 +54,23 @@ export default {
|
|
|
},
|
|
|
variables() {
|
|
|
return variables;
|
|
|
+ },
|
|
|
+ cssVar(){
|
|
|
+ return {
|
|
|
+ 'margin-left': this.handleNavigationBarShow() ? '54px': '0px'
|
|
|
}
|
|
|
+ },
|
|
|
},
|
|
|
methods: {
|
|
|
handleClickOutside() {
|
|
|
this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
|
|
|
+ },
|
|
|
+ handleNavigationBarShow(){
|
|
|
+
|
|
|
+ if(process.env.NODE_ENV === 'development'){
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ return false;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -68,6 +80,10 @@ export default {
|
|
|
@import "~@/assets/styles/mixin.scss";
|
|
|
@import "~@/assets/styles/variables.scss";
|
|
|
|
|
|
+ // #app .hideSidebar .main-container{
|
|
|
+ // margin-left: var(--left)!important;
|
|
|
+ // }
|
|
|
+
|
|
|
.app-wrapper {
|
|
|
@include clearfix;
|
|
|
position: relative;
|