open-source/eladmin-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into deploy

Browse Source
This commit is contained in:
Zheng Jie
2021-02-27 21:31:24 +08:00
parent 3655497ace 550898168c
commit 035167e508
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/shortcuts.js
View File

@@ -75,7 +75,7 @@ export const calendarMoveShortcuts = [{
let endTime = new Date(new Date().setHours(23, 59, 59)) let endTime = new Date(new Date().setHours(23, 59, 59))
if (!picker.value) { if (!picker.value) {
picker.value = [startTime.daysAgo(new Date().getDay()), picker.value = [startTime.daysAgo(new Date().getDay()),
startTime.daysAgo(new Date().getDay() + 1)] endTime.daysAgo(new Date().getDay() + 1)]
} else { } else {
picker.value = [picker.value[0].daysAgo(picker.value[0].getDay()), picker.value = [picker.value[0].daysAgo(picker.value[0].getDay()),
picker.value[1].daysAgo(picker.value[1].getDay() + 1)] picker.value[1].daysAgo(picker.value[1].getDay() + 1)]
@@ -91,7 +91,7 @@ export const calendarMoveShortcuts = [{
let endTime = new Date(new Date().setHours(23, 59, 59)) let endTime = new Date(new Date().setHours(23, 59, 59))
if (!picker.value) { if (!picker.value) {
picker.value = [startTime.daysAgo(new Date().getDay() - 7), picker.value = [startTime.daysAgo(new Date().getDay() - 7),
startTime.daysAgo(new Date().getDay() - 6)] endTime.daysAgo(new Date().getDay() - 6)]
} else { } else {
picker.value = [picker.value[0].daysAgo(picker.value[0].getDay() - 7), picker.value = [picker.value[0].daysAgo(picker.value[0].getDay() - 7),
picker.value[1].daysAgo(picker.value[1].getDay() - 6)] picker.value[1].daysAgo(picker.value[1].getDay() - 6)]