From 83b73885988cf62e29457e4161f4553712395c67 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Sat, 22 Apr 2017 14:00:10 +0800
Subject: [PATCH] fixed #718

---
 examples/routers/collapse.vue        |  2 +-
 examples/routers/select.vue          | 50 +++++++++-----------------------------------------
 src/components/cascader/caspanel.vue |  2 +-
 src/components/select/select.vue     |  5 ++++-
 4 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/examples/routers/collapse.vue b/examples/routers/collapse.vue
index 92a87a4..b4c3779 100644
--- a/examples/routers/collapse.vue
+++ b/examples/routers/collapse.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div style="width: 400px;margin: 200px;">
         <Collapse v-model="v1" accordion>
             <Panel name="1">
                 史蒂夫·乔布斯
diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index ab88428..6d5533b 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -1,50 +1,18 @@
 <template>
-    <Row>
-        <i-col span="12" style="padding-right:10px">
-        <Select v-model="model11" filterable>
-            <Option v-for="item in cityList" :value="item.value" :key="item">{{ item.label }}</Option>
-        </Select>
-        </i-col>
-        <i-col span="12">
-        <Select v-model="model12" filterable multiple>
-            <Option v-for="item in cityList" :value="item.value" :key="item">{{ item.label }}</Option>
-        </Select>
-        </i-col>
-    </Row>
+    <Select v-model="fields.pid" filterable>
+        <Option :value="0" label="一级菜单"></Option>
+        <Option :value="1" label="二级菜单"></Option>
+    </Select>
 </template>
+
 <script>
     export default {
         data () {
             return {
-                cityList: [
-                    {
-                        value: 'beijing',
-                        label: '北京市'
-                    },
-                    {
-                        value: 'shanghai',
-                        label: '上海市'
-                    },
-                    {
-                        value: 'shenzhen',
-                        label: '深圳市'
-                    },
-                    {
-                        value: 'hangzhou',
-                        label: '杭州市'
-                    },
-                    {
-                        value: 'nanjing',
-                        label: '南京市'
-                    },
-                    {
-                        value: 'chongqing',
-                        label: '重庆市'
-                    }
-                ],
-                model11: '',
-                model12: []
+                fields: {
+                    pid: 0
+                }
             }
         }
     }
-</script>
+</script>
\ No newline at end of file
diff --git a/src/components/cascader/caspanel.vue b/src/components/cascader/caspanel.vue
index 7a7adb8..ad8b21d 100644
--- a/src/components/cascader/caspanel.vue
+++ b/src/components/cascader/caspanel.vue
@@ -56,7 +56,7 @@
             handleTriggerItem (item, fromInit = false) {
                 if (item.disabled) return;
 
-                // return value back recursion
+                // return value back recursion  // 向上递归，设置临时选中值（并非真实选中）
                 const backItem = this.getBaseItem(item);
                 this.tmpItem = backItem;
                 this.emitUpdate([backItem]);
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 38c5759..f611d08 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -493,7 +493,7 @@
                 this.query = query;
             },
             modelToQuery() {
-                if (!this.multiple && this.filterable && this.model) {
+                if (!this.multiple && this.filterable && this.model !== undefined) {
                     this.findChild((child) => {
                         if (this.model === child.value) {
                             if (child.label) {
@@ -518,6 +518,9 @@
         },
         mounted () {
             this.modelToQuery();
+            this.$nextTick(() => {
+                this.broadcastQuery('');
+            });
 
             this.updateOptions(true);
             document.addEventListener('keydown', this.handleKeydown);
--
libgit2 0.21.4