Commit 680e061987f7fea90d6c2c0e1d4544217174b96d
remove
Showing
1 changed file
with
4 additions
and
0 deletions
Show diff stats
src/components/table/table.vue
| @@ -579,6 +579,10 @@ | @@ -579,6 +579,10 @@ | ||
| 579 | let bodyEl = bodyContentEl.parentElement; | 579 | let bodyEl = bodyContentEl.parentElement; |
| 580 | let bodyContentHeight = bodyContentEl.offsetHeight; | 580 | let bodyContentHeight = bodyContentEl.offsetHeight; |
| 581 | let bodyHeight = bodyEl.offsetHeight; | 581 | let bodyHeight = bodyEl.offsetHeight; |
| 582 | +<<<<<<< HEAD | ||
| 583 | +======= | ||
| 584 | + let scrollBarWidth = 0; | ||
| 585 | +>>>>>>> b3ef1c6358515d40e17eb162afd30fc427f0c885 | ||
| 582 | 586 | ||
| 583 | this.showVerticalScrollBar = this.bodyHeight? bodyHeight - (this.showHorizontalScrollBar?this.scrollBarWidth:0) < bodyContentHeight : false; | 587 | this.showVerticalScrollBar = this.bodyHeight? bodyHeight - (this.showHorizontalScrollBar?this.scrollBarWidth:0) < bodyContentHeight : false; |
| 584 | 588 |