kanshan/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-02-07 11:31:17 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

fix(schedule): correct weekly frequency weekday calculation algorithm (#24641)

Browse Source
This commit is contained in:
lyzno1 2025-08-27 18:20:09 +08:00 committed by GitHub
parent 4ef6ff217e
commit 5cbe6bf8f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/app/components/workflow/nodes/trigger-schedule/utils/execution-time-calculator.ts
View File

@ -116,12 +116,22 @@ export const getNextExecutionTimes = (data: ScheduleTriggerNodeType, count: numb
let weekOffset = 0
while (executionCount < count) {
let hasValidDays = false
for (const selectedDay of selectedDays) {
if (executionCount >= count) break
const targetDay = dayMap[selectedDay as keyof typeof dayMap]
if (targetDay === undefined) continue
hasValidDays = true
const currentDayOfWeek = userToday.getDay()
const daysUntilTarget = (targetDay - currentDayOfWeek + 7) % 7
const adjustedDays = daysUntilTarget === 0 ? 7 : daysUntilTarget
const execution = new Date(userToday)
execution.setDate(userToday.getDate() + targetDay + (weekOffset * 7))
execution.setDate(userToday.getDate() + adjustedDays + (weekOffset * 7))
execution.setHours(displayHour, Number.parseInt(minute), 0, 0)
// Only add if execution time is in the future
@ -130,6 +140,8 @@ export const getNextExecutionTimes = (data: ScheduleTriggerNodeType, count: numb
executionCount++
}
}
if (!hasValidDays) break
weekOffset++
}