Table: Fixed wrong height. (#3539)

pull/3536/merge
Cyril Su 2017-03-18 08:40:01 +08:00 committed by cinwell.li
parent 57b04d7e80
commit c31f19a4e8
2 changed files with 4 additions and 20 deletions

View File

@ -59,6 +59,9 @@ class TableLayout {
this.updateHeight();
} else if (typeof value === 'string') {
if (value === '') {
el.style[prop] = '';
}
this.updateHeight();
}
}

View File

@ -8,8 +8,7 @@
'el-table--enable-row-hover': !store.states.isComplex,
'el-table--enable-row-transition': true || (store.states.data || []).length !== 0 && (store.states.data || []).length < 100
}"
@mouseleave="handleMouseLeave($event)"
:style="[tableHeight]">
@mouseleave="handleMouseLeave($event)">
<div class="hidden-columns" ref="hiddenColumns"><slot></slot></div>
<div class="el-table__header-wrapper" ref="headerWrapper" v-if="showHeader">
<table-header
@ -295,24 +294,6 @@
return style;
},
tableHeight() {
let style = {};
const height = this.layout.tableHeight ? this.layout.tableHeight + 'px' : '';
if (this.height) {
style = {
height
};
} else if (this.maxHeight) {
style = {
'max-height': height
};
}
return style;
},
bodyWidth() {
const { bodyWidth, scrollY, gutterWidth } = this.layout;
return bodyWidth ? bodyWidth - (scrollY ? gutterWidth : 0) + 'px' : '';