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

Select: remove redundant empty option item when set default value undefined single select mode (#15007) (#15111)

pull/15541/head^2
susiwen8 2019-05-27 16:20:57 +08:00 committed by luckyCao
parent cefd235615
commit c42716000c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -510,6 +510,7 @@
let option; let option;
const isObject = Object.prototype.toString.call(value).toLowerCase() === '[object object]'; const isObject = Object.prototype.toString.call(value).toLowerCase() === '[object object]';
const isNull = Object.prototype.toString.call(value).toLowerCase() === '[object null]'; const isNull = Object.prototype.toString.call(value).toLowerCase() === '[object null]';
const isUndefined = Object.prototype.toString.call(value).toLowerCase() === '[object undefined]';
for (let i = this.cachedOptions.length - 1; i >= 0; i--) { for (let i = this.cachedOptions.length - 1; i >= 0; i--) {
const cachedOption = this.cachedOptions[i]; const cachedOption = this.cachedOptions[i];
@ -522,7 +523,7 @@
} }
} }
if (option) return option; if (option) return option;
const label = (!isObject && !isNull) const label = (!isObject && !isNull && !isUndefined)
? value : ''; ? value : '';
let newOption = { let newOption = {
value: value, value: value,