From 93d749f57303c5606bdc52751a1a7a95e6c48bb6 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 14 Jan 2022 17:34:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8A=A8=E6=80=81=E5=B9=B4=E6=9C=88?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/serviceImpl/TimeMonthServiceImpl.js | 9 ++++----- .../widget/serviceImpl/TimeYearServiceImpl.js | 17 +++++------------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js index 28cc6c44e3..ba5d06fe6a 100644 --- a/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js @@ -92,15 +92,14 @@ class TimeMonthServiceImpl extends WidgetService { const now = new Date() const nowMonth = now.getMonth() const nowYear = now.getFullYear() - const nowDate = now.getDate() if (element.options.attrs.default === null || typeof element.options.attrs.default === 'undefined' || !element.options.attrs.default.isDynamic) return null if (element.options.attrs.default.dkey === 0) { - return Date.now() + return new Date(nowYear, nowMonth, 1).getTime() } if (element.options.attrs.default.dkey === 1) { - return new Date(nowYear, nowMonth - 1, nowDate).getTime() + return new Date(nowYear, nowMonth - 1, 1).getTime() } if (element.options.attrs.default.dkey === 2) { @@ -112,9 +111,9 @@ class TimeMonthServiceImpl extends WidgetService { const dynamicSuffix = element.options.attrs.default.dynamicSuffix if (dynamicSuffix === 'before') { - return new Date(nowYear, nowMonth - dynamicPrefix, nowDate).getTime() + return new Date(nowYear, nowMonth - dynamicPrefix, 1).getTime() } else { - return new Date(nowYear, nowMonth + dynamicPrefix, nowDate).getTime() + return new Date(nowYear, nowMonth + dynamicPrefix, 1).getTime() } } } diff --git a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js index 0e7bf63bca..f0da98280c 100644 --- a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js @@ -91,28 +91,21 @@ class TimeYearServiceImpl extends WidgetService { dynamicDateFormNow(element) { if (element.options.attrs.default === null || typeof element.options.attrs.default === 'undefined' || !element.options.attrs.default.isDynamic) return null + const now = new Date() + const nowYear = now.getFullYear() if (element.options.attrs.default.dkey === 0) { - return Date.now() + return new Date(nowYear, 0, 1).getTime() } if (element.options.attrs.default.dkey === 1) { - const now = new Date() - const nowYear = now.getFullYear() - const nowMonth = now.getMonth() - const nowDate = now.getDate() - return new Date(nowYear - 1, nowMonth, nowDate).getTime() + return new Date(nowYear - 1, 0, 1).getTime() } if (element.options.attrs.default.dkey === 2) { const dynamicPrefix = parseInt(element.options.attrs.default.dynamicPrefix) const dynamicSuffix = element.options.attrs.default.dynamicSuffix - const now = new Date() - const nowMonth = now.getMonth() - const nowYear = now.getFullYear() - const nowDate = now.getDate() - - return new Date(dynamicSuffix === 'before' ? (nowYear - dynamicPrefix) : (nowYear + dynamicPrefix), nowMonth, nowDate).getTime() + return new Date(dynamicSuffix === 'before' ? (nowYear - dynamicPrefix) : (nowYear + dynamicPrefix), 0, 1).getTime() } } }