github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Table: fix summary row drifting when horizontal scrollbar exists (#9667)

pull/9686/head
FuryBean 2018-02-05 19:14:20 +08:00 committed by 杨奕
parent e129447126
commit f255c8786e
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/table/src/table.vue
View File

@ -524,10 +524,20 @@
fixedHeight() { fixedHeight() {
if (this.maxHeight) { if (this.maxHeight) {
if (this.showSummary) {
return {
bottom: 0
};
}
return { return {
bottom: (this.layout.scrollX && this.data.length) ? this.layout.gutterWidth + 'px' : '' bottom: (this.layout.scrollX && this.data.length) ? this.layout.gutterWidth + 'px' : ''
}; };
} else { } else {
if (this.showSummary) {
return {
height: this.layout.tableHeight ? this.layout.tableHeight + 'px' : ''
}
}
return { return {
height: this.layout.viewportHeight ? this.layout.viewportHeight + 'px' : '' height: this.layout.viewportHeight ? this.layout.viewportHeight + 'px' : ''
}; };