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

DatePicker: fix select year in month type, fixed #1070
ElemeFE · Nov 16, 2016 · d4e45e8 · d4e45e8
2 parents 238f862 + 478549b
commit d4e45e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/packages/date-picker/src/panel/date.vue b/packages/date-picker/src/panel/date.vue
@@ -271,6 +271,7 @@
           this.resetDate();
         } else {
           this.date.setMonth(month);
+          this.year && this.date.setFullYear(this.year);
           this.resetDate();
           const value = new Date(this.date.getFullYear(), month, 1);
           this.$emit('pick', value);

diff --git a/packages/theme-default/src/date-picker/year-table.css b/packages/theme-default/src/date-picker/year-table.css
@@ -4,6 +4,7 @@
   @b year-table {
     font-size: 12px;
     margin: -1px;
+    border-collapse: collapse;
 
     .el-icon {
       color: var(--datepicker-icon-color);