From 78824cc259637dbc51a12d111652d440f9510ef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=95=8F?= <andy@zhengmins-MacBook-Pro.local>
Date: Thu, 7 Jun 2018 14:06:30 +0800
Subject: [PATCH] fixed #3817 that the default value does't display bug.

---
 src/components/select/select.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 4f89f0d3..ceca5274 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -351,7 +351,7 @@
                         });
                     });
                 }
-                let hasDefaultSelected = slotOptions.some(option => this.query === option.key);
+                let hasDefaultSelected = slotOptions.some(option => this.query === option.componentOptions.propsData.value);
                 for (let option of slotOptions) {
 
                     const cOptions = option.componentOptions;
@@ -426,6 +426,7 @@
                 const {multiple, value} = this;
                 let initialValue = Array.isArray(value) ? value : [value];
                 if (!multiple && (typeof initialValue[0] === 'undefined' || (String(initialValue[0]).trim() === '' && !Number.isFinite(initialValue[0])))) initialValue = [];
+                if (this.remote && this.value) this.query = value;
                 return initialValue.filter((item) => {
                     return Boolean(item) || item === 0;
                 });