From dc4c9ca3ac6aef05fef47106907ab15bdafa681b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 7 Jan 2022 14:14:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8A=A8=E6=80=81=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/widget/serviceImpl/TimeDateServiceImpl.js | 6 ++----
 .../views/panel/filter/defaultValue/DeDateDefault.vue    | 9 +++++++--
 .../src/views/panel/filter/filterMain/FilterFoot.vue     | 2 ++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
index 98bfcc7af6..1a9e0c6deb 100644
--- a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
@@ -114,10 +114,8 @@ class TimeDateServiceImpl extends WidgetService {
         const tarYear = nowYear
         if (dynamicSuffix === 'before') {
           const deffMonth = nowMonth - dynamicPrefix
-          let diffYear = deffMonth / 12
-          if (deffMonth < 0) {
-            diffYear -= 1
-          }
+          const diffYear = Math.floor(deffMonth / 12)
+
           return new Date(tarYear + diffYear, nowMonth - dynamicPrefix % 12, nowDate).getTime()
         } else {
           const deffMonth = nowMonth + dynamicPrefix
diff --git a/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue b/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue
index f6ce1acaa3..06ea0b0cd0 100644
--- a/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue
+++ b/frontend/src/views/panel/filter/defaultValue/DeDateDefault.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="element">
+  <div v-if="element" class="default-value-div">
     <el-form ref="form" :model="element.options.attrs.default" label-width="100px">
 
       <el-form-item :label="$t('dynamic_time.set_default')">
@@ -23,7 +23,7 @@
       <div class="inline">
 
         <el-form-item v-if="element.options.attrs.default.isDynamic && element.options.attrs.default.dkey === 3" label="">
-          <el-input v-model="element.options.attrs.default.dynamicPrefix" type="number" size="mini" :min="1" :max="10" @input="dynamicPrefixChange" />
+          <el-input v-model="element.options.attrs.default.dynamicPrefix" type="number" size="mini" :min="1" :max="12" @input="dynamicPrefixChange" />
         </el-form-item>
 
         <el-form-item v-if="element.options.attrs.default.isDynamic && element.options.attrs.default.dkey === 3" label="" class="no-label-item">
@@ -126,6 +126,11 @@ export default {
       min-width: 70px;
   }
 }
+.inline{
+    .el-form-item {
+      margin-bottom: 5px !important;
+    }
+  }
 .relative-time {
     width: 100%;
 }
diff --git a/frontend/src/views/panel/filter/filterMain/FilterFoot.vue b/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
index c7d1bfdd7c..19a04ccfc0 100644
--- a/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
+++ b/frontend/src/views/panel/filter/filterMain/FilterFoot.vue
@@ -78,6 +78,8 @@ export default {
   .box-card {
     width: 100%;
     height: 100%;
+    max-height: 100%;
+    overflow-y: scroll;
   }
 
 </style>