From 3db9783041d9d3e6210300847a4f5aaa7aab6f63 Mon Sep 17 00:00:00 2001
From: lifenglu <fengluhome@163.com>
Date: Mon, 14 Oct 2019 11:42:58 +0800
Subject: [PATCH 1/2] #4441

---
 examples/routers/auto-complete.vue            | 45 ++++++++++++-------
 .../auto-complete/auto-complete.vue           |  5 ++-
 src/components/select/select.vue              |  1 +
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/examples/routers/auto-complete.vue b/examples/routers/auto-complete.vue
index ba8cc5c5..0c4e1337 100644
--- a/examples/routers/auto-complete.vue
+++ b/examples/routers/auto-complete.vue
@@ -1,36 +1,47 @@
 <template>
     <div style="margin: 100px;width: 200px;">
-        <AutoComplete placement="top" transfer v-model="value" icon="ios-search" :data="data" @on-search="handleSearch" @on-change="hc" :filter-method="fm">
+        <AutoComplete
+            placement="top"
+            transfer
+            v-model="value"
+            icon="ios-search"
+            :data="data"
+            @on-search="onHandleSearch"
+            @on-change="onChange"
+            @on-select="onSelect"
+        >
             <!--<Option v-for="item in data" :value="item" :label="item" :key="item">-->
-                <!--<span style="color: red">{{ item }}</span>-->
+            <!--<span style="color: red">{{ item }}</span>-->
             <!--</Option>-->
         </AutoComplete>
     </div>
 </template>
 <script>
-
     export default {
-        props: {
-
-        },
+        props: {},
         data () {
             return {
-                value: '',
-                data: [],
-//                data: ['Burns Bay Road', 'Downing Street', 'Wall Street']
+                value: "",
+                source: ["1", "2", "3", "11", "12", "13"],
+                data: []
             };
         },
         computed: {},
         methods: {
-            handleSearch (value) {
-                this.data = !value ? [] : [
-                    value + '@qq.com',
-                    value + '@sina.com',
-                    value + '@163.com'
-                ]
+            onHandleSearch (value) {
+                let result = [];
+                for (let val of this.source) {
+                    if (val.includes(value)) {
+                        result.push(val);
+                    }
+                }
+                this.data = result;
             },
-            hc (v) {
-//                console.log(v)
+            onSelect (e) {
+                console.log('onSelect', e);
+            },
+            onChange (v) {
+                console.log("onChange", v);
             },
             fm (value, item) {
                 return item.toUpperCase().indexOf(value.toUpperCase()) !== -1;
diff --git a/src/components/auto-complete/auto-complete.vue b/src/components/auto-complete/auto-complete.vue
index 91eb15d3..99093e6e 100644
--- a/src/components/auto-complete/auto-complete.vue
+++ b/src/components/auto-complete/auto-complete.vue
@@ -13,7 +13,7 @@
         remote
         auto-complete
         :remote-method="remoteMethod"
-        @on-change="handleChange"
+        @on-select="handleSelect"
         @on-clickoutside="handleClickOutside"
         :transfer="transfer">
         <slot name="input">
@@ -152,9 +152,10 @@
             remoteMethod (query) {
                 this.$emit('on-search', query);
             },
-            handleChange (val) {
+            handleSelect (val) {
                 if (val === undefined || val === null) return;
                 this.currentValue = val;
+
                 this.$refs.input.blur();
                 this.$emit('on-select', val);
             },
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index f853d30b..971fcb4b 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -661,6 +661,7 @@
                     if (!this.autoComplete) this.$nextTick(() => inputField.focus());
                 }
                 this.broadcast('Drop', 'on-update-popper');
+                this.$emit('on-select', this.publicValue); // # 4441
                 setTimeout(() => {
                     this.filterQueryChange = false;
                 }, ANIMATION_TIMEOUT);

From 8b7c5c249a6907c516254aea6add0e095b49fa2c Mon Sep 17 00:00:00 2001
From: lifenglu <fengluhome@163.com>
Date: Mon, 14 Oct 2019 11:42:58 +0800
Subject: [PATCH 2/2] bug fixed #4441

---
 examples/routers/auto-complete.vue            | 45 ++++++++++++-------
 .../auto-complete/auto-complete.vue           |  5 ++-
 src/components/select/select.vue              |  1 +
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/examples/routers/auto-complete.vue b/examples/routers/auto-complete.vue
index ba8cc5c5..0c4e1337 100644
--- a/examples/routers/auto-complete.vue
+++ b/examples/routers/auto-complete.vue
@@ -1,36 +1,47 @@
 <template>
     <div style="margin: 100px;width: 200px;">
-        <AutoComplete placement="top" transfer v-model="value" icon="ios-search" :data="data" @on-search="handleSearch" @on-change="hc" :filter-method="fm">
+        <AutoComplete
+            placement="top"
+            transfer
+            v-model="value"
+            icon="ios-search"
+            :data="data"
+            @on-search="onHandleSearch"
+            @on-change="onChange"
+            @on-select="onSelect"
+        >
             <!--<Option v-for="item in data" :value="item" :label="item" :key="item">-->
-                <!--<span style="color: red">{{ item }}</span>-->
+            <!--<span style="color: red">{{ item }}</span>-->
             <!--</Option>-->
         </AutoComplete>
     </div>
 </template>
 <script>
-
     export default {
-        props: {
-
-        },
+        props: {},
         data () {
             return {
-                value: '',
-                data: [],
-//                data: ['Burns Bay Road', 'Downing Street', 'Wall Street']
+                value: "",
+                source: ["1", "2", "3", "11", "12", "13"],
+                data: []
             };
         },
         computed: {},
         methods: {
-            handleSearch (value) {
-                this.data = !value ? [] : [
-                    value + '@qq.com',
-                    value + '@sina.com',
-                    value + '@163.com'
-                ]
+            onHandleSearch (value) {
+                let result = [];
+                for (let val of this.source) {
+                    if (val.includes(value)) {
+                        result.push(val);
+                    }
+                }
+                this.data = result;
             },
-            hc (v) {
-//                console.log(v)
+            onSelect (e) {
+                console.log('onSelect', e);
+            },
+            onChange (v) {
+                console.log("onChange", v);
             },
             fm (value, item) {
                 return item.toUpperCase().indexOf(value.toUpperCase()) !== -1;
diff --git a/src/components/auto-complete/auto-complete.vue b/src/components/auto-complete/auto-complete.vue
index 91eb15d3..99093e6e 100644
--- a/src/components/auto-complete/auto-complete.vue
+++ b/src/components/auto-complete/auto-complete.vue
@@ -13,7 +13,7 @@
         remote
         auto-complete
         :remote-method="remoteMethod"
-        @on-change="handleChange"
+        @on-select="handleSelect"
         @on-clickoutside="handleClickOutside"
         :transfer="transfer">
         <slot name="input">
@@ -152,9 +152,10 @@
             remoteMethod (query) {
                 this.$emit('on-search', query);
             },
-            handleChange (val) {
+            handleSelect (val) {
                 if (val === undefined || val === null) return;
                 this.currentValue = val;
+
                 this.$refs.input.blur();
                 this.$emit('on-select', val);
             },
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index f853d30b..971fcb4b 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -661,6 +661,7 @@
                     if (!this.autoComplete) this.$nextTick(() => inputField.focus());
                 }
                 this.broadcast('Drop', 'on-update-popper');
+                this.$emit('on-select', this.publicValue); // # 4441
                 setTimeout(() => {
                     this.filterQueryChange = false;
                 }, ANIMATION_TIMEOUT);