drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: 修复show-summary、fixed同时存在，且max-height设置的比实际高度高的时候，合计被顶出去的问题

Browse source
This commit is contained in:
Xu Zhimeng 2021-09-17 13:45:44 +08:00
parent 3d38c6c8cb
commit f84206bff0
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/table/table.vue
View file

@ -497,7 +497,12 @@
let style = {};
if (this.bodyHeight !== 0) {
let height = this.bodyHeight - (this.showHorizontalScrollBar?this.scrollBarWidth:0);
style.height = this.showHorizontalScrollBar ? `${height}px` : `${height - 1}px`;
if(this.height) {
style.height = this.showHorizontalScrollBar ? `${height}px` : `${height - 1}px`;
} else if (this.maxHeight) {
style.maxHeight = this.showHorizontalScrollBar ? `${height}px` : `${height - 1}px`;
}
}
return style;
},