Select: Fix show empty option when value is undefined (ElemeFE#15007)

luckyCao · May 15, 2019 · 65da4c4 · 65da4c4
1 parent 16a6059
commit 65da4c4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/examples/play/index.vue b/examples/play/index.vue
@@ -1,14 +1,34 @@
 <template>
-  <div style="margin: 20px;">
-    <el-input v-model="input" placeholder="请输入内容"></el-input>
-  </div>
+  <el-select
+          v-model="value10"
+          filterable
+          allow-create
+          default-first-option
+          placeholder="请选择文章标签">
+    <el-option
+            v-for="item in options5"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+    </el-option>
+  </el-select>
 </template>
 
 <script>
   export default {
     data() {
       return {
-        input: 'Hello Element UI!'
+        options5: [{
+          value: 'HTML',
+          label: 'HTML'
+        }, {
+          value: 'CSS',
+          label: 'CSS'
+        }, {
+          value: 'JavaScript',
+          label: 'JavaScript'
+        }],
+        value10: undefined
       };
     }
   };

diff --git a/packages/select/src/select.vue b/packages/select/src/select.vue
@@ -510,6 +510,7 @@
         let option;
         const isObject = Object.prototype.toString.call(value).toLowerCase() === '[object object]';
         const isNull = Object.prototype.toString.call(value).toLowerCase() === '[object null]';
+        const isUndefined = value === undefined;
 
         for (let i = this.cachedOptions.length - 1; i >= 0; i--) {
           const cachedOption = this.cachedOptions[i];
@@ -522,7 +523,7 @@
           }
         }
         if (option) return option;
-        const label = (!isObject && !isNull)
+        const label = (!isObject && !isNull && !isUndefined)
           ? value : '';
         let newOption = {
           value: value,