fix: 修复show-summary、fixed同时存在,且max-height设置的比实际高度高的时候,合计被顶出去的问题
This commit is contained in:
parent
3d38c6c8cb
commit
f84206bff0
1 changed files with 6 additions and 1 deletions
|
@ -497,7 +497,12 @@
|
||||||
let style = {};
|
let style = {};
|
||||||
if (this.bodyHeight !== 0) {
|
if (this.bodyHeight !== 0) {
|
||||||
let height = this.bodyHeight - (this.showHorizontalScrollBar?this.scrollBarWidth: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;
|
return style;
|
||||||
},
|
},
|
||||||
|
|
Loading…
Add table
Reference in a new issue