center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat(frontend):系统管理左侧菜单不收缩，显示跟topbar的分割线

Browse Source
This commit is contained in:
junjie 2021-05-25 17:28:55 +08:00
parent bf8c1a9882
commit 8dc219bbf4
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/layout/components/Sidebar/index.vue
View File

@ -50,7 +50,7 @@ export default {
return variables return variables
}, },
isCollapse() { isCollapse() {
return !this.sidebar.opened return false
} }
} }
} }

4
frontend/src/layout/components/Topbar.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="top-nav" :style="{'background-color': '#f1f3f8'}"> <div class="top-nav" :style="{'background-color': '#f1f3f8'}">
<div class="log"> <div class="log">
<img v-if="!logoUrl" src="@/assets/DataEase-color.png" width="160" alt="" style="padding-top: 8px;"> <img v-if="!logoUrl" src="@/assets/DataEase-color.png" width="140" alt="" style="padding-top: 10px;">
<img v-else :src="logoUrl" width="160" alt="" style="padding-top: 8px;"> <img v-else :src="logoUrl" width="140" alt="" style="padding-top: 10px;">
</div> </div>
<el-menu <el-menu
:active-text-color="variables.topMenuActiveText" :active-text-color="variables.topMenuActiveText"

4
frontend/src/layout/index.vue
View File

@ -48,7 +48,7 @@ export default {
}, },
classObj() { classObj() {
return { return {
hideSidebar: !this.sidebar.opened, // hideSidebar: !this.sidebar.opened,
openSidebar: this.sidebar.opened, openSidebar: this.sidebar.opened,
withoutAnimation: this.sidebar.withoutAnimation, withoutAnimation: this.sidebar.withoutAnimation,
mobile: this.device === 'mobile' mobile: this.device === 'mobile'
@ -98,7 +98,7 @@ export default {
} }
.hideSidebar .fixed-header { .hideSidebar .fixed-header {
width: calc(100% - 54px) width: calc(100% - 56px)
} }
.mobile .fixed-header { .mobile .fixed-header {

4
frontend/src/styles/sidebar.scss
View File

@ -23,7 +23,7 @@
top: $topBarHeight; top: $topBarHeight;
bottom: 0; bottom: 0;
left: 0; left: 0;
z-index: 1001; z-index: 999;
overflow: hidden; overflow: hidden;
border-right: 1px solid rgba(0, 0, 0, 0.12); border-right: 1px solid rgba(0, 0, 0, 0.12);
@ -68,7 +68,7 @@
border: none; border: none;
height: 100%; height: 100%;
width: 100% !important; width: 100% !important;
.is-active { .is-active {
background-color: $menuHover; background-color: $menuHover;
} }