From a59d3f88da12fc30982f01a3414154c10a5825c5 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Tue, 4 Aug 2020 13:40:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=9A=84=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/resource/background.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/less/resource/background.less b/src/less/resource/background.less
index f839d3c4f..9bd3351f9 100644
--- a/src/less/resource/background.less
+++ b/src/less/resource/background.less
@@ -50,7 +50,7 @@
     content: '';
     border-left: 1px dashed #D0D4DA;
     height: calc(~"100% - 3px");
-    left: 12px;
+    left: 11px;
     margin-top: 1px;
   }
 }

From 62359baa5e52a71b11a24eda4de7ba0b7414e5cb Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Tue, 4 Aug 2020 13:40:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?REPORT-36727=20fix:=20=E9=80=82=E9=85=8DFR?=
 =?UTF-8?q?=E7=9A=84=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/date/calendar/picker.date.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/widget/date/calendar/picker.date.js b/src/widget/date/calendar/picker.date.js
index 9189e52bc..b1d015bb9 100644
--- a/src/widget/date/calendar/picker.date.js
+++ b/src/widget/date/calendar/picker.date.js
@@ -29,12 +29,12 @@ BI.DatePicker = BI.inherit(BI.Widget, {
         this.left.on(BI.IconButton.EVENT_CHANGE, function () {
             if (self._month === 1) {
                 self.setValue({
-                    year: self.year.getValue() - 1,
+                    year: (self.year.getValue() - 1) || (BI.getDate().getFullYear() - 1),
                     month: 12,
                 });
             } else {
                 self.setValue({
-                    year: self.year.getValue(),
+                    year: self.year.getValue() || BI.getDate().getFullYear(),
                     month: (self.month.getValue() - 1) || BI.getDate().getMonth(),
                 });
             }
@@ -53,12 +53,12 @@ BI.DatePicker = BI.inherit(BI.Widget, {
         this.right.on(BI.IconButton.EVENT_CHANGE, function () {
             if (self._month === 12) {
                 self.setValue({
-                    year: self.year.getValue() + 1,
+                    year: (self.year.getValue() + 1) || (BI.getDate().getFullYear() + 1),
                     month: 1,
                 });
             } else {
                 self.setValue({
-                    year: self.year.getValue(),
+                    year: self.year.getValue() || BI.getDate().getFullYear(),
                     month: (self.month.getValue() + 1) || (BI.getDate().getMonth() + 2),
                 });
             }
@@ -129,12 +129,12 @@ BI.DatePicker = BI.inherit(BI.Widget, {
         });
     },
 
-    _refreshMonth: function () {
+    _refreshMonth: function (defaultMonth) {
         var month = this.month.getValue();
         this.month.populate(this._getAllowMonths());
         var allowMonth = this._getAllowMonths();
         if (!BI.contains(allowMonth, month)) {
-            month = allowMonth[0];
+            month = defaultMonth || allowMonth[0];
         }
         this.month.setValue(month);
         return month;
@@ -187,7 +187,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
     setMinDate: function (minDate) {
         this.options.min = minDate;
         this.year.setMinDate(minDate);
-        this._refreshMonth();
+        this._refreshMonth(this._month);
         this._checkLeftValid();
         this._checkRightValid();
     },
@@ -195,7 +195,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
     setMaxDate: function (maxDate) {
         this.options.max = maxDate;
         this.year.setMaxDate(maxDate);
-        this._refreshMonth();
+        this._refreshMonth(this._month);
         this._checkLeftValid();
         this._checkRightValid();
     },
@@ -204,7 +204,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
         this._year = BI.parseInt(ob.year);
         this._month = BI.parseInt(ob.month);
         this.year.setValue(ob.year);
-        this._refreshMonth();
+        this._refreshMonth(this._month);
         this.month.setValue(ob.month);
         this._checkLeftValid();
         this._checkRightValid();