drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

erge remote-tracking branch 'iview/2.0' into 2.0_upgrade

Browse source
This commit is contained in:
jilen 2020-02-24 09:42:15 +08:00
commit 6d36ba64da
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/select/select.vue
View file

@ -662,17 +662,23 @@
} }
this.isFocused = true; // so we put back focus after clicking with mouse on option elements this.isFocused = true; // so we put back focus after clicking with mouse on option elements
} else { } else {
this.query = ''; this.query = String(option.label).trim();
this.values = [option]; this.values = [option];
this.lastRemoteQuery = ''; this.lastRemoteQuery = '';
this.hideMenu(); this.hideMenu();
} }
this.focusIndex = this.flatOptions.findIndex((opt) => {
if (!opt || !opt.componentOptions) return false;
return opt.componentOptions.propsData.value === option.value;
});
if (this.filterable){ if (this.filterable){
const inputField = this.$el.querySelector('input[type="text"]'); const inputField = this.$el.querySelector('input[type="text"]');
if (!this.autoComplete) this.$nextTick(() => inputField.focus()); if (!this.autoComplete) this.$nextTick(() => inputField.focus());
} }
this.$emit('on-select', option); // # 4441
this.broadcast('Drop', 'on-update-popper'); this.broadcast('Drop', 'on-update-popper');
this.$emit('on-select', this.publicValue); // # 4441
setTimeout(() => { setTimeout(() => {
this.filterQueryChange = false; this.filterQueryChange = false;
}, ANIMATION_TIMEOUT); }, ANIMATION_TIMEOUT);