github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Select: fix async bug/fix object-typed value init issue (#1540)

pull/1558/head
杨奕 2016-12-05 18:21:09 +08:00 committed by cinwell.li
parent ea56806de7
commit 6e618b4c6d
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
packages/select/src/select.vue
View File

@ -256,7 +256,7 @@
this.resetHoverIndex();
if (!this.multiple) {
this.getOverflows();
if (this.selected && this.selected.value) {
if (this.selected) {
this.selectedLabel = this.selected.currentLabel;
}
}
@ -286,6 +286,10 @@
if (this.multiple) {
this.resetInputHeight();
}
let inputs = this.$el.querySelectorAll('input');
if ([].indexOf.call(inputs, document.activeElement) === -1) {
this.selected = this.getSelected();
}
}
},
@ -325,26 +329,31 @@
}
},
getOption(value) {
const option = this.options.filter(option => option.value === value)[0];
if (option) return option;
const label = typeof value === 'string' || typeof value === 'number'
? value : '';
let newOption = {
value: value,
currentLabel: label
};
if (this.multiple) {
newOption.hitState = false;
}
return newOption;
},
getSelected() {
if (!this.multiple) {
let option = this.options.filter(option => option.value === this.value)[0] ||
{ value: this.value, currentLabel: this.value };
let option = this.getOption(this.value);
this.selectedLabel = option.currentLabel;
return option;
}
let result = [];
if (Array.isArray(this.value)) {
this.value.forEach(value => {
let option = this.options.filter(option => option.value === value)[0];
if (option) {
result.push(option);
} else {
result.push({
value: this.value,
currentLabel: value,
hitState: false
});
}
result.push(this.getOption(value));
});
}
return result;
@ -555,7 +564,7 @@
if (this.multiple && !Array.isArray(this.value)) {
this.$emit('input', []);
}
if (!this.multiple && (!this.value || Array.isArray(this.value))) {
if (!this.multiple && Array.isArray(this.value)) {
this.$emit('input', '');
}