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

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

@ -183,6 +183,7 @@
this.valueChangeBySelected = false; this.valueChangeBySelected = false;
return; return;
} }
this.$nextTick(() => {
if (this.multiple && Array.isArray(val)) { if (this.multiple && Array.isArray(val)) {
this.$nextTick(() => { this.$nextTick(() => {
this.resetInputHeight(); this.resetInputHeight();
@ -206,6 +207,7 @@
} }
} }
this.resetHoverIndex(); this.resetHoverIndex();
});
}, },
selected(val) { selected(val) {