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

fixed #3817 #3836

Browse source
This commit is contained in:
郑敏 2018-06-07 09:58:13 +08:00
parent 73b01ee06b
commit 21f6940672
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/select/select-head.vue
View file

@ -58,7 +58,7 @@
default: false default: false
}, },
initialLabel: { initialLabel: {
type: String, type: [String, Number, Array],
}, },
values: { values: {
type: Array, type: Array,

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

@ -351,7 +351,7 @@
}); });
}); });
} }
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;
@ -375,11 +375,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
const optionPassesFilter = this.filterable ? this.validateOption(cOptions) : option; if (!hasDefaultSelected) {
if (!optionPassesFilter) continue; const optionPassesFilter = this.filterable ? this.validateOption(cOptions) : option;
if (!optionPassesFilter) continue;
}
optionCounter = optionCounter + 1; optionCounter = optionCounter + 1;
selectOptions.push(this.processOption(option, selectedValues, optionCounter === currentIndex)); selectOptions.push(this.processOption(option, selectedValues, false));
} }
} }