Commit 5c9c4dff446c08c058d9c54ac3c6a6fb0b6e5a36

Authored by huanghong
1 parent f1dfa8ff

update

examples/routers/table.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 <br><br><br><br><br> 3 <br><br><br><br><br>
4 - <Table border :columns="columns1" height="500" :data="data1"></Table> 4 + <Table border :show-header='false' :columns="columns1" height="500" :data="data1"></Table>
5 <!-- <Table border :columns="columns1" height='300'></Table> --> 5 <!-- <Table border :columns="columns1" height='300'></Table> -->
6 <!-- <br><br><br><br><br> --> 6 <!-- <br><br><br><br><br> -->
7 <!-- <Table width="550" height="200" border :columns="columns2" :data="data4"></Table> --> 7 <!-- <Table width="550" height="200" border :columns="columns2" :data="data4"></Table> -->
src/components/table/table.vue
@@ -590,7 +590,7 @@ @@ -590,7 +590,7 @@
590 let bodyHeight = bodyEl.offsetHeight; 590 let bodyHeight = bodyEl.offsetHeight;
591 591
592 if (!this.$refs.header) { 592 if (!this.$refs.header) {
593 - this.showHorizontalScrollBar = bodyEl.offsetWidth < bodyContentEl.offsetWidth; 593 + this.showHorizontalScrollBar = bodyEl.offsetWidth < bodyContentEl.offsetWidth + (this.showVerticalScrollBar?this.scrollBarWidth:0);
594 } 594 }
595 595
596 this.showVerticalScrollBar = this.bodyHeight? bodyHeight - (this.showHorizontalScrollBar?this.scrollBarWidth:0) < bodyContentHeight : false; 596 this.showVerticalScrollBar = this.bodyHeight? bodyHeight - (this.showHorizontalScrollBar?this.scrollBarWidth:0) < bodyContentHeight : false;