From 7f0525b15a49964b25a5fac37a7c87e75cbea131 Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Fri, 13 Jan 2017 12:38:54 +0800
Subject: [PATCH] Select: fix filterable error with number-typed value

---
 packages/select/src/option.vue | 2 +-
 packages/select/src/select.vue | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/select/src/option.vue b/packages/select/src/option.vue
index b9e1e142a..3a44e6f23 100644
--- a/packages/select/src/option.vue
+++ b/packages/select/src/option.vue
@@ -114,7 +114,7 @@
 
       queryChange(query) {
         // query 里如果有正则中的特殊字符，需要先将这些字符转义
-        let parsedQuery = query.replace(/(\^|\(|\)|\[|\]|\$|\*|\+|\.|\?|\\|\{|\}|\|)/g, '\\$1');
+        let parsedQuery = String(query).replace(/(\^|\(|\)|\[|\]|\$|\*|\+|\.|\?|\\|\{|\}|\|)/g, '\\$1');
         this.visible = new RegExp(parsedQuery, 'i').test(this.currentLabel) || this.created;
         if (!this.visible) {
           this.parent.filteredOptionsCount--;
diff --git a/packages/select/src/select.vue b/packages/select/src/select.vue
index 165b5eae5..a1dc7e021 100644
--- a/packages/select/src/select.vue
+++ b/packages/select/src/select.vue
@@ -49,7 +49,7 @@
       :disabled="disabled"
       :readonly="!filterable || multiple"
       :validate-event="false"
-      @focus="toggleMenu"
+      @focus="handleFocus"
       @click="handleIconClick"
       @mousedown.native="handleMouseDown"
       @keyup.native="debouncedOnInputChange"
@@ -403,6 +403,10 @@
         });
       },
 
+      handleFocus() {
+        this.visible = true;
+      },
+
       handleIconClick(event) {
         if (this.iconClass.indexOf('circle-close') > -1) {
           this.deleteSelected(event);