other / mew-iview

Commit 9f75c487a0a2c1cec6a4557b4de1b6e2b682f13b

Authored by huanghong
1 parent 680e0619

merge

Showing 1 changed file with 0 additions and 4 deletions   Show diff stats
Inline Side-by-side
src/components/table/table.vue
  Show/Hide comments   View file @9f75c48
@@ -579,10 +579,6 @@ @@ -579,10 +579,6 @@
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  
586 582
587 this.showVerticalScrollBar = this.bodyHeight? bodyHeight - (this.showHorizontalScrollBar?this.scrollBarWidth:0) < bodyContentHeight : false; 583 this.showVerticalScrollBar = this.bodyHeight? bodyHeight - (this.showHorizontalScrollBar?this.scrollBarWidth:0) < bodyContentHeight : false;
588 584