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

update footer-nav

pull/28/head
Leopoldthecoder 2016-09-07 18:38:51 +08:00
parent 74abc40bf3
commit c5c050a52a
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/components/footer-nav.vue
View File

@ -30,6 +30,7 @@
}
& i {
transition: .3s;
color: #d9def1;
vertical-align: baseline;
}
@ -37,6 +38,7 @@
.footer-nav-link {
cursor: pointer;
transition: .3s;
&:hover {
color: #5e6d82;
@ -101,5 +103,5 @@
this.nav = this.nav.concat(navConfig[1].children);
this.updateNav();
}
}
};
</script>

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

@ -183,29 +183,31 @@
this.valueChangeBySelected = false;
return;
}
if (this.multiple && Array.isArray(val)) {
this.$nextTick(() => {
this.resetInputHeight();
});
this.selectedInit = true;
this.selected = [];
val.forEach(item => {
let option = this.options.filter(option => option.value === item)[0];
this.$nextTick(() => {
if (this.multiple && Array.isArray(val)) {
this.$nextTick(() => {
this.resetInputHeight();
});
this.selectedInit = true;
this.selected = [];
val.forEach(item => {
let option = this.options.filter(option => option.value === item)[0];
if (option) {
this.$emit('addOptionToValue', option);
}
});
}
if (!this.multiple) {
let option = this.options.filter(option => option.value === val)[0];
if (option) {
this.$emit('addOptionToValue', option);
} else {
this.selected = {};
this.selectedLabel = '';
}
});
}
if (!this.multiple) {
let option = this.options.filter(option => option.value === val)[0];
if (option) {
this.$emit('addOptionToValue', option);
} else {
this.selected = {};
this.selectedLabel = '';
}
}
this.resetHoverIndex();
this.resetHoverIndex();
});
},
selected(val) {