Merge pull request #351 from treadpit/develop

fix: #336
treadpit · Jul 19, 2020 · b57ed40 · b57ed40
2 parents bd76e7d + d357ffa
commit b57ed40
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/calendar/index.js b/calendar/index.js
diff --git a/src/component/calendar/func/week.js b/src/component/calendar/func/week.js
@@ -266,6 +266,17 @@ class WeekMode extends WxData {
       }
     });
   }
+  updateYMWhenSwipeCalendarHasSelected(dates) {
+    const hasSelectedDate = dates.filter(date => date.choosed);
+    if (hasSelectedDate && hasSelectedDate.length) {
+      const { year, month } = hasSelectedDate[0];
+      return {
+        year,
+        month
+      };
+    }
+    return {};
+  }
   /**
    * 计算下一周的日期
    */
@@ -307,6 +318,14 @@ class WeekMode extends WxData {
       }
     }
     days = this.initSelectedDay(days);
+    const {
+      year: updateYear,
+      month: updateMonth
+    } = this.updateYMWhenSwipeCalendarHasSelected(days);
+    if (updateYear && updateMonth) {
+      curYear = updateYear;
+      curMonth = updateMonth;
+    }
     this.setEnableAreaOnWeekMode(days);
     this.setData(
       {
@@ -368,6 +387,14 @@ class WeekMode extends WxData {
       days = days.concat(temp);
     }
     days = this.initSelectedDay(days);
+    const {
+      year: updateYear,
+      month: updateMonth
+    } = this.updateYMWhenSwipeCalendarHasSelected(days);
+    if (updateYear && updateMonth) {
+      curYear = updateYear;
+      curMonth = updateMonth;
+    }
     this.setEnableAreaOnWeekMode(days);
     this.setData(
       {

diff --git a/src/component/calendar/main.js b/src/component/calendar/main.js
@@ -200,6 +200,10 @@ const conf = {
       }
       tmp['calendar.selectedDay'] = [];
     }
+    if (config.weekMode) {
+      tmp['calendar.curYear'] = currentDay.year;
+      tmp['calendar.curMonth'] = currentDay.month;
+    }
     setData(tmp);
   },
   gotoSetContinuousDates(start, end) {