From c736b0f1e04f25ec3915e30683e68095be1098fc Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Mon, 24 Dec 2018 14:12:32 +0800
Subject: [PATCH] fix #4189

---
 examples/routers/cascader.vue        | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
 src/components/cascader/caspanel.vue |   6 +++++-
 2 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue
index b675e0c..390d36b 100644
--- a/examples/routers/cascader.vue
+++ b/examples/routers/cascader.vue
@@ -1,61 +1,77 @@
 <template>
-    <Cascader :data="data4" :load-data="loadData"></Cascader>
+    <div>
+        <Row>
+            <i-col span="18">
+                <i-button v-on:click="setValue">setValue</i-button>
+            </i-col>
+            <i-col span="4">
+                <Cascader :data="data" v-model="value1" transfer></Cascader>
+            </i-col>
+        </Row>
+    </div>
 </template>
 <script>
     export default {
         data () {
             return {
-                data4: [
-                    {
-                        value: 'beijing',
-                        label: '北京',
-                        children: [],
-                        loading: false
-                    },
-                    {
-                        value: 'hangzhou',
-                        label: '杭州',
-                        children: [],
-                        loading:false
-                    }
-                ]
+                value1: [],
+                data: [{
+                    value: '9ecec83c-cf6b-4cfe-aa75-eb3510875331',
+                    label: '北京',
+                    children: [{
+                        value: 'a873a9bd-7d75-4f46-9369-4d25a1feb13c',
+                        label: '故宫'
+                    }, {
+                        value: 'tiantan',
+                        label: '天坛'
+                    }, {
+                        value: 'wangfujing',
+                        label: '王府井'
+                    }]
+                }, {
+                    value: 'ca7c0fbc-728d-42e8-b111-f5f73cf9171b',
+                    label: '江苏',
+                    children: [{
+                        value: 'a89d891b-5c50-44c0-87b4-d4f934edc921',
+                        label: '南京',
+                        children: [{
+                            value: '44736384-0ede-41ba-bf7a-59c84241851a',
+                            label: '夫子庙中国第一庙来自南京',
+                            children:[{
+                                value: '44736384-0ede-41ba-bf7a-59c84241851c',
+                                label:'自定义产品系统来自黑龙江地区'
+                            }]
+                        }]
+                    }, {
+                        value: 'suzhou',
+                        label: '苏州',
+                        children: [{
+                            value: 'zhuozhengyuan',
+                            label: '拙政园',
+                        }, {
+                            value: 'shizilin',
+                            label: '狮子林',
+                        }]
+                    }],
+                }]
             }
         },
         methods: {
-            loadData (item, callback) {
-                item.loading = true;
-                setTimeout(() => {
-                    if (item.value === 'beijing') {
-                        item.children = [
-                            {
-                                value: 'talkingdata',
-                                label: 'TalkingData'
-                            },
-                            {
-                                value: 'baidu',
-                                label: '百度'
-                            },
-                            {
-                                value: 'sina',
-                                label: '新浪'
-                            }
-                        ];
-                    } else if (item.value === 'hangzhou') {
-                        item.children = [
-                            {
-                                value: 'ali',
-                                label: '阿里巴巴'
-                            },
-                            {
-                                value: '163',
-                                label: '网易'
-                            }
-                        ];
-                    }
-                    item.loading = false;
-                    callback();
-                }, 1000);
+            setValue() {
+                var v = "ca7c0fbc-728d-42e8-b111-f5f73cf9171b,a89d891b-5c50-44c0-87b4-d4f934edc921,44736384-0ede-41ba-bf7a-59c84241851a";
+                var x = v.split(',')
+                var x1 = x[0].toString();
+                var x2 = x[1].toString();
+                var x3 = x[2].toString();
+
+                this.value1 = x;
             }
+        },
+        mounted () {
+
         }
     }
 </script>
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/components/cascader/caspanel.vue b/src/components/cascader/caspanel.vue
index 7b5829d..bcdd82d 100644
--- a/src/components/cascader/caspanel.vue
+++ b/src/components/cascader/caspanel.vue
@@ -59,8 +59,8 @@
             handleTriggerItem (item, fromInit = false, fromUser = false) {
                 if (item.disabled) return;
 
+                const cascader = findComponentUpward(this, 'Cascader');
                 if (item.loading !== undefined && !item.children.length) {
-                    const cascader = findComponentUpward(this, 'Cascader');
                     if (cascader && cascader.loadData) {
                         cascader.loadData(item, () => {
                             // todo
@@ -110,6 +110,10 @@
                         fromInit: fromInit
                     });
                 }
+
+                if (cascader) {
+                    cascader.$refs.drop.update();
+                }
             },
             updateResult (item) {
                 this.result = [this.tmpItem].concat(item);
--
libgit2 0.21.4