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

Merge pull request #4403 from oyv1cent/fix-select

Browse source 
Fix select
This commit is contained in:
Aresn 2018-09-18 14:26:48 +08:00 • committed by GitHub
commit bb6d1eeb94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/components/select/functional-options.vue
View file

@ -18,11 +18,17 @@
}, },
}, },
functional: true, functional: true,
render(h, {props, parent}){ render(h, {props, parent}) {
// to detect changes in the $slot children/options we do this hack // In order to response data changes,i do this hack. #4372
// so we can trigger the parents computed properties and have everything reactive if(props.slotOptions.length > 0) {
// although $slot.default is not for(let i in props.slotOptions) {
if (props.slotOptions !== parent.$slots.default) props.slotUpdateHook(); if(props.slotOptions[i].key !== parent.$slots.default[i].key) {
props.slotUpdateHook();
break;
}
}
}
if(props.slotOptions && parent.$slots.default && props.slotOptions.length !== parent.$slots.default.length) props.slotUpdateHook();
return props.options; return props.options;
} }
}; };

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

@ -356,14 +356,12 @@
}); });
}); });
} }
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;
if (!cOptions) continue; if (!cOptions) continue;
if (cOptions.tag.match(optionGroupRegexp)){ if (cOptions.tag.match(optionGroupRegexp)){
let children = cOptions.children; let children = cOptions.children;
// remove filtered children // remove filtered children
if (this.filterable){ if (this.filterable){
children = children.filter( children = children.filter(
@ -380,11 +378,8 @@
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) { 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));
} }
@ -641,6 +636,9 @@
}, },
updateSlotOptions(){ updateSlotOptions(){
this.slotOptions = this.$slots.default; this.slotOptions = this.$slots.default;
// #4372 issue, i find that this.query's value affects the judgment of the validateOption method.
this.query = '';
this.focusIndex = -1;
}, },
checkUpdateStatus() { checkUpdateStatus() {
if (this.getInitialValue().length > 0 && this.selectOptions.length === 0) { if (this.getInitialValue().length > 0 && this.selectOptions.length === 0) {