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

Merge pull request #2466 from Leopoldthecoder/select-style 

Select: update style if initially invisible
pull/2508/head
baiyaaaaa 2017-01-18 17:01:36 +08:00 committed by GitHub
parent b137274a61 b5d5922709
commit 655572558a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,7 +363,13 @@
}, },
getOption(value) { getOption(value) {
const option = this.cachedOptions.filter(option => option.value === value)[0]; let option;
for (let i = 0, len = this.cachedOptions.length; i < len; i++) {
const cachedOption = this.cachedOptions[i];
if (cachedOption.value === value) {
option = cachedOption;
}
}
if (option) return option; if (option) return option;
const label = typeof value === 'string' || typeof value === 'number' const label = typeof value === 'string' || typeof value === 'number'
? value : ''; ? value : '';
@ -606,6 +612,11 @@
resetInputWidth() { resetInputWidth() {
this.inputWidth = this.$refs.reference.$el.getBoundingClientRect().width; this.inputWidth = this.$refs.reference.$el.getBoundingClientRect().width;
},
handleResize() {
this.resetInputWidth();
if (this.multiple) this.resetInputHeight();
} }
}, },
@ -632,7 +643,7 @@
if (this.multiple && Array.isArray(this.value) && this.value.length > 0) { if (this.multiple && Array.isArray(this.value) && this.value.length > 0) {
this.currentPlaceholder = ''; this.currentPlaceholder = '';
} }
addResizeListener(this.$el, this.resetInputWidth); addResizeListener(this.$el, this.handleResize);
if (this.remote && this.multiple) { if (this.remote && this.multiple) {
this.resetInputHeight(); this.resetInputHeight();
} }
@ -644,7 +655,7 @@
}, },
destroyed() { destroyed() {
if (this.resetInputWidth) removeResizeListener(this.$el, this.resetInputWidth); if (this.handleResize) removeResizeListener(this.$el, this.handleResize);
} }
}; };
</script> </script>