From 219e5c925147a29f858353c2c4297262b82e86b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Fri, 19 May 2017 10:49:47 +0800
Subject: [PATCH] fixed #957

---
 examples/routers/select.vue      | 247 +++++++++++++++++++------------
 src/components/select/select.vue |   6 +
 2 files changed, 160 insertions(+), 93 deletions(-)

diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 6cea6dee..b2986b89 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -1,105 +1,166 @@
-<template>
-    <Row>
-        <i-col span="4">{{model}}</i-col>
-        <i-col span="8">
-            <i-select v-model="model" :label="['L Alabama', 'L Hawaii']" multiple @input="handleInput" filterable remote :remote-method="remoteMethod" :loading="loading" clearable>
-                <i-option v-for="option in options" :value="option.value" :key="new Date()">{{option.label}}</i-option>
-            </i-select>
-        </i-col>
-    </Row>
-</template>
+<!--<template>-->
+    <!--<Row>-->
+        <!--<i-col span="4">{{model}}</i-col>-->
+        <!--<i-col span="8">-->
+            <!--<i-select v-model="model" :label="['L Alabama', 'L Hawaii']" multiple @input="handleInput" filterable remote :remote-method="remoteMethod" :loading="loading" clearable>-->
+                <!--<i-option v-for="option in options" :value="option.value" :key="new Date()">{{option.label}}</i-option>-->
+            <!--</i-select>-->
+        <!--</i-col>-->
+    <!--</Row>-->
+<!--</template>-->
 
+<!--<script>-->
+    <!--export default {-->
+        <!--data () {-->
+            <!--return {-->
+<!--//                model: 'Alabama',-->
+                <!--model: ['Alabama', 'Hawaii'],-->
+                <!--options: [-->
+
+                <!--],-->
+                <!--list: [],-->
+                <!--loading: false,-->
+                <!--states: ["Al", "Alabama", "Alaska", "Arizona",-->
+                    <!--"Arkansas", "California", "Colorado",-->
+                    <!--"Connecticut", "Delaware", "Florida",-->
+                    <!--"Georgia", "Hawaii", "Idaho", "Illinois",-->
+                    <!--"Indiana", "Iowa", "Kansas", "Kentucky",-->
+                    <!--"Louisiana", "Maine", "Maryland",-->
+                    <!--"Massachusetts", "Michigan", "Minnesota",-->
+                    <!--"Mississippi", "Missouri", "Montana",-->
+                    <!--"Nebraska", "Nevada", "New Hampshire",-->
+                    <!--"New Jersey", "New Mexico", "New York",-->
+                    <!--"North Carolina", "North Dakota", "Ohio",-->
+                    <!--"Oklahoma", "Oregon", "Pennsylvania",-->
+                    <!--"Rhode Island", "South Carolina",-->
+                    <!--"South Dakota", "Tennessee", "Texas",-->
+                    <!--"Utah", "Vermont", "Virginia",-->
+                    <!--"Washington", "West Virginia", "Wisconsin",-->
+                    <!--"Wyoming"]-->
+            <!--}-->
+        <!--},-->
+        <!--mounted () {-->
+            <!--this.options = [-->
+<!--//                {-->
+<!--//                    label: '全部',-->
+<!--//                    value: 0-->
+<!--//                },{-->
+<!--//                    label: '苹果',-->
+<!--//                    value: 1-->
+<!--//                },{-->
+<!--//                    label: '香蕉',-->
+<!--//                    value: 2-->
+<!--//                },{-->
+<!--//                    label: '西瓜',-->
+<!--//                    value: 3-->
+<!--//                }-->
+            <!--];-->
+        <!--},-->
+        <!--methods: {-->
+            <!--handleAdd () {-->
+                <!--this.options = [-->
+                    <!--{-->
+                        <!--label: '全部',-->
+                        <!--value: 0-->
+                    <!--},{-->
+                        <!--label: '苹果',-->
+                        <!--value: 1-->
+                    <!--},{-->
+                        <!--label: '香蕉',-->
+                        <!--value: 2-->
+                    <!--},{-->
+                        <!--label: '西瓜',-->
+                        <!--value: 3-->
+                    <!--}-->
+                <!--]-->
+            <!--},-->
+            <!--remoteMethod (query) {-->
+                <!--console.log(13)-->
+                <!--if (query !== '') {-->
+                    <!--this.loading = true;-->
+                    <!--setTimeout(() => {-->
+                        <!--this.loading = false;-->
+                        <!--this.options = this.list.filter(item => {-->
+                            <!--return item.label.toLowerCase()-->
+                                    <!--.indexOf(query.toLowerCase()) > -1;-->
+                        <!--});-->
+                    <!--}, 500);-->
+                <!--} else {-->
+                    <!--this.options = [];-->
+                <!--}-->
+            <!--},-->
+            <!--handleInput () {-->
+<!--//                console.log(1)-->
+            <!--}-->
+        <!--},-->
+        <!--mounted () {-->
+            <!--this.list = this.states.map(item => {-->
+                <!--return {-->
+                    <!--value: item,-->
+                    <!--label: 'L ' + item-->
+                <!--};-->
+            <!--});-->
+        <!--}-->
+    <!--}-->
+<!--</script>-->
+
+
+<template>
+    <div>
+        <Row style="width: 400px;">
+            <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>
+        <Button @click="handleSet">set</Button>
+    </div>
+</template>
 <script>
     export default {
         data () {
             return {
-//                model: 'Alabama',
-                model: ['Alabama', 'Hawaii'],
-                options: [
-
+                cityList: [
+                    {
+                        value: 'beijing',
+                        label: '北京市'
+                    },
+                    {
+                        value: 'shanghai',
+                        label: '上海市'
+                    },
+                    {
+                        value: 'shenzhen',
+                        label: '深圳市'
+                    },
+                    {
+                        value: 'hangzhou',
+                        label: '杭州市'
+                    },
+                    {
+                        value: 'nanjing',
+                        label: '南京市'
+                    },
+                    {
+                        value: 'chongqing',
+                        label: '重庆市'
+                    }
                 ],
-                list: [],
-                loading: false,
-                states: ["Al", "Alabama", "Alaska", "Arizona",
-                    "Arkansas", "California", "Colorado",
-                    "Connecticut", "Delaware", "Florida",
-                    "Georgia", "Hawaii", "Idaho", "Illinois",
-                    "Indiana", "Iowa", "Kansas", "Kentucky",
-                    "Louisiana", "Maine", "Maryland",
-                    "Massachusetts", "Michigan", "Minnesota",
-                    "Mississippi", "Missouri", "Montana",
-                    "Nebraska", "Nevada", "New Hampshire",
-                    "New Jersey", "New Mexico", "New York",
-                    "North Carolina", "North Dakota", "Ohio",
-                    "Oklahoma", "Oregon", "Pennsylvania",
-                    "Rhode Island", "South Carolina",
-                    "South Dakota", "Tennessee", "Texas",
-                    "Utah", "Vermont", "Virginia",
-                    "Washington", "West Virginia", "Wisconsin",
-                    "Wyoming"]
+                model11: '',
+                model12: []
             }
         },
-        mounted () {
-            this.options = [
-//                {
-//                    label: '全部',
-//                    value: 0
-//                },{
-//                    label: '苹果',
-//                    value: 1
-//                },{
-//                    label: '香蕉',
-//                    value: 2
-//                },{
-//                    label: '西瓜',
-//                    value: 3
-//                }
-            ];
-        },
         methods: {
-            handleAdd () {
-                this.options = [
-                    {
-                        label: '全部',
-                        value: 0
-                    },{
-                        label: '苹果',
-                        value: 1
-                    },{
-                        label: '香蕉',
-                        value: 2
-                    },{
-                        label: '西瓜',
-                        value: 3
-                    }
-                ]
-            },
-            remoteMethod (query) {
-                console.log(13)
-                if (query !== '') {
-                    this.loading = true;
-                    setTimeout(() => {
-                        this.loading = false;
-                        this.options = this.list.filter(item => {
-                            return item.label.toLowerCase()
-                                    .indexOf(query.toLowerCase()) > -1;
-                        });
-                    }, 500);
-                } else {
-                    this.options = [];
-                }
-            },
-            handleInput () {
-//                console.log(1)
+            handleSet () {
+                this.model11 = 'shanghai';
+//                this.model12 = ['beijing'];
             }
-        },
-        mounted () {
-            this.list = this.states.map(item => {
-                return {
-                    value: item,
-                    label: 'L ' + item
-                };
-            });
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 368e2117..bcda26e8 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -694,6 +694,12 @@
                 } else {
                     this.updateSingleSelected();
                 }
+                // #957
+                if (!this.visible && this.filterable) {
+                    this.$nextTick(() => {
+                        this.broadcastQuery('');
+                    });
+                }
             },
             visible (val) {
                 if (val) {