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

merge

Browse source
This commit is contained in:
huanghong 2018-03-31 19:24:40 +08:00
parent 680e061987
commit 9f75c487a0
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -579,10 +579,6 @@
let bodyEl = bodyContentEl.parentElement; let bodyEl = bodyContentEl.parentElement;
let bodyContentHeight = bodyContentEl.offsetHeight; let bodyContentHeight = bodyContentEl.offsetHeight;
let bodyHeight = bodyEl.offsetHeight; let bodyHeight = bodyEl.offsetHeight;
<<<<<<< HEAD
=======
let scrollBarWidth = 0;
>>>>>>> b3ef1c6358515d40e17eb162afd30fc427f0c885
this.showVerticalScrollBar = this.bodyHeight? bodyHeight - (this.showHorizontalScrollBar?this.scrollBarWidth:0) < bodyContentHeight : false; this.showVerticalScrollBar = this.bodyHeight? bodyHeight - (this.showHorizontalScrollBar?this.scrollBarWidth:0) < bodyContentHeight : false;