From 35d57fe48ca7ededf5bde7b27c2b33e686c85680 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 20 Mar 2024 10:05:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=AD=9B=E9=80=89=E7=BB=84=E4=BB=B6=E5=8F=AF?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9F=A5=E8=AF=A2=E7=9A=84=E8=B5=B7=E5=A7=8B?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=20#6005?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/lang/en.js                  |   4 +-
 core/frontend/src/lang/tw.js                  |   4 +-
 core/frontend/src/lang/zh.js                  |   4 +-
 .../filter/filterMain/RangeFilterTime.vue     | 129 ++++++++++--------
 4 files changed, 80 insertions(+), 61 deletions(-)

diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js
index 1738dedb37..03c9faf2a4 100644
--- a/core/frontend/src/lang/en.js
+++ b/core/frontend/src/lang/en.js
@@ -43,7 +43,7 @@ export default {
   },
   time: {
     set_time_filtering_range: 'Set time filtering range',
-    filter_range: 'The default value must be within the time filtering range',
+    filter_range: 'The default value is outside the date filtering range, please reset it!',
     interval_type: 'Interval type',
     fixed_time: 'Fixed time',
     dynamic_time: 'Dynamic time',
@@ -52,7 +52,7 @@ export default {
     end_time: 'End time',
     preview: 'preview',
     maximum_single_query: 'Maximum single query',
-    day: 'day',
+    day_s: 'day',
     dynamic_query_time_window: 'Dynamic query time window',
     nothing: 'nothing',
     starting_from: 'Starting from',
diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js
index 2f6e0c7a11..ea5677ab03 100644
--- a/core/frontend/src/lang/tw.js
+++ b/core/frontend/src/lang/tw.js
@@ -43,7 +43,7 @@ export default {
   },
   time: {
     set_time_filtering_range: '設定時間篩選範圍',
-    filter_range: '預設值必須在時間篩選範圍',
+    filter_range: '預設值超出日期篩選範圍內，請重新設定！',
     interval_type: '區間類型',
     fixed_time: '固定時間',
     dynamic_time: '動態時間',
@@ -52,7 +52,7 @@ export default {
     end_time: '結束時間',
     preview: '預覽',
     maximum_single_query: '單次査詢最多',
-    day: '天',
+    day_s: '天',
     dynamic_query_time_window: '動態査詢時間視窗',
     nothing: '無',
     starting_from: '開始於',
diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js
index 8d4015854b..f4cc9960ea 100644
--- a/core/frontend/src/lang/zh.js
+++ b/core/frontend/src/lang/zh.js
@@ -47,7 +47,7 @@ export default {
   },
   time: {
     set_time_filtering_range: '设置时间筛选范围',
-    filter_range: '默认值必须在时间筛选范围',
+    filter_range: '默认值超出日期筛选范围内，请重新设置!',
     interval_type: '区间类型',
     fixed_time: '固定时间',
     dynamic_time: '动态时间',
@@ -56,7 +56,7 @@ export default {
     end_time: '结束时间',
     preview: '预览',
     maximum_single_query: '单次查询最多',
-    day: '天',
+    day_s: '天',
     dynamic_query_time_window: '动态查询时间窗口',
     nothing: '无',
     starting_from: '开始于',
diff --git a/core/frontend/src/views/panel/filter/filterMain/RangeFilterTime.vue b/core/frontend/src/views/panel/filter/filterMain/RangeFilterTime.vue
index 850c1dc272..049578f806 100644
--- a/core/frontend/src/views/panel/filter/filterMain/RangeFilterTime.vue
+++ b/core/frontend/src/views/panel/filter/filterMain/RangeFilterTime.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="set-time-filtering-range">
-    <div class="title">{{ $t('time.set_time_filtering_range') }}</div>
+    <div class="title">{{ $t("time.set_time_filtering_range") }}</div>
     <div class="list-item">
-      <div class="label">{{ $t('time.interval_type') }}</div>
+      <div class="label">{{ $t("time.interval_type") }}</div>
       <div class="setting-content">
         <div class="setting">
           <el-radio-group v-model="timeRange.intervalType">
@@ -17,21 +17,23 @@
       </div>
     </div>
     <div class="list-item" v-if="timeRange.intervalType !== 'none'">
-      <div class="label">{{ regularOrTrendsTitle }}</div>
+      <div class="label">{{ $t(`time.${regularOrTrendsTitle}`) }}</div>
       <div class="setting-content">
         <div class="setting">
           <el-radio-group v-model="timeRange.regularOrTrends">
-            <el-radio label="fixed">{{ $t('time.fixed_time') }}</el-radio>
-            <el-radio label="dynamic">{{ $t('time.dynamic_time') }}</el-radio>
+            <el-radio label="fixed">{{ $t("time.fixed_time") }}</el-radio>
+            <el-radio label="dynamic">{{ $t("time.dynamic_time") }}</el-radio>
           </el-radio-group>
         </div>
         <template
           v-if="dynamicTime && timeRange.intervalType !== 'timeInterval'"
         >
           <div class="setting">
-            <div class="setting-label">{{ $t('time.relative_to_current') }}</div>
+            <div class="setting-label">
+              {{ $t("time.relative_to_current") }}
+            </div>
             <div class="setting-value select">
-              <el-select v-model="timeRange.relativeToCurrent">
+              <el-select size="small" v-model="timeRange.relativeToCurrent">
                 <el-option
                   v-for="item in relativeToCurrentList"
                   :key="item.value"
@@ -49,7 +51,7 @@
                 :min="0"
                 controls-position="right"
               />
-              <el-select v-model="timeRange.relativeToCurrentType">
+              <el-select size="small" v-model="timeRange.relativeToCurrentType">
                 <el-option
                   v-for="item in relativeToCurrentTypeList"
                   :key="item.value"
@@ -57,7 +59,7 @@
                   :value="item.value"
                 />
               </el-select>
-              <el-select v-model="timeRange.around">
+              <el-select size="small" v-model="timeRange.around">
                 <el-option
                   v-for="item in aroundList"
                   :key="item.value"
@@ -72,7 +74,7 @@
           v-else-if="dynamicTime && timeRange.intervalType === 'timeInterval'"
         >
           <div class="setting">
-            <div class="setting-label">{{ $t('time.start_time') }}</div>
+            <div class="setting-label">{{ $t("time.start_time") }}</div>
             <div class="setting-input range">
               <el-input-number
                 v-model="timeRange.timeNum"
@@ -80,7 +82,7 @@
                 :min="0"
                 controls-position="right"
               />
-              <el-select v-model="timeRange.relativeToCurrentType">
+              <el-select size="small" v-model="timeRange.relativeToCurrentType">
                 <el-option
                   v-for="item in relativeToCurrentTypeList"
                   :key="item.value"
@@ -88,7 +90,7 @@
                   :value="item.value"
                 />
               </el-select>
-              <el-select v-model="timeRange.around">
+              <el-select size="small" v-model="timeRange.around">
                 <el-option
                   v-for="item in aroundList"
                   :key="item.value"
@@ -99,7 +101,7 @@
             </div>
           </div>
           <div class="setting">
-            <div class="setting-label">{{ $t('time.end_time') }}</div>
+            <div class="setting-label">{{ $t("time.end_time") }}</div>
             <div class="setting-input range">
               <el-input-number
                 v-model="timeRange.timeNumRange"
@@ -107,7 +109,7 @@
                 :min="0"
                 controls-position="right"
               />
-              <el-select v-model="timeRange.relativeToCurrentTypeRange">
+              <el-select size="small" v-model="timeRange.relativeToCurrentTypeRange">
                 <el-option
                   v-for="item in relativeToCurrentTypeList"
                   :key="item.value"
@@ -115,7 +117,7 @@
                   :value="item.value"
                 />
               </el-select>
-              <el-select v-model="timeRange.aroundRange">
+              <el-select size="small" v-model="timeRange.aroundRange">
                 <el-option
                   v-for="item in aroundList"
                   :key="item.value"
@@ -128,13 +130,16 @@
         </template>
       </div>
       <div class="parameters" :class="dynamicTime && 'setting'">
-        <div class="setting-label" v-if="dynamicTime">{{ $t('time.preview') }}</div>
+        <div class="setting-label" v-if="dynamicTime">
+          {{ $t("time.preview") }}
+        </div>
         <div :class="dynamicTime ? 'setting-value' : 'w100'">
           <el-date-picker
             :disabled="timeRange.regularOrTrends !== 'fixed'"
             v-model="timeRange.regularOrTrendsValue"
             :key="timeInterval"
             :type="timeInterval"
+            size="small"
             :start-placeholder="$t('dataset.start_time')"
             :end-placeholder="$t('dataset.end_time')"
           />
@@ -152,37 +157,31 @@
         v-if="timeRange.dynamicWindow"
         class="setting-content maximum-single-query"
       >
-      {{ $t('time.maximum_single_query') }}
+        {{ $t("time.maximum_single_query") }}
         <el-input-number
           v-model="timeRange.maximumSingleQuery"
           :min="1"
           size="small"
           controls-position="right"
         />
-        {{ $t('time.day') }}
+        {{ $t("time.day_s") }}
       </div>
     </div>
     <div class="popover-foot">
-      <de-btn
-          secondary
-          @click="closeFilter"
-        >{{ $t('chart.cancel') }}
-        </de-btn>
-        <de-btn
-          type="primary"
-          @click="changeFilter"
-        >{{ $t('chart.confirm') }}
-        </de-btn>
+      <de-btn secondary @click="closeFilter">{{ $t("chart.cancel") }} </de-btn>
+      <de-btn type="primary" @click="changeFilter"
+        >{{ $t("chart.confirm") }}
+      </de-btn>
     </div>
   </div>
 </template>
 
 <script>
 import { getThisStart, getLastStart, getAround } from "./time-format-dayjs";
-import { cloneDeep } from 'lodash-es'
+import { cloneDeep } from "lodash-es";
 const intervalTypeList = [
   {
-    label: "day",
+    label: "nothing",
     value: "none",
   },
   {
@@ -247,24 +246,24 @@ const relativeToCurrentList = [
 ];
 
 const defaultObj = {
-        intervalType: "none",
-        dynamicWindow: false,
-        maximumSingleQuery: 0,
-        regularOrTrends: "fixed",
-        regularOrTrendsValue: "",
-        relativeToCurrent: "custom",
-        timeNum: 0,
-        relativeToCurrentType: "year",
-        around: "f",
-        timeNumRange: 0,
-        relativeToCurrentTypeRange: "year",
-        aroundRange: "f",
-      }
+  intervalType: "none",
+  dynamicWindow: false,
+  maximumSingleQuery: 0,
+  regularOrTrends: "fixed",
+  regularOrTrendsValue: "",
+  relativeToCurrent: "custom",
+  timeNum: 0,
+  relativeToCurrentType: "year",
+  around: "f",
+  timeNumRange: 0,
+  relativeToCurrentTypeRange: "year",
+  aroundRange: "f",
+};
 export default {
   props: {
     timeRangeData: {
       type: Object,
-      defalut: () => (defaultObj),
+      defalut: () => defaultObj,
     },
   },
   data() {
@@ -291,7 +290,7 @@ export default {
   },
   created() {
     this.timeRange = cloneDeep(this.timeRangeData);
-    this.init()
+    this.init();
   },
   computed: {
     timeConfig() {
@@ -350,10 +349,23 @@ export default {
         aroundRange,
         regularOrTrends,
       } = this.timeRange;
-      if (regularOrTrends === 'fixed') {
-        if (!!regularOrTrendsValue) return
-        this.timeRange.regularOrTrendsValue = new Date()
-        return
+      if (regularOrTrends === "fixed") {
+        if (intervalType === "timeInterval") {
+          if (
+            Array.isArray(regularOrTrendsValue) &&
+            !!regularOrTrendsValue.length
+          )
+            return;
+          this.timeRange.regularOrTrendsValue = [
+            getAround(relativeToCurrentType, "add", 0),
+            getAround(relativeToCurrentType, "add", 1),
+          ];
+          return;
+        }
+        if (!Array.isArray(regularOrTrendsValue) && !!regularOrTrendsValue)
+          return;
+        this.timeRange.regularOrTrendsValue = new Date();
+        return;
       }
       if (intervalType === "timeInterval") {
         const startTime = getAround(
@@ -408,18 +420,18 @@ export default {
       }
     },
     closeFilter() {
-      this.timeRange = cloneDeep(defaultObj)
-      this.$emit('changeData', null)
+      this.timeRange = cloneDeep(defaultObj);
+      this.$emit("changeData", null);
     },
     changeFilter() {
-      this.$emit('changeData', cloneDeep(this.timeRange))
-    }
+      this.$emit("changeData", cloneDeep(this.timeRange));
+    },
   },
 };
 </script>
 <style lang="less">
 .set-time-filtering-range {
-  color: #1F2329;
+  color: #1f2329;
   .el-radio,
   .el-checkbox.el-checkbox--default {
     height: 22px;
@@ -433,7 +445,7 @@ export default {
     padding: 16px;
     width: calc(100% + 24px);
     margin: 0 0 -12px -12px;
-    border-top: 1px solid  #1F232926;
+    border-top: 1px solid #1f232926;
   }
   .title {
     font-size: 14px;
@@ -577,6 +589,13 @@ export default {
         & > div + div {
           margin-left: 8px;
         }
+
+        .el-select {
+          width: 97px;
+        }
+        .el-input-number {
+          width: 98px;
+        }
       }
 
       &.is-year-month-range {