From 8fbc8c719138ec80cece94f328b26731beb9badd Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Sat, 1 Apr 2017 11:21:35 +0800
Subject: [PATCH] fixed #555

---
 examples/routers/transfer.vue        | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
 src/components/transfer/transfer.vue |   3 +++
 2 files changed, 127 insertions(+), 48 deletions(-)

diff --git a/examples/routers/transfer.vue b/examples/routers/transfer.vue
index d19f993..9ebe3ac 100644
--- a/examples/routers/transfer.vue
+++ b/examples/routers/transfer.vue
@@ -1,51 +1,51 @@
-<template>
-    <div>
-        <Transfer
-            :data="data1"
-            filterable
-            :target-keys="targetKeys1"
-            :render-format="render1"
-            @on-change="handleChange1"></Transfer>
-    </div>
-</template>
-<script>
-    export default {
-        data () {
-            return {
-                data1: this.getMockData(),
-                targetKeys1: this.getTargetKeys()
-            }
-        },
-        methods: {
-            getMockData () {
-                let mockData = [];
-                for (let i = 1; i <= 20; i++) {
-                    mockData.push({
-                        key: i.toString(),
-                        label: '内容' + i,
-                        description: '内容' + i + '的描述信息',
-                        disabled: Math.random() * 3 < 1
-                    });
-                }
-                return mockData;
-            },
-            getTargetKeys () {
-                return this.getMockData()
-                    .filter(() => Math.random() * 2 > 1)
-                    .map(item => item.key);
-            },
-            render1 (item) {
-                return item.label;
-            },
-            handleChange1 (newTargetKeys, direction, moveKeys) {
-                console.log(newTargetKeys);
-                console.log(direction);
-                console.log(moveKeys);
-                this.targetKeys1 = newTargetKeys;
-            }
-        }
-    }
-</script>
+<!--<template>-->
+    <!--<div>-->
+        <!--<Transfer-->
+            <!--:data="data1"-->
+            <!--filterable-->
+            <!--:target-keys="targetKeys1"-->
+            <!--:render-format="render1"-->
+            <!--@on-change="handleChange1"></Transfer>-->
+    <!--</div>-->
+<!--</template>-->
+<!--<script>-->
+    <!--export default {-->
+        <!--data () {-->
+            <!--return {-->
+                <!--data1: this.getMockData(),-->
+                <!--targetKeys1: this.getTargetKeys()-->
+            <!--}-->
+        <!--},-->
+        <!--methods: {-->
+            <!--getMockData () {-->
+                <!--let mockData = [];-->
+                <!--for (let i = 1; i <= 20; i++) {-->
+                    <!--mockData.push({-->
+                        <!--key: i.toString(),-->
+                        <!--label: '内容' + i,-->
+                        <!--description: '内容' + i + '的描述信息',-->
+                        <!--disabled: Math.random() * 3 < 1-->
+                    <!--});-->
+                <!--}-->
+                <!--return mockData;-->
+            <!--},-->
+            <!--getTargetKeys () {-->
+                <!--return this.getMockData()-->
+                    <!--.filter(() => Math.random() * 2 > 1)-->
+                    <!--.map(item => item.key);-->
+            <!--},-->
+            <!--render1 (item) {-->
+                <!--return item.label;-->
+            <!--},-->
+            <!--handleChange1 (newTargetKeys, direction, moveKeys) {-->
+                <!--console.log(newTargetKeys);-->
+                <!--console.log(direction);-->
+                <!--console.log(moveKeys);-->
+                <!--this.targetKeys1 = newTargetKeys;-->
+            <!--}-->
+        <!--}-->
+    <!--}-->
+<!--</script>-->
 
 
 <!--<template>-->
@@ -148,3 +148,79 @@
         <!--}-->
     <!--}-->
 <!--</script>-->
+
+
+<template>
+    <div>
+        <Transfer
+                :data="data1"
+                filterable
+                :target-keys="targetKeys1"
+                :render-format="render1"
+                @on-change="handleChange1"></Transfer>
+    </div>
+</template>
+<script>
+    export default {
+        data () {
+            return {
+                data1: this.getMockData(),
+                targetKeys1: this.getTargetKeys()
+            }
+        },
+        created(){
+            console.log('--created--');
+            this.fetch();
+        },
+        methods: {
+            fetch() {
+                const _this = this;
+                setTimeout(function() {
+                    console.log('--1');
+                    // _this.data1 = null;
+                    _this.data1 = _this.getMockData1();
+                    console.log('-fetch-', _this.data1);
+
+                }, 1500);
+            },
+            getMockData () {
+                let mockData = [];
+                for (let i = 1; i <= 20; i++) {
+                    mockData.push({
+                        key: i.toString(),
+                        label: '内容' + i,
+                        description: '内容' + i + '的描述信息',
+                        disabled: Math.random() * 3 < 1
+                    });
+                }
+                return mockData;
+            },
+            getMockData1 () {
+                let mockData = [];
+                for (let i = 1; i <= 20; i++) {
+                    mockData.push({
+                        key: i.toString(),
+                        label: '内容11111' + i,
+                        description: '内容11111 ' + i + ' 1111的描述信息',
+                        // disabled: Math.random() * 3 < 1
+                    });
+                }
+                return mockData;
+            },
+            getTargetKeys () {
+                return this.getMockData()
+                    .filter(() => Math.random() * 2 > 1)
+                    .map(item => item.key);
+            },
+            render1 (item) {
+                return item.label;
+            },
+            handleChange1 (newTargetKeys, direction, moveKeys) {
+                console.log(newTargetKeys);
+                console.log(direction);
+                console.log(moveKeys);
+                this.targetKeys1 = newTargetKeys;
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/components/transfer/transfer.vue b/src/components/transfer/transfer.vue
index 4f32b76..d0006f1 100644
--- a/src/components/transfer/transfer.vue
+++ b/src/components/transfer/transfer.vue
@@ -244,6 +244,9 @@
         watch: {
             targetKeys () {
                 this.splitData(false);
+            },
+            data () {
+                this.splitData(false);
             }
         },
         created () {
--
libgit2 0.21.4