From 75803add585bfcf03cfa177b2bed357322e93bc6 Mon Sep 17 00:00:00 2001
From: huanghong <huanghong1125@126.com>
Date: Tue, 27 Mar 2018 23:39:47 +0800
Subject: [PATCH] fixed scoll bar

---
 examples/routers/table.vue          | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 src/components/table/table-head.vue | 19 ++++++++++++++++++-
 src/components/table/table.vue      |  4 ++++
 3 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index 71b86e1..d6e094b 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -9,6 +9,8 @@
         <br><br><br><br><br>
         <Table border :columns="columns6" :data="data5"></Table>
         <br><br><br><br><br>
+        <Table border :columns="columns7"  height="240" :data="data7"></Table>
+        <br><br><br><br><br>
     </div>
 </template>
 <script>
@@ -103,19 +105,19 @@
                             }
                         ]
                     },
+                    // {
+                    //     title: 'Gender',
+                    //     key: 'gender',
+                    //     align: 'center',
+                    //     width: 200,
+                    //     fixed: 'right'
+                    // },
                     {
                         title: 'Gender',
                         key: 'gender',
                         align: 'center',
                         width: 200,
-                        fixed: 'right'
-                    },
-                    {
-                        title: 'Gender',
-                        key: 'gender',
-                        align: 'center',
-                        width: 200,
-                        fixed: 'right'
+                        //fixed: 'right'
                     }
                 ],
                 columns2: [
@@ -342,6 +344,55 @@
                         }
                     }
                 ],
+                
+                columns7: [
+                    {
+                        title: 'Date',
+                        key: 'date',
+                        sortable: true,
+                        width:200,
+                    },
+                    {
+                        title: 'Name',
+                        key: 'name',
+                        width:200,
+                    },
+                    {
+                        title: 'Age',
+                        key: 'age',
+                    },
+                    {
+                        title: 'Address',
+                        key: 'address',
+                        width:200,
+                    }
+                ],
+                data7: [
+                    {
+                        name: 'John Brown',
+                        age: 18,
+                        address: 'New York No. 1 Lake Park',
+                        date: '2016-10-03'
+                    },
+                    {
+                        name: 'Jim Green',
+                        age: 24,
+                        address: 'London No. 1 Lake Park',
+                        date: '2016-10-01'
+                    },
+                    {
+                        name: 'Joe Black',
+                        age: 30,
+                        address: 'Sydney No. 1 Lake Park Sydney No. 1 Lake Park',
+                        date: '2016-10-02'
+                    },
+                    {
+                        name: 'Jon Snow',
+                        age: 26,
+                        address: 'Ottawa No. 2 Lake Park Ottawa No. 2 Lake Park Ottawa No. 2 Lake Park',
+                        date: '2016-10-04'
+                    }
+                ],
             }
         },
         mounted () {
diff --git a/src/components/table/table-head.vue b/src/components/table/table-head.vue
index 4d7f3a8..3339ce6 100644
--- a/src/components/table/table-head.vue
+++ b/src/components/table/table-head.vue
@@ -61,7 +61,7 @@
                     </div>
                 </th>
                 
-                <th v-if="$parent.showVerticalScrollBar" :rowspan="headRows.length"></th>
+                <th v-if="$parent.showVerticalScrollBar && rowIndex===0" :class='scrollBarCellClass()' :rowspan="headRows.length"></th>
             </tr>
         </thead>
     </table>
@@ -131,6 +131,23 @@
                     }
                 ];
             },
+            scrollBarCellClass(){
+                let hasRightFixed = false;
+                for(var i in this.headRows){
+                    for(var j in this.headRows[i]){
+                        if(this.headRows[i][j].fixed === 'right') {
+                            hasRightFixed=true;
+                            break;
+                        }
+                        if(hasRightFixed) break;
+                    }
+                }
+                return [
+                    {
+                        [`${this.prefixCls}-hidden`]: hasRightFixed
+                    }
+                ];
+            },
             itemClasses (column, item) {
                 return [
                     `${this.prefixCls}-filter-select-item`,
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 62d9a6f..f679020 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -896,6 +896,10 @@
             height () {
                 this.handleResize();
                 this.fixedHeader();
+            },
+            showHorizontalScrollBar () {
+                this.handleResize();
+                this.fixedHeader();
             }
         }
     };
--
libgit2 0.21.4