Merge branch 'next' of github.com:eleme/element-ui into next

0ed08bd9 · qingwei.li · 8a69ed9f · 5abde26e · 0ed08bd9
Commit 0ed08bd9 authored Sep 01, 2016 by qingwei.li
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

packages/select/src/select.vue packages/select/src/select.vue +3 -4

No files found.
--- a/packages/select/src/select.vue
+++ b/packages/select/src/select.vue
@@ -197,13 +197,12 @@
          });
        }
        if (!this.multiple) {
-          if (val === '') {
-            this.selected = {};
-            this.selectedLabel = '';
-          }
          let option = this.options.filter(option => option.value === val)[0];
          if (option) {
            this.$emit('addOptionToValue', option);
+          } else {
+            this.selected = {};
+            this.selectedLabel = '';
          }
        }
        this.resetHoverIndex();