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

fixed #5216

Browse source
This commit is contained in:
mo.duan 2019-11-12 18:41:28 +08:00
parent 78e96edfdf
commit 5f04795b70
2 changed files with 55 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -413,7 +413,7 @@
if (!optionPassesFilter) continue;
}
optionCounter = optionCounter + 1;
selectOptions.push(this.processOption(option, selectedValues, this.focusIndex === optionCounter));
selectOptions.push(this.processOption(option, selectedValues, currentIndex === optionCounter));
}
}
@ -526,12 +526,10 @@
setTimeout(() =>{
this.unchangedQuery = true;
// resolve if we use filterable, dropItem not selected #6349
if(this.filterable){
this.hideMenuTimer = setTimeout(()=>{
this.updateFocusIndex();
this.hideMenuTimer = null;
});
}
this.hideMenuTimer = setTimeout(()=>{
this.updateFocusIndex();
this.hideMenuTimer = null;
});
}, ANIMATION_TIMEOUT);
},
onClickOutside(event){
@ -665,12 +663,9 @@
this.query = String(option.label).trim();
this.values = [option];
this.lastRemoteQuery = '';
this.query = '';
this.hideMenu();
}
this.focusIndex = this.flatOptions.findIndex((opt) => {
if (!opt || !opt.componentOptions) return false;
return opt.componentOptions.propsData.value === option.value;
});
if (this.filterable){
const inputField = this.$el.querySelector('input[type="text"]');
if (!this.autoComplete) this.$nextTick(() => inputField.focus());