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

it will make a new bug, so revert

Browse source
This commit is contained in:
梁灏 2018-09-25 09:45:24 +08:00
parent f0c9ece693
commit bef01c91c1
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -359,7 +359,7 @@
/**
* Not sure why use hasDefaultSelected #4273
* */
// let hasDefaultSelected = slotOptions.some(option => this.query === option.key);
let hasDefaultSelected = slotOptions.some(option => this.query === option.key);
for (let option of slotOptions) {
const cOptions = option.componentOptions;
@ -383,13 +383,10 @@
if (cOptions.children.length > 0) selectOptions.push({...option});
} else {
// ignore option if not passing filter
//if (!hasDefaultSelected) {
// const optionPassesFilter = this.filterable ? this.validateOption(cOptions) : option;
// if (!optionPassesFilter) continue;
//}
if (!hasDefaultSelected) {
const optionPassesFilter = this.filterable ? this.validateOption(cOptions) : option;
if (!optionPassesFilter) continue;
}
optionCounter = optionCounter + 1;
selectOptions.push(this.processOption(option, selectedValues, optionCounter === currentIndex));