From b142865eff219e2632027cb2590a04d8a181a377 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Wed, 8 Nov 2017 16:11:04 +0800
Subject: [PATCH] fixed #2102

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

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index af4d2bb..1a17c4a 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -699,86 +699,226 @@
     <!--}-->
 <!--</script>-->
 
+<!--<template>-->
+    <!--<Table :columns="columns10" :data="data9"></Table>-->
+<!--</template>-->
+<!--<script>-->
+    <!--import expandRow from '../components/tableExpand.vue';-->
+    <!--export default {-->
+        <!--components: { expandRow },-->
+        <!--data () {-->
+            <!--return {-->
+                <!--columns10: [-->
+                    <!--{-->
+                        <!--type: 'expand',-->
+                        <!--width: 50,-->
+                        <!--render: (h, params) => {-->
+                            <!--return h(expandRow, {-->
+                                <!--props: {-->
+                                    <!--row: params.row-->
+                                <!--}-->
+                            <!--})-->
+                        <!--}-->
+                    <!--},-->
+                    <!--{-->
+                        <!--title: 'Name',-->
+                        <!--key: 'name'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--title: 'Age',-->
+                        <!--key: 'age',-->
+                        <!--fixed: 'right'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--title: 'Address',-->
+                        <!--key: 'address',-->
+                        <!--fixed: 'right'-->
+                    <!--}-->
+                <!--],-->
+                <!--data9: [-->
+                    <!--{-->
+                        <!--name: 'John Brown',-->
+                        <!--age: 18,-->
+                        <!--address: 'New York No. 1 Lake Park',-->
+                        <!--job: 'Data engineer',-->
+                        <!--interest: 'badminton',-->
+                        <!--birthday: '1991-05-14',-->
+                        <!--book: 'Steve Jobs',-->
+                        <!--movie: 'The Prestige',-->
+                        <!--music: 'I Cry'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--name: 'Jim Green',-->
+                        <!--age: 25,-->
+                        <!--address: 'London No. 1 Lake Park',-->
+                        <!--job: 'Data Scientist',-->
+                        <!--interest: 'volleyball',-->
+                        <!--birthday: '1989-03-18',-->
+                        <!--book: 'My Struggle',-->
+                        <!--movie: 'Roman Holiday',-->
+                        <!--music: 'My Heart Will Go On'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--name: 'Joe Black',-->
+                        <!--age: 30,-->
+                        <!--address: 'Sydney No. 1 Lake Park',-->
+                        <!--job: 'Data Product Manager',-->
+                        <!--interest: 'tennis',-->
+                        <!--birthday: '1992-01-31',-->
+                        <!--book: 'Win',-->
+                        <!--movie: 'Jobs',-->
+                        <!--music: 'Don’t Cry'-->
+                    <!--},-->
+                    <!--{-->
+                        <!--name: 'Jon Snow',-->
+                        <!--age: 26,-->
+                        <!--address: 'Ottawa No. 2 Lake Park',-->
+                        <!--job: 'Data Analyst',-->
+                        <!--interest: 'snooker',-->
+                        <!--birthday: '1988-7-25',-->
+                        <!--book: 'A Dream in Red Mansions',-->
+                        <!--movie: 'A Chinese Ghost Story',-->
+                        <!--music: 'actor'-->
+                    <!--}-->
+                <!--]-->
+            <!--}-->
+        <!--}-->
+    <!--}-->
+<!--</script>-->
+
+
 <template>
-    <Table :columns="columns10" :data="data9"></Table>
+    <div>
+        <div style="width: 550px;">
+            <Table height="200" border :columns="columns2" :data="data4"></Table>
+        </div>
+        <br><br><br>
+        <Table width="550" height="200" border :columns="columns2" :data="data4"></Table>
+    </div>
 </template>
 <script>
-    import expandRow from '../components/tableExpand.vue';
     export default {
-        components: { expandRow },
         data () {
             return {
-                columns10: [
-                    {
-                        type: 'expand',
-                        width: 50,
-                        render: (h, params) => {
-                            return h(expandRow, {
-                                props: {
-                                    row: params.row
-                                }
-                            })
-                        }
-                    },
+                columns2: [
                     {
                         title: 'Name',
-                        key: 'name'
+                        key: 'name',
+                        width: 100,
+//                        fixed: 'left'
                     },
                     {
                         title: 'Age',
                         key: 'age',
-                        fixed: 'right'
+                        width: 100
+                    },
+                    {
+                        title: 'Province',
+                        key: 'province',
+                        width: 100
+                    },
+                    {
+                        title: 'City',
+                        key: 'city',
+                        width: 100
                     },
                     {
                         title: 'Address',
                         key: 'address',
-                        fixed: 'right'
+                        width: 200
+                    },
+                    {
+                        title: 'Postcode',
+                        key: 'zip',
+                        width: 100
+                    },
+                    {
+                        title: 'Action',
+                        key: 'action',
+                        fixed: 'right',
+                        width: 120,
+                        render: (h, params) => {
+                            return h('div', [
+                                h('Button', {
+                                    props: {
+                                        type: 'text',
+                                        size: 'small'
+                                    }
+                                }, 'View'),
+                                h('Button', {
+                                    props: {
+                                        type: 'text',
+                                        size: 'small'
+                                    }
+                                }, 'Edit')
+                            ]);
+                        }
                     }
                 ],
-                data9: [
+                data4: [
+                    {
+                        name: 'John Brown',
+                        age: 18,
+                        address: 'New York No. 1 Lake Park',
+                        province: 'America',
+                        city: 'New York',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Jim Green',
+                        age: 24,
+                        address: 'Washington, D.C. No. 1 Lake Park',
+                        province: 'America',
+                        city: 'Washington, D.C.',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Joe Black',
+                        age: 30,
+                        address: 'Sydney No. 1 Lake Park',
+                        province: 'Australian',
+                        city: 'Sydney',
+                        zip: 100000
+                    },
+                    {
+                        name: 'Jon Snow',
+                        age: 26,
+                        address: 'Ottawa No. 2 Lake Park',
+                        province: 'Canada',
+                        city: 'Ottawa',
+                        zip: 100000
+                    },
                     {
                         name: 'John Brown',
                         age: 18,
                         address: 'New York No. 1 Lake Park',
-                        job: 'Data engineer',
-                        interest: 'badminton',
-                        birthday: '1991-05-14',
-                        book: 'Steve Jobs',
-                        movie: 'The Prestige',
-                        music: 'I Cry'
+                        province: 'America',
+                        city: 'New York',
+                        zip: 100000
                     },
                     {
                         name: 'Jim Green',
-                        age: 25,
-                        address: 'London No. 1 Lake Park',
-                        job: 'Data Scientist',
-                        interest: 'volleyball',
-                        birthday: '1989-03-18',
-                        book: 'My Struggle',
-                        movie: 'Roman Holiday',
-                        music: 'My Heart Will Go On'
+                        age: 24,
+                        address: 'Washington, D.C. No. 1 Lake Park',
+                        province: 'America',
+                        city: 'Washington, D.C.',
+                        zip: 100000
                     },
                     {
                         name: 'Joe Black',
                         age: 30,
                         address: 'Sydney No. 1 Lake Park',
-                        job: 'Data Product Manager',
-                        interest: 'tennis',
-                        birthday: '1992-01-31',
-                        book: 'Win',
-                        movie: 'Jobs',
-                        music: 'Don’t Cry'
+                        province: 'Australian',
+                        city: 'Sydney',
+                        zip: 100000
                     },
                     {
                         name: 'Jon Snow',
                         age: 26,
                         address: 'Ottawa No. 2 Lake Park',
-                        job: 'Data Analyst',
-                        interest: 'snooker',
-                        birthday: '1988-7-25',
-                        book: 'A Dream in Red Mansions',
-                        movie: 'A Chinese Ghost Story',
-                        music: 'actor'
+                        province: 'Canada',
+                        city: 'Ottawa',
+                        zip: 100000
                     }
                 ]
             }
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 5e2c09a..bbb6323 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -293,7 +293,9 @@
                 if (this.bodyHeight !== 0) {
                     let height = this.bodyHeight + this.scrollBarWidth - 1;
 
-                    if (this.width && this.width < this.tableWidth){
+                    // #2102 里，如果 Table 没有设置 width，而是集成父级的 width，固定列也应该不包含滚动条高度，所以这里直接计算表格宽度
+                    const tableWidth = parseInt(getStyle(this.$el, 'width')) - 1;
+                    if ((this.width && this.width < this.tableWidth) || tableWidth < this.tableWidth){
                         height = this.bodyHeight;
                     }
 //                    style.height = this.scrollBarWidth > 0 ? `${this.bodyHeight}px` : `${this.bodyHeight - 1}px`;
--
libgit2 0.21.4