fix: 侧边栏纵轴滚动条没了
This commit is contained in:
parent
f4fd061591
commit
d35b0cca4c
|
@ -4,13 +4,15 @@
|
|||
:style="{
|
||||
'margin-left': !asideHidden ? 0 : '-' + width,
|
||||
'min-width': minWidth + 'px',
|
||||
'height': height ? (height + 'px') : (enableAutoHeight ? null : 'calc(100vh - 80px)'),
|
||||
'height': calHeight,
|
||||
}">
|
||||
<div v-if="enableAsideHidden" class="hiddenBottom" :style="{'top': hiddenBottomTop ? hiddenBottomTop : 0}" @click="asideHidden = !asideHidden">
|
||||
<i v-if="!asideHidden" class="el-icon-arrow-left"/>
|
||||
<i v-if="asideHidden" class="el-icon-arrow-right"/>
|
||||
</div>
|
||||
<slot></slot>
|
||||
<div style="overflow: scroll" :style="{'height': containerCalHeight }">
|
||||
<slot></slot>
|
||||
</div>
|
||||
<ms-horizontal-drag-bar/>
|
||||
</el-aside>
|
||||
</template>
|
||||
|
@ -52,6 +54,14 @@
|
|||
this.$emit('setAsideHidden', this.asideHidden) ;
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
calHeight() {
|
||||
return this.height ? (this.height + 'px') : (this.enableAutoHeight ? null : 'calc(100vh - 80px)')
|
||||
},
|
||||
containerCalHeight() {
|
||||
return this.height ? (this.height - 30 + 'px') : (this.enableAutoHeight ? null : 'calc(100vh - 100px)')
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.id = getUUID();
|
||||
},
|
||||
|
|
|
@ -180,9 +180,6 @@ export default {
|
|||
height: 550px !important;
|
||||
}
|
||||
|
||||
/deep/ .drag-bar {
|
||||
width: 0px;
|
||||
}
|
||||
.ms-aside-container {
|
||||
border: 0px;
|
||||
padding: 10px 0px 0px 10px;
|
||||
|
|
|
@ -170,10 +170,6 @@ export default {
|
|||
height: 620px !important;
|
||||
}
|
||||
|
||||
/deep/ .drag-bar {
|
||||
width: 0px;
|
||||
}
|
||||
|
||||
.ms-aside-container {
|
||||
border: 0px;
|
||||
padding: 10px 0px 0px 10px;
|
||||
|
|
|
@ -95,9 +95,6 @@ export default {
|
|||
height: 600px !important;
|
||||
}
|
||||
|
||||
/deep/ .drag-bar {
|
||||
width: 0px;
|
||||
}
|
||||
.ms-aside-container {
|
||||
border: 0px;
|
||||
padding: 10px 0px 0px 10px;
|
||||
|
|
Loading…
Reference in New Issue