fixed #2793

梁灏
1 parent a73ae72b
Showing 2 changed files with 16 additions and 13 deletions Show diff stats
examples/routers/cascader.vue
src/components/cascader/cascader.vue
 <template>
-    <Cascader v-model="value3" :data="data" filterable @on-change="hc"></Cascader>
+    <div style="margin: 100px;width: 300px;">
+        <Cascader v-model="value" :data="data" change-on-select></Cascader>
+    </div>
 </template>
 <script>
     export default {
         data () {
             return {
-                data: [{
+                value: ['beijing', 'gugong'],
+                data: []
+            }
+        },
+        mounted () {
+            setTimeout(() => {
+                this.data = [{
                     value: 'beijing',
                     label: '北京',
                     children: [
@@ -51,14 +59,8 @@
                             ]
                         }
                     ],
-                }],
-                value3: []
-            }
-        },
-        methods: {
-            hc (a,b) {
-                console.log(a,b)
-            }
+                }];
+            }, 100)
         }
     }
 </script>
@@ -258,8 +258,9 @@
             updateResult (result) {
                 this.tmpSelected = result;
             },
-            updateSelected (init = false) {
-                if (!this.changeOnSelect || init) {
+            updateSelected (init = false, changeOnSelectDataChange = false) {
+                // #2793 changeOnSelectDataChange used for changeOnSelect when data changed and set value
+                if (!this.changeOnSelect || init || changeOnSelectDataChange) {
                     this.broadcast('Caspanel', 'on-find-selected', {
                         value: this.currentValue
                     });
@@ -386,7 +387,7 @@
                     if (validDataStr !== this.validDataStr) {
                         this.validDataStr = validDataStr;
                         if (!this.isLoadedChildren) {
-                            this.$nextTick(() => this.updateSelected());
+                            this.$nextTick(() => this.updateSelected(false, this.changeOnSelect));
                         }
                         this.isLoadedChildren = false;
                     }