From a404bbaed33d567ed1de2576059c68e6ff5ed2af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Thu, 5 Jan 2017 14:10:08 +0800
Subject: [PATCH] update Table #167

update Table
---
 src/components/table/mixin.js       | 2 +-
 src/components/table/table-head.vue | 8 +++++++-
 test/routers/table.vue              | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/table/mixin.js b/src/components/table/mixin.js
index eedc904f..6223dc58 100644
--- a/src/components/table/mixin.js
+++ b/src/components/table/mixin.js
@@ -19,7 +19,7 @@ export default {
                 width = this.columnsWidth[column._index].width;
             }
             // when browser has scrollBar,set a width to resolve scroll position bug
-            if (this.columns.length === index + 1 && top) {
+            if (this.columns.length === index + 1 && top && this.$parent.bodyHeight !== 0) {
                 width += this.$parent.scrollBarWidth;
             }
             // when fixed type,reset first right fixed column's width
diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index 358b945b..46147fda 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -1,5 +1,5 @@
 <template>
-    <table cellspacing="0" cellpadding="0" border="0" :style="style">
+    <table cellspacing="0" cellpadding="0" border="0" :style="styles">
         <colgroup>
             <col v-for="column in columns" :width="setCellWidth(column, $index, true)">
         </colgroup>
@@ -75,6 +75,12 @@
             }
         },
         computed: {
+            styles () {
+                const style = Object.assign({}, this.style);
+                const width = this.$parent.bodyHeight === 0 ? parseInt(this.style.width) : parseInt(this.style.width) + this.$parent.scrollBarWidth;
+                style.width = `${width}px`;
+                return style;
+            },
             isSelectAll () {
                 let isSelectAll = true;
                 if (!this.data.length) isSelectAll = false;
diff --git a/test/routers/table.vue b/test/routers/table.vue
index 195943a5..ed4e3a2f 100644
--- a/test/routers/table.vue
+++ b/test/routers/table.vue
@@ -4,7 +4,9 @@
     }
 </style>
 <template>
-    <i-table width="550" height="200" border :columns="columns2" :data="data4"></i-table>
+    <i-table border :columns="columns1" :data="data1"></i-table>
+    <i-table border height="200" :columns="columns1" :data="data2"></i-table>
+    <!--<i-table width="550" height="200" border :columns="columns2" :data="data4"></i-table>-->
     <!--<i-button @click="changeFilter">改变filter</i-button>-->
     <!--<span v-if="currentRow !== null">Current Row: {{currentRow.name}}</span>-->
     <!--<Switch size="small" @on-change="switchCellEllipsis"></Switch> Ellipsis-->