From 5c9c4dff446c08c058d9c54ac3c6a6fb0b6e5a36 Mon Sep 17 00:00:00 2001
From: huanghong <huanghong1125@126.com>
Date: Tue, 10 Apr 2018 11:06:21 +0800
Subject: [PATCH] update

---
 examples/routers/table.vue     | 2 +-
 src/components/table/table.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 650dbfc1..6affa62f 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <br><br><br><br><br>
-        <Table border  :columns="columns1" height="500" :data="data1"></Table>
+        <Table border  :show-header='false' :columns="columns1" height="500" :data="data1"></Table>
         <!-- <Table border :columns="columns1" height='300'></Table> -->
         <!-- <br><br><br><br><br> -->
         <!-- <Table width="550" height="200" border :columns="columns2" :data="data4"></Table> -->
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index cb0113d6..ef1a4dc1 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -590,7 +590,7 @@
                     let bodyHeight = bodyEl.offsetHeight;
 
                     if (!this.$refs.header) {
-                        this.showHorizontalScrollBar = bodyEl.offsetWidth < bodyContentEl.offsetWidth;
+                        this.showHorizontalScrollBar = bodyEl.offsetWidth < bodyContentEl.offsetWidth + (this.showVerticalScrollBar?this.scrollBarWidth:0);
                     }
                     
                     this.showVerticalScrollBar = this.bodyHeight? bodyHeight - (this.showHorizontalScrollBar?this.scrollBarWidth:0) < bodyContentHeight : false;