From 0def707ae368f8211c4960d4630b135f02373a2c Mon Sep 17 00:00:00 2001 From: zhengjie <201507802@qq.com> Date: Thu, 24 Dec 2020 16:07:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6?= =?UTF-8?q?)=EF=BC=9Aupdate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Permission/permission.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Permission/permission.js b/src/components/Permission/permission.js index 9aa9f67..9a6ba28 100644 --- a/src/components/Permission/permission.js +++ b/src/components/Permission/permission.js @@ -2,7 +2,6 @@ import store from '@/store' export default { inserted(el, binding) { - console.log(el, binding) const { value } = binding const roles = store.getters && store.getters.roles if (value && value instanceof Array) { From f32031a37b623c61848fb66b8c09dd6b49dce924 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 24 Dec 2020 19:35:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BE=A7=E8=BE=B9?= =?UTF-8?q?=E6=A0=8F=E9=9D=99=E6=80=81=E8=B7=AF=E7=94=B1=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/permission.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 1110f74..49e4778 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -14,7 +14,7 @@ const permission = { state.routers = constantRouterMap.concat(routers) }, SET_SIDEBAR_ROUTERS: (state, routers) => { - state.sidebarRouters = routers + state.sidebarRouters = constantRouterMap.concat(routers) } }, actions: { From 5f64d7eae956a3676c1f8a0e7ee896f7eaec7b26 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Sat, 27 Feb 2021 21:19:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6?= =?UTF-8?q?)=EF=BC=9A=E8=A7=A3=E5=86=B3=E6=97=A5=E6=9C=9F=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E6=97=A5=E6=9C=9F=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84Bug=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=82=B9=E5=87=BB=E6=97=A0=E6=95=88Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit close https://github.com/elunez/eladmin/issues/560 --- src/utils/shortcuts.js | 96 ++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 42 deletions(-) diff --git a/src/utils/shortcuts.js b/src/utils/shortcuts.js index a191590..7a8b1d7 100644 --- a/src/utils/shortcuts.js +++ b/src/utils/shortcuts.js @@ -3,90 +3,102 @@ import Date from './datetime.js' export const calendarBaseShortcuts = [{ text: '今天', onClick(picker) { - const start = new Date() - picker.$emit('pick', [start, start]) + const startTime = new Date(new Date().setHours(0, 0, 0)) + const endTime = new Date(new Date().setHours(23, 59, 59)) + picker.$emit('pick', [startTime, endTime]) } }, { text: '昨天', onClick(picker) { - const start = new Date().daysAgo(1) - picker.$emit('pick', [start, start]) + const startTime = new Date(new Date().daysAgo(1).setHours(0, 0, 0)) + const endTime = new Date(new Date().daysAgo(1).setHours(23, 59, 59)) + picker.$emit('pick', [startTime, endTime]) } }, { text: '最近一周', onClick(picker) { - const start = new Date().daysAgo(7) - picker.$emit('pick', [start, new Date()]) + const startTime = new Date(new Date().daysAgo(7).setHours(0, 0, 0)) + const endTime = new Date(new Date().setHours(23, 59, 59)) + picker.$emit('pick', [startTime, endTime]) } }, { text: '最近30天', onClick(picker) { - const start = new Date().daysAgo(30) - picker.$emit('pick', [start, new Date()]) + const startTime = new Date(new Date().daysAgo(30).setHours(0, 0, 0)) + const endTime = new Date(new Date().setHours(23, 59, 59)) + picker.$emit('pick', [startTime, endTime]) } }, { text: '这个月', onClick(picker) { - const start = new Date().monthBegin() - picker.$emit('pick', [start, new Date()]) + const startTime = new Date(new Date().monthBegin().setHours(0, 0, 0)) + const endTime = new Date(new Date().setHours(23, 59, 59)) + picker.$emit('pick', [startTime, endTime]) } }, { text: '本季度', onClick(picker) { - const start = new Date().quarterBegin() - picker.$emit('pick', [start, new Date()]) + const startTime = new Date(new Date().quarterBegin().setHours(0, 0, 0)) + const endTime = new Date(new Date().setHours(23, 59, 59)) + picker.$emit('pick', [startTime, endTime]) } }] export const calendarMoveShortcuts = [{ text: '‹ 往前一天 ', onClick(picker) { - if (picker.value.length === 0) { - picker.value = [new Date(), new Date()] + let startTime = new Date(new Date().daysAgo(1).setHours(0, 0, 0)) + let endTime = new Date(new Date().daysAgo(1).setHours(23, 59, 59)) + if (!picker.value) { + picker.value = [startTime, endTime] } - const start = picker.value[0].daysAgo(1) - const end = picker.value[1].daysAgo(1) - picker.$emit('pick', [start, end]) + startTime = picker.value[0].daysAgo(1) + endTime = picker.value[1].daysAgo(1) + picker.$emit('pick', [startTime, picker]) } }, { text: ' 往后一天 ›', onClick(picker) { - let start = new Date() - let end = new Date() - if (picker.value.length > 0) { - if (end - picker.value[1] > 8.64E7) { - start = picker.value[0].daysAgo(-1) - end = picker.value[1].daysAgo(-1) - } else { - start = picker.value[0] - } + let startTime = new Date(new Date().setHours(0, 0, 0)) + let endTime = new Date(new Date().setHours(23, 59, 59)) + if (!picker.value) { + picker.value = [startTime, endTime] } - picker.$emit('pick', [start, end]) + startTime = picker.value[0].daysAgo(-1) + endTime = picker.value[1].daysAgo(-1) + picker.$emit('pick', [startTime, endTime]) } }, { text: '« 往前一周 ', onClick(picker) { - if (picker.value.length === 0) { - picker.value = [new Date().daysAgo(7), new Date()] + let startTime = new Date(new Date().setHours(0, 0, 0)) + let endTime = new Date(new Date().setHours(23, 59, 59)) + if (!picker.value) { + picker.value = [startTime.daysAgo(new Date().getDay()), + startTime.daysAgo(new Date().getDay() + 1)] + } else { + picker.value = [picker.value[0].daysAgo(picker.value[0].getDay()), + picker.value[1].daysAgo(picker.value[1].getDay() + 1)] } - const start = picker.value[0].daysAgo(7) - const end = picker.value[1].daysAgo(7) - picker.$emit('pick', [start, end]) + startTime = picker.value[0].daysAgo(7) + endTime = picker.value[1] + picker.$emit('pick', [startTime, endTime]) } }, { text: ' 往后一周 »', onClick(picker) { - let start = new Date().daysAgo(7) - let end = new Date() - if (picker.value.length > 0) { - if (end - picker.value[1] > 8.64E7) { - start = picker.value[0].daysAgo(-7) - end = picker.value[1].daysAgo(-7) - } else { - start = picker.value[0] - } + let startTime = new Date(new Date().setHours(0, 0, 0)) + let endTime = new Date(new Date().setHours(23, 59, 59)) + if (!picker.value) { + picker.value = [startTime.daysAgo(new Date().getDay() - 7), + startTime.daysAgo(new Date().getDay() - 6)] + } else { + picker.value = [picker.value[0].daysAgo(picker.value[0].getDay() - 7), + picker.value[1].daysAgo(picker.value[1].getDay() - 6)] } - picker.$emit('pick', [start, end]) + startTime = picker.value[0] + endTime = picker.value[1].daysAgo(-7) + picker.$emit('pick', [startTime, endTime]) } }]