From 67c9b1c8b99c1ac4df8009fc191a82c1f39723c6 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Mon, 10 Apr 2017 09:58:51 +0800
Subject: [PATCH] fixed #591

---
 examples/routers/table.vue     | 31 ++++++++++++++++++++++++++-----
 examples/routers/tabs.vue      | 78 ++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
 src/components/modal/modal.vue |  4 +++-
 src/components/table/table.vue |  3 +++
 src/components/tabs/tabs.vue   |  3 +++
 src/utils/assist.js            | 12 ++++++------
 6 files changed, 87 insertions(+), 44 deletions(-)

diff --git a/examples/routers/table.vue b/examples/routers/table.vue
index bed307c..cdd2a58 100644
--- a/examples/routers/table.vue
+++ b/examples/routers/table.vue
@@ -1,13 +1,14 @@
 <template>
-    <Table :columns="columns1" :data="data1">
-        <div slot="header">头部</div>
-        <div slot="footer">底部</div>
-    </Table>
+    <div>
+        <Table :height="height" border :columns="columns1" :data="data2"></Table>
+        <Button @click="height=800">change height</Button>
+    </div>
 </template>
 <script>
     export default {
         data () {
             return {
+                height: 200,
                 columns1: [
                     {
                         title: '姓名',
@@ -22,7 +23,27 @@
                         key: 'address'
                     }
                 ],
-                data1: [
+                data2: [
+                    {
+                        name: '王小明',
+                        age: 18,
+                        address: '北京市朝阳区芍药居'
+                    },
+                    {
+                        name: '张小刚',
+                        age: 25,
+                        address: '北京市海淀区西二旗'
+                    },
+                    {
+                        name: '李小红',
+                        age: 30,
+                        address: '上海市浦东新区世纪大道'
+                    },
+                    {
+                        name: '周小伟',
+                        age: 26,
+                        address: '深圳市南山区深南大道'
+                    },
                     {
                         name: '王小明',
                         age: 18,
diff --git a/examples/routers/tabs.vue b/examples/routers/tabs.vue
index 03d6d35..72dd650 100644
--- a/examples/routers/tabs.vue
+++ b/examples/routers/tabs.vue
@@ -1,42 +1,56 @@
 <template>
-    <Row>
-        <Col :span="12">
-            <Tabs type="card" closable @on-tab-remove="handleTagRemove">
-                <Tab-pane label="标签一" v-if="tab0">标签一的内容</Tab-pane>
-                <Tab-pane label="标签二" v-if="tab1">标签二的内容</Tab-pane>
-                <Tab-pane label="标签三" v-if="tab2">标签三的内容</Tab-pane>
-            </Tabs>
-        </Col>
-        <Col :span="12">
-            <Tabs type="card" closable @on-tab-remove="handleTagRemove">
-                <Tab-pane :label="tab.label" v-for="tab of tabs" :key="tab">{{tab.content}}</Tab-pane>
-                <Button size="small" slot="extra" @click="addTab">添加</Button>
-            </Tabs>
-        </Col>
-    </Row>
+    <Tabs value="name1" :animated="false">
+        <Tab-pane label="标签一" name="name1">
+            <Table :columns="columns1" :data="data1"></Table>
+        </Tab-pane>
+        <Tab-pane label="标签二" name="name2">
+            <Table :columns="columns1" :data="data1"></Table>
+        </Tab-pane>
+        <Tab-pane label="标签三" name="name3">
+            <Table :columns="columns1" :data="data1"></Table>
+        </Tab-pane>
+    </Tabs>
 </template>
-
-
 <script>
     export default {
         data () {
             return {
-                tabs:[
-                        {label:'标签0',content:'标签内容0'},
-                        {label:'标签1',content:'标签内容1'},
-                        {label:'标签2',content:'标签内容2'},
+                columns1: [
+                    {
+                        title: '姓名',
+                        key: 'name'
+                    },
+                    {
+                        title: '年龄',
+                        key: 'age'
+                    },
+                    {
+                        title: '地址',
+                        key: 'address'
+                    }
                 ],
-                tab0: true,
-                tab1: true,
-                tab2: true
-            }
-        },
-        methods: {
-            handleTagRemove (name) {
-                this['tab' + name] = false;
-            },
-            addTab(){
-                this.tabs.push({label:'标签'+this.tabs.length,content:'标签内容'+this.tabs.length});
+                data1: [
+                    {
+                        name: '王小明',
+                        age: 18,
+                        address: '北京市朝阳区芍药居'
+                    },
+                    {
+                        name: '张小刚',
+                        age: 25,
+                        address: '北京市海淀区西二旗'
+                    },
+                    {
+                        name: '李小红',
+                        age: 30,
+                        address: '上海市浦东新区世纪大道'
+                    },
+                    {
+                        name: '周小伟',
+                        age: 26,
+                        address: '深圳市南山区深南大道'
+                    }
+                ]
             }
         }
     }
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index 6d36fe9..8f8a7cf 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -32,12 +32,13 @@
     import TransferDom from '../../directives/transfer-dom';
     import { getScrollBarSize } from '../../utils/assist';
     import Locale from '../../mixins/locale';
+    import Emitter from '../../mixins/emitter';
 
     const prefixCls = 'ivu-modal';
 
     export default {
         name: 'Modal',
-        mixins: [ Locale ],
+        mixins: [ Locale, Emitter ],
         components: { Icon, iButton },
         directives: { TransferDom },
         props: {
@@ -247,6 +248,7 @@
                         this.addScrollEffect();
                     }
                 }
+                this.broadcast('Table', 'on-visible-change', val);
             },
             loading (val) {
                 if (!val) {
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 1b588c1..1505967 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -664,6 +664,9 @@
             this.fixedHeader();
             this.$nextTick(() => this.ready = true);
             window.addEventListener('resize', this.handleResize, false);
+            this.$on('on-visible-change', (val) => {
+                if (val) this.handleResize();
+            });
         },
         beforeDestroy () {
             window.removeEventListener('resize', this.handleResize, false);
diff --git a/src/components/tabs/tabs.vue b/src/components/tabs/tabs.vue
index b883f34..cc882ac 100644
--- a/src/components/tabs/tabs.vue
+++ b/src/components/tabs/tabs.vue
@@ -23,11 +23,13 @@
 <script>
     import Icon from '../icon/icon.vue';
     import { oneOf, getStyle } from '../../utils/assist';
+    import Emitter from '../../mixins/emitter';
 
     const prefixCls = 'ivu-tabs';
 
     export default {
         name: 'Tabs',
+        mixins: [ Emitter ],
         components: { Icon },
         props: {
             value: {
@@ -226,6 +228,7 @@
             activeKey () {
                 this.updateBar();
                 this.updateStatus();
+                this.broadcast('Table', 'on-visible-change', true);
             }
         },
         mounted () {
diff --git a/src/utils/assist.js b/src/utils/assist.js
index e82147c..daabffd 100644
--- a/src/utils/assist.js
+++ b/src/utils/assist.js
@@ -168,14 +168,14 @@ export function scrollTop(el, from = 0, to, duration = 500) {
 }
 
 // Find components upward
-function findComponentUpward (content, componentName, componentNames) {
+function findComponentUpward (context, componentName, componentNames) {
     if (typeof componentName === 'string') {
         componentNames = [componentName];
     } else {
         componentNames = componentName;
     }
 
-    let parent = content.$parent;
+    let parent = context.$parent;
     let name = parent.$options.name;
     while (parent && (!name || componentNames.indexOf(name) < 0)) {
         parent = parent.$parent;
@@ -186,8 +186,8 @@ function findComponentUpward (content, componentName, componentNames) {
 export {findComponentUpward};
 
 // Find component downward
-function findComponentDownward (content, componentName) {
-    const childrens = content.$children;
+function findComponentDownward (context, componentName) {
+    const childrens = context.$children;
     let children = null;
 
     if (childrens.length) {
@@ -215,8 +215,8 @@ function findComponentDownward (content, componentName) {
 export {findComponentDownward};
 
 // Find components downward
-function findComponentsDownward (content, componentName, components = []) {
-    const childrens = content.$children;
+function findComponentsDownward (context, componentName, components = []) {
+    const childrens = context.$children;
 
     if (childrens.length) {
         childrens.forEach(child => {
--
libgit2 0.21.4