fix(utils): wrong last weekday for relative date (#9397)

This commit is contained in:
Ethan Shen
2022-03-27 23:39:44 +08:00
committed by GitHub
parent e5b2676534
commit a3396029ec

View File

@@ -16,31 +16,31 @@ const words = [
regExp: /^(?:前天|(?:the)?d(?:ay)?b(?:eforeyesterda)?y)(.*)/, regExp: /^(?:前天|(?:the)?d(?:ay)?b(?:eforeyesterda)?y)(.*)/,
}, },
{ {
startAt: dayjs().weekday(1), startAt: dayjs().isBefore(dayjs().weekday(1)) ? dayjs().weekday(1).subtract(1, 'week') : dayjs().weekday(1),
regExp: /^(?:周|星期)一(.*)/, regExp: /^(?:周|星期)一(.*)/,
}, },
{ {
startAt: dayjs().weekday(2), startAt: dayjs().isBefore(dayjs().weekday(2)) ? dayjs().weekday(2).subtract(1, 'week') : dayjs().weekday(2),
regExp: /^(?:周|星期)二(.*)/, regExp: /^(?:周|星期)二(.*)/,
}, },
{ {
startAt: dayjs().weekday(3), startAt: dayjs().isBefore(dayjs().weekday(3)) ? dayjs().weekday(3).subtract(1, 'week') : dayjs().weekday(3),
regExp: /^(?:周|星期)三(.*)/, regExp: /^(?:周|星期)三(.*)/,
}, },
{ {
startAt: dayjs().weekday(4), startAt: dayjs().isBefore(dayjs().weekday(4)) ? dayjs().weekday(4).subtract(1, 'week') : dayjs().weekday(4),
regExp: /^(?:周|星期)四(.*)/, regExp: /^(?:周|星期)四(.*)/,
}, },
{ {
startAt: dayjs().weekday(5), startAt: dayjs().isBefore(dayjs().weekday(5)) ? dayjs().weekday(5).subtract(1, 'week') : dayjs().weekday(5),
regExp: /^(?:周|星期)五(.*)/, regExp: /^(?:周|星期)五(.*)/,
}, },
{ {
startAt: dayjs().weekday(6), startAt: dayjs().isBefore(dayjs().weekday(6)) ? dayjs().weekday(6).subtract(1, 'week') : dayjs().weekday(6),
regExp: /^(?:周|星期)六(.*)/, regExp: /^(?:周|星期)六(.*)/,
}, },
{ {
startAt: dayjs().weekday(7), startAt: dayjs().isBefore(dayjs().weekday(7)) ? dayjs().weekday(7).subtract(1, 'week') : dayjs().weekday(7),
regExp: /^(?:周|星期)(?:日|天)(.*)/, regExp: /^(?:周|星期)(?:日|天)(.*)/,
}, },
{ {