From 687c4562f12e3e6adc704b6163e9eab4c8623a21 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Thu, 4 May 2017 10:33:50 +0800
Subject: [PATCH] fixed #810

---
 examples/routers/cascader.vue        | 8 +++-----
 src/components/cascader/cascader.vue | 6 ++++--
 src/components/cascader/caspanel.vue | 3 ---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/examples/routers/cascader.vue b/examples/routers/cascader.vue
index 246881a..8892ae7 100644
--- a/examples/routers/cascader.vue
+++ b/examples/routers/cascader.vue
@@ -1,14 +1,13 @@
 <template>
-    <div>
-        <Cascader :data="data2" v-model="v1" disabled clearable></Cascader>
-        <Cascader :data="data2" clearable></Cascader>
+    <div style="width: 300px;margin: 100px;">
+        <Cascader :data="data2" v-model="v1" change-on-select></Cascader>
     </div>
 </template>
 <script>
     export default {
         data () {
             return {
-                v1: ['zhejiang', 'hangzhou', 'xihu'],
+                v1: ['zhejiang'],
                 data2: [{
                     value: 'zhejiang',
                     label: '浙江',
@@ -23,7 +22,6 @@
                 }, {
                     value: 'jiangsu',
                     label: '江苏',
-                    disabled: true,
                     children: [{
                         value: 'nanjing',
                         label: '南京',
diff --git a/src/components/cascader/cascader.vue b/src/components/cascader/cascader.vue
index 5768d1e..331a6e2 100644
--- a/src/components/cascader/cascader.vue
+++ b/src/components/cascader/cascader.vue
@@ -172,8 +172,7 @@
                 }
             }
         },
-        mounted () {
-            this.updateSelected(true);
+        created () {
             this.$on('on-result-change', (params) => {
                 // lastValue: is click the final val
                 // fromInit: is this emit from update value
@@ -201,6 +200,9 @@
                 }
             });
         },
+        mounted () {
+            this.updateSelected(true);
+        },
         watch: {
             visible (val) {
                 if (val) {
diff --git a/src/components/cascader/caspanel.vue b/src/components/cascader/caspanel.vue
index ad8b21d..6505ee1 100644
--- a/src/components/cascader/caspanel.vue
+++ b/src/components/cascader/caspanel.vue
@@ -60,10 +60,8 @@
                 const backItem = this.getBaseItem(item);
                 this.tmpItem = backItem;
                 this.emitUpdate([backItem]);
-
                 if (item.children && item.children.length){
                     this.sublist = item.children;
-//                    this.$dispatch('on-result-change', false, this.changeOnSelect, fromInit);
                     this.dispatch('Cascader', 'on-result-change', {
                         lastValue: false,
                         changeOnSelect: this.changeOnSelect,
@@ -71,7 +69,6 @@
                     });
                 } else {
                     this.sublist = [];
-//                    this.$dispatch('on-result-change', true, this.changeOnSelect, fromInit);
                     this.dispatch('Cascader', 'on-result-change', {
                         lastValue: true,
                         changeOnSelect: this.changeOnSelect,
--
libgit2 0.21.4