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

Clean up empty/null entries

Browse source
This commit is contained in:
Sergio Crisostomo 2018-05-08 11:15:49 +02:00
parent 7d14e70c6e
commit 220161f5ed
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,12 +56,12 @@
> >
<ul v-show="showNotFoundLabel" :class="[prefixCls + '-not-found']"><li>{{ localeNotFoundText }}</li></ul> <ul v-show="showNotFoundLabel" :class="[prefixCls + '-not-found']"><li>{{ localeNotFoundText }}</li></ul>
<ul :class="prefixCls + '-dropdown-list'"> <ul :class="prefixCls + '-dropdown-list'">
<functional-options <functional-options
v-if="(!remote) || (remote && !loading)" v-if="(!remote) || (remote && !loading)"
:options="selectOptions" :options="selectOptions"
:slot-update-hook="updateSlotOptions" :slot-update-hook="updateSlotOptions"
:slot-options="slotOptions" :slot-options="slotOptions"
></functional-options> ></functional-options>
</ul> </ul>
<ul v-show="loading" :class="[prefixCls + '-loading']">{{ localeLoadingText }}</ul> <ul v-show="loading" :class="[prefixCls + '-loading']">{{ localeLoadingText }}</ul>
</Drop> </Drop>
@ -207,7 +207,7 @@
// set the initial values if there are any // set the initial values if there are any
if (this.values.length > 0 && !this.remote && this.selectOptions.length > 0){ 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).filter(Boolean);
} }
if (this.values.length > 0 && this.selectOptions.length === 0){ if (this.values.length > 0 && this.selectOptions.length === 0){
@ -307,7 +307,7 @@
const slotOptions = (this.slotOptions || []); const slotOptions = (this.slotOptions || []);
let optionCounter = -1; let optionCounter = -1;
const currentIndex = this.focusIndex; const currentIndex = this.focusIndex;
const selectedValues = this.values.map(({value}) => value); const selectedValues = this.values.filter(Boolean).map(({value}) => value);
if (this.autoComplete) { if (this.autoComplete) {
const copyChildren = (node, fn) => { const copyChildren = (node, fn) => {
return { return {
@ -398,7 +398,7 @@
const {multiple, value} = this; const {multiple, value} = this;
let initialValue = Array.isArray(value) ? value : [value]; let initialValue = Array.isArray(value) ? value : [value];
if (!multiple && (typeof initialValue[0] === 'undefined' || String(initialValue[0]).trim() === '')) initialValue = []; if (!multiple && (typeof initialValue[0] === 'undefined' || String(initialValue[0]).trim() === '')) initialValue = [];
return initialValue; return initialValue.filter(Boolean);
}, },
processOption(option, values, isFocused){ processOption(option, values, isFocused){
if (!option.componentOptions) return option; if (!option.componentOptions) return option;
@ -580,7 +580,7 @@
if (value === '') this.values = []; if (value === '') this.values = [];
else if (JSON.stringify(value) !== JSON.stringify(publicValue)) { else if (JSON.stringify(value) !== JSON.stringify(publicValue)) {
this.$nextTick(() => this.values = getInitialValue().map(getOptionData)); this.$nextTick(() => this.values = getInitialValue().map(getOptionData).filter(Boolean));
} }
}, },
values(now, before){ values(now, before){
@ -592,8 +592,8 @@
// v-model is always just the value, event with labelInValue === true // v-model is always just the value, event with labelInValue === true
const vModelValue = this.labelInValue ? const vModelValue = this.labelInValue ?
(this.multiple ? this.publicValue.map(({value}) => value) (this.multiple ? this.publicValue.map(({value}) => value)
: :
this.publicValue.value) : this.publicValue; this.publicValue.value) : this.publicValue;
this.$emit('input', vModelValue); // to update v-model this.$emit('input', vModelValue); // to update v-model
this.$emit('on-change', this.publicValue); this.$emit('on-change', this.publicValue);
this.dispatch('FormItem', 'on-form-change', this.publicValue); this.dispatch('FormItem', 'on-form-change', this.publicValue);
@ -659,7 +659,7 @@
}, },
selectOptions(){ selectOptions(){
if (this.hasExpectedValue){ if (this.hasExpectedValue){
this.values = this.values.map(this.getOptionData); this.values = this.values.map(this.getOptionData).filter(Boolean);
this.hasExpectedValue = false; this.hasExpectedValue = false;
} }