Merge pull request #157 from treadpit/develop

fix: #156 & can't cover config of circle mode
treadpit · Aug 8, 2019 · 4f1a889 · 4f1a889
2 parents 80c2396 + cde88f3
commit 4f1a889
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/component/calendar/main.js b/src/component/calendar/main.js
@@ -559,10 +559,10 @@ const conf = {
       options || this.todoConfig;
     const { todoLabels = [], todoLabelPos, todoLabelColor } = calendar;
     const shouldMarkerTodoDay = todoDays.filter(
-      item => +item.year === curYear && +item.month === curMonth
+      item => +item.year === +curYear && +item.month === +curMonth
     );
     let currentMonthTodoLabels = todoLabels.filter(
-      item => +item.year === curYear && +item.month === curMonth
+      item => +item.year === +curYear && +item.month === +curMonth
     );
     shouldMarkerTodoDay.concat(currentMonthTodoLabels).forEach(item => {
       let target = {};
@@ -587,8 +587,9 @@ const conf = {
       if (dotColor && dotColor !== todoLabelColor) {
         o['calendar.todoLabelColor'] = dotColor;
       }
+      o['calendar.todoLabelCircle'] = false;
     } else {
-      o['calendar.todoLabelCircle'] = circle;
+      o['calendar.todoLabelCircle'] = true;
     }
     setData(o);
   },