From d5071d99bd58cb90ff2146d6653655fe12cd1a78 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 24 Dec 2021 17:10:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8A=A8=E6=80=81=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/widget/serviceImpl/TimeDateServiceImpl.js | 5 +++-- .../src/views/panel/filter/defaultValue/DeDateDefault.vue | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js index 3b2c7913be..98bfcc7af6 100644 --- a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js +++ b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js @@ -91,7 +91,7 @@ class TimeDateServiceImpl extends WidgetService { } if (element.options.attrs.default.dkey === 3) { - const dynamicPrefix = element.options.attrs.default.dynamicPrefix + const dynamicPrefix = parseInt(element.options.attrs.default.dynamicPrefix) const dynamicInfill = element.options.attrs.default.dynamicInfill const dynamicSuffix = element.options.attrs.default.dynamicSuffix @@ -130,7 +130,8 @@ class TimeDateServiceImpl extends WidgetService { const nowMonth = now.getMonth() const nowYear = now.getFullYear() const nowDate = now.getDate() - return new Date(nowYear - 1, nowMonth, nowDate).getTime() + + return new Date(dynamicSuffix === 'before' ? (nowYear - dynamicPrefix) : (nowYear + dynamicPrefix), nowMonth, nowDate).getTime() } } } diff --git a/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue b/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue index dc4e970995..4c3765a331 100644 --- a/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue +++ b/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue @@ -98,6 +98,10 @@ export default { }, dynamicPrefixChange(value) { + if (value < 1) { + value = 1 + this.element.options.attrs.default.dynamicPrefix = 1 + } this.setDval() }, dynamicInfillChange(value) {