Explorar o código

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

DatePicker: fix select year in month type, fixed #1070
SkyAo %!s(int64=8) %!d(string=hai) anos
pai
achega
d4e45e8d9b

+ 1 - 0
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);

+ 1 - 0
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);