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

Merge pull request #1093 from QingWei-Li/fix/datepicker-month 

DatePicker: fix select year in month type, fixed #1070
pull/1099/head
SkyAo 2016-11-16 11:28:27 +08:00 committed by GitHub
parent 238f8625b1 478549bd30
commit d4e45e8d9b
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/date-picker/src/panel/date.vue
View File

@ -271,6 +271,7 @@
this.resetDate(); this.resetDate();
} else { } else {
this.date.setMonth(month); this.date.setMonth(month);
this.year && this.date.setFullYear(this.year);
this.resetDate(); this.resetDate();
const value = new Date(this.date.getFullYear(), month, 1); const value = new Date(this.date.getFullYear(), month, 1);
this.$emit('pick', value); this.$emit('pick', value);

1
packages/theme-default/src/date-picker/year-table.css
View File

@ -4,6 +4,7 @@
@b year-table { @b year-table {
font-size: 12px; font-size: 12px;
margin: -1px; margin: -1px;
border-collapse: collapse;
.el-icon { .el-icon {
color: var(--datepicker-icon-color); color: var(--datepicker-icon-color);