diff --git a/src/components/auto-complete/auto-complete.vue b/src/components/auto-complete/auto-complete.vue index 4fcf8650..842a6442 100644 --- a/src/components/auto-complete/auto-complete.vue +++ b/src/components/auto-complete/auto-complete.vue @@ -8,6 +8,7 @@ :placeholder="placeholder" :size="size" :placement="placement" + :value="currentValue" filterable remote auto-complete @@ -146,22 +147,19 @@ }, handleChange (val) { this.currentValue = val; - this.$refs.select.model = val; this.$refs.input.blur(); this.$emit('on-select', val); }, handleFocus (event) { - this.$refs.select.visible = true; this.$emit('on-focus', event); }, handleBlur (event) { - this.$refs.select.visible = false; this.$emit('on-blur', event); }, handleClear () { if (!this.clearable) return; this.currentValue = ''; - this.$refs.select.model = ''; + this.$refs.select.reset(); } } }; diff --git a/src/components/select/select.vue b/src/components/select/select.vue index d3d41512..010faa3c 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -346,7 +346,7 @@ const selectedSlotOption = autoCompleteOptions[currentIndex]; return slotOptions.map(node => { - if (node === selectedSlotOption) return applyProp(node, 'isFocused', true); + if (node === selectedSlotOption || getNestedProperty(node, 'componentOptions.propsData.value') === this.value) return applyProp(node, 'isFocused', true); return copyChildren(node, (child) => { if (child !== selectedSlotOption) return child; return applyProp(child, 'isFocused', true); @@ -467,7 +467,7 @@ }, toggleMenu (e, force) { - if (this.disabled || this.autoComplete) { + if (this.disabled) { return false; }