From bef01c91c1afb23d113ebd2e1c99f9b2264ccdd8 Mon Sep 17 00:00:00 2001 From: 梁灏 Date: Tue, 25 Sep 2018 09:45:24 +0800 Subject: [PATCH] it will make a new bug, so revert --- src/components/select/select.vue | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/components/select/select.vue b/src/components/select/select.vue index 6ee4814..6461c68 100644 --- a/src/components/select/select.vue +++ b/src/components/select/select.vue @@ -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; - //} - - 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)); -- libgit2 0.21.4