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

Make possible for v-model to wait for async options

Browse source
This commit is contained in:
Sergio Crisostomo 2018-04-12 16:32:35 +02:00
parent cf753854d1
commit 7f63e58ced
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -179,9 +179,13 @@
this.$on('on-select-selected', this.onOptionClick); this.$on('on-select-selected', this.onOptionClick);
// set the initial values if there are any // set the initial values if there are any
if (this.values.length > 0 && !this.remote){ if (this.values.length > 0 && !this.remote && this.selectOptions.length > 0){
this.values = this.values.map(this.getOptionData); this.values = this.values.map(this.getOptionData);
} }
if (this.values.length > 0 && this.selectOptions.length === 0){
this.hasExpectedValue = this.values;
}
}, },
data () { data () {
@ -198,6 +202,7 @@
slotOptions: this.$slots.default, slotOptions: this.$slots.default,
caretPosition: -1, caretPosition: -1,
lastRemoteQuery: '', lastRemoteQuery: '',
hasExpectedValue: false,
}; };
}, },
computed: { computed: {
@ -337,7 +342,7 @@
}, },
getOptionData(value){ getOptionData(value){
const option = this.flatOptions.find(({componentOptions}) => componentOptions.propsData.value === value); const option = this.flatOptions.find(({componentOptions}) => componentOptions.propsData.value === value);
if (!option) return {}; if (!option) return null;
const textContent = option.componentOptions.children.reduce((str, child) => str + (child.text || ''), ''); const textContent = option.componentOptions.children.reduce((str, child) => str + (child.text || ''), '');
const label = option.componentOptions.propsData.label || textContent || ''; const label = option.componentOptions.propsData.label || textContent || '';
return { return {
@ -603,6 +608,12 @@
}, },
dropVisible(open){ dropVisible(open){
this.broadcast('Drop', open ? 'on-update-popper' : 'on-destroy-popper'); this.broadcast('Drop', open ? 'on-update-popper' : 'on-destroy-popper');
},
selectOptions(){
if (this.hasExpectedValue){
this.values = this.values.map(this.getOptionData);
this.hasExpectedValue = false;
}
} }
} }
}; };