This commit is contained in:
梁灏 2018-09-18 16:22:46 +08:00
parent c1a2d95fd4
commit e27b704af9

View file

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