Merge pull request #39 from ipuppet/dev

修复锁屏小组件计算错误
ipuppet · Oct 1, 2022 · 9a3daab · 9a3daab
2 parents 2c33062 + 3165dbc
commit 9a3daab
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/scripts/widget/Calendar/calendar.js b/scripts/widget/Calendar/calendar.js
@@ -669,12 +669,12 @@ class Calendar {
         const week = Math.ceil(saturday / 7) // start from 1
         const length = this.calendar.calendar.length
         const weekStart = week + 2 > length ? length - 2 : week
-        const weekLength = Math.min(weekStart + 2, length) // 最多显示 3 周
-        this.calendar.calendar = this.calendar.calendar.slice(weekStart - 1, weekLength)
+        const weekEnd = Math.min(weekStart + 2, length) // 最多显示 3 周
+        this.calendar.calendar = this.calendar.calendar.slice(weekStart - 1, weekEnd)
 
         // 生成视图
         const days = this.weekIndexTemplate().views
-        for (let i = weekStart - 1; i < weekLength; i++) {
+        for (let i = 0; i < this.calendar.calendar.length; i++) {
             // 设置不同日期显示不同样式
             for (let dayInfo of this.calendar.calendar[i]) {
                 const props = this.singleContentDayStyleModifier(dayInfo)