From 1a49c4a1e2ca70a06d13dbe98061ab7ee17da847 Mon Sep 17 00:00:00 2001 From: Jin <22962980+JYC333@users.noreply.github.com> Date: Mon, 31 Mar 2025 23:27:14 +0200 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20use=20dayjs=20part=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/app/widgets/buttons/calendar.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/public/app/widgets/buttons/calendar.ts b/src/public/app/widgets/buttons/calendar.ts index e1f9dc773..41b73415b 100644 --- a/src/public/app/widgets/buttons/calendar.ts +++ b/src/public/app/widgets/buttons/calendar.ts @@ -318,23 +318,23 @@ export default class CalendarWidget extends RightDropdownButtonWidget { } private getPrevMonthDays(firstDayOfWeek: number): { weekNumber: number, dates: Date[] } { - const prevMonthLastDay = new Date(this.date.getFullYear(), this.date.getMonth(), 0); + const prevMonthLastDay = dayjs(this.date).subtract(1, 'month').endOf('month'); const daysToAdd = (firstDayOfWeek - this.firstDayOfWeek + 7) % 7; const dates = []; - const firstDay = new Date(this.date.getFullYear(), this.date.getMonth(), 1); - const weekNumber = this.getWeekNumber(firstDay); + const firstDay = dayjs(this.date).startOf('month'); + const weekNumber = this.getWeekNumber(firstDay.toDate()); // Get dates from previous month for (let i = daysToAdd - 1; i >= 0; i--) { - dates.push(new Date(prevMonthLastDay.getFullYear(), prevMonthLastDay.getMonth(), prevMonthLastDay.getDate() - i)); + dates.push(prevMonthLastDay.subtract(i, 'day').toDate()); } return { weekNumber, dates }; } private getNextMonthDays(lastDayOfWeek: number): Date[] { - const nextMonthFirstDay = new Date(this.date.getFullYear(), this.date.getMonth() + 1, 1); + const nextMonthFirstDay = dayjs(this.date).add(1, 'month').startOf('month'); const dates = []; const lastDayOfUserWeek = (this.firstDayOfWeek + 6) % 7; @@ -342,7 +342,7 @@ export default class CalendarWidget extends RightDropdownButtonWidget { // Get dates from next month for (let i = 0; i < daysToAdd; i++) { - dates.push(new Date(nextMonthFirstDay.getFullYear(), nextMonthFirstDay.getMonth(), i + 1)); + dates.push(nextMonthFirstDay.add(i, 'day').toDate()); } return dates;