From d3b55e4d7282eecdfc8dd7bc8e31fcb2193caef9 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 22 Nov 2024 10:01:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E6=97=B6=E9=97=B4=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E8=A7=84=E5=88=99-=E6=97=B6=E9=97=B4=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E8=8C=83=E5=9B=B4-=E5=8A=A8=E6=80=81=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=B8=8B=E6=8B=89=E6=A1=86=E5=AD=98=E5=9C=A8=E6=9C=AA?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/ConditionDefaultConfiguration.vue  | 2 +-
 core/core-frontend/src/custom-component/v-query/FilterTime.vue  | 2 +-
 .../custom-component/v-query/QueryConditionConfiguration.vue    | 2 +-
 .../src/custom-component/v-query/RangeFilterTime.vue            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
index 36ecc326be..0d13dca1d5 100644
--- a/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/ConditionDefaultConfiguration.vue
@@ -197,7 +197,7 @@ const relativeToCurrentListRange = computed(() => {
           value: 'thisMonth'
         },
         {
-          label: t('dynamic_month.dynamic_month'),
+          label: t('dynamic_month.last'),
           value: 'lastMonth'
         },
         {
diff --git a/core/core-frontend/src/custom-component/v-query/FilterTime.vue b/core/core-frontend/src/custom-component/v-query/FilterTime.vue
index 3bfd0cd301..146722241b 100644
--- a/core/core-frontend/src/custom-component/v-query/FilterTime.vue
+++ b/core/core-frontend/src/custom-component/v-query/FilterTime.vue
@@ -198,7 +198,7 @@ const relativeToCurrentListRange = computed(() => {
           value: 'thisMonth'
         },
         {
-          label: t('dynamic_month.dynamic_month'),
+          label: t('dynamic_month.last'),
           value: 'lastMonth'
         },
         {
diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index b1e1d5e822..eadee77911 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -1948,7 +1948,7 @@ const relativeToCurrentListRange = computed(() => {
           value: 'thisMonth'
         },
         {
-          label: t('dynamic_month.dynamic_month'),
+          label: t('dynamic_month.last'),
           value: 'lastMonth'
         },
         {
diff --git a/core/core-frontend/src/custom-component/v-query/RangeFilterTime.vue b/core/core-frontend/src/custom-component/v-query/RangeFilterTime.vue
index ebe8d02201..cbfae2dfdb 100644
--- a/core/core-frontend/src/custom-component/v-query/RangeFilterTime.vue
+++ b/core/core-frontend/src/custom-component/v-query/RangeFilterTime.vue
@@ -209,7 +209,7 @@ const relativeToCurrentListRange = computed(() => {
           value: 'thisMonth'
         },
         {
-          label: t('dynamic_month.dynamic_month'),
+          label: t('dynamic_month.last'),
           value: 'lastMonth'
         },
         {

From 8beb6f0688142b1dc041430d99803bf80164fb83 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 22 Nov 2024 10:31:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E5=B1=95=E5=BC=80=E6=97=B6=E9=97=B4=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E6=97=B6=E5=85=B3=E9=97=AD=E8=AE=BE=E7=BD=AE=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E4=B8=8B=E6=8B=89=E6=A1=86=E5=81=8F=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/v-query/FilterTime.vue  | 16 ++++++++--------
 .../custom-component/v-query/RangeFilterTime.vue | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/FilterTime.vue b/core/core-frontend/src/custom-component/v-query/FilterTime.vue
index 146722241b..5370f291bd 100644
--- a/core/core-frontend/src/custom-component/v-query/FilterTime.vue
+++ b/core/core-frontend/src/custom-component/v-query/FilterTime.vue
@@ -283,7 +283,7 @@ const relativeToCurrentListRange = computed(() => {
           <div class="setting" v-if="timeRange.intervalType !== 'timeInterval'">
             <div class="setting-label">{{ t('dynamic_time.relative') }}</div>
             <div class="setting-value select">
-              <el-select v-model="timeRange.relativeToCurrent">
+              <el-select :teleported="false" v-model="timeRange.relativeToCurrent">
                 <el-option
                   v-for="item in relativeToCurrentList"
                   :key="item.value"
@@ -296,7 +296,7 @@ const relativeToCurrentListRange = computed(() => {
           <div class="setting" v-if="timeRange.relativeToCurrent === 'custom'">
             <div class="setting-input">
               <el-input-number v-model="timeRange.timeNum" :min="0" controls-position="right" />
-              <el-select v-model="timeRange.relativeToCurrentType">
+              <el-select :teleported="false" v-model="timeRange.relativeToCurrentType">
                 <el-option
                   v-for="item in relativeToCurrentTypeList"
                   :key="item.value"
@@ -304,7 +304,7 @@ const relativeToCurrentListRange = computed(() => {
                   :value="item.value"
                 />
               </el-select>
-              <el-select v-model="timeRange.around">
+              <el-select :teleported="false" v-model="timeRange.around">
                 <el-option
                   v-for="item in aroundList"
                   :key="item.value"
@@ -319,7 +319,7 @@ const relativeToCurrentListRange = computed(() => {
           <div class="setting">
             <div class="setting-label">{{ t('dynamic_time.relative') }}</div>
             <div class="setting-value select">
-              <el-select v-model="timeRange.relativeToCurrentRange">
+              <el-select :teleported="false" v-model="timeRange.relativeToCurrentRange">
                 <el-option
                   v-for="item in relativeToCurrentListRange"
                   :key="item.value"
@@ -342,7 +342,7 @@ const relativeToCurrentListRange = computed(() => {
                   :min="0"
                   controls-position="right"
                 />
-                <el-select v-model="timeRange.relativeToCurrentType">
+                <el-select :teleported="false" v-model="timeRange.relativeToCurrentType">
                   <el-option
                     v-for="item in relativeToCurrentTypeList"
                     :key="item.value"
@@ -350,7 +350,7 @@ const relativeToCurrentListRange = computed(() => {
                     :value="item.value"
                   />
                 </el-select>
-                <el-select v-model="timeRange.around">
+                <el-select :teleported="false" v-model="timeRange.around">
                   <el-option
                     v-for="item in aroundList"
                     :key="item.value"
@@ -372,7 +372,7 @@ const relativeToCurrentListRange = computed(() => {
                   step-strictly
                   controls-position="right"
                 />
-                <el-select v-model="timeRange.relativeToCurrentTypeRange">
+                <el-select :teleported="false" v-model="timeRange.relativeToCurrentTypeRange">
                   <el-option
                     v-for="item in relativeToCurrentTypeList"
                     :key="item.value"
@@ -380,7 +380,7 @@ const relativeToCurrentListRange = computed(() => {
                     :value="item.value"
                   />
                 </el-select>
-                <el-select v-model="timeRange.aroundRange">
+                <el-select :teleported="false" v-model="timeRange.aroundRange">
                   <el-option
                     v-for="item in aroundList"
                     :key="item.value"
diff --git a/core/core-frontend/src/custom-component/v-query/RangeFilterTime.vue b/core/core-frontend/src/custom-component/v-query/RangeFilterTime.vue
index cbfae2dfdb..c73dea8c17 100644
--- a/core/core-frontend/src/custom-component/v-query/RangeFilterTime.vue
+++ b/core/core-frontend/src/custom-component/v-query/RangeFilterTime.vue
@@ -294,7 +294,7 @@ const relativeToCurrentListRange = computed(() => {
           <div class="setting" v-if="timeRange.intervalType !== 'timeInterval'">
             <div class="setting-label">{{ t('dynamic_time.relative') }}</div>
             <div class="setting-value select">
-              <el-select v-model="timeRange.relativeToCurrent">
+              <el-select :teleported="false" v-model="timeRange.relativeToCurrent">
                 <el-option
                   v-for="item in relativeToCurrentList"
                   :key="item.value"
@@ -307,7 +307,7 @@ const relativeToCurrentListRange = computed(() => {
           <div class="setting" v-if="timeRange.relativeToCurrent === 'custom'">
             <div class="setting-input">
               <el-input-number v-model="timeRange.timeNum" :min="0" controls-position="right" />
-              <el-select v-model="timeRange.relativeToCurrentType">
+              <el-select :teleported="false" v-model="timeRange.relativeToCurrentType">
                 <el-option
                   v-for="item in relativeToCurrentTypeList"
                   :key="item.value"
@@ -315,7 +315,7 @@ const relativeToCurrentListRange = computed(() => {
                   :value="item.value"
                 />
               </el-select>
-              <el-select v-model="timeRange.around">
+              <el-select :teleported="false" v-model="timeRange.around">
                 <el-option
                   v-for="item in aroundList"
                   :key="item.value"
@@ -330,7 +330,7 @@ const relativeToCurrentListRange = computed(() => {
           <div class="setting">
             <div class="setting-label">{{ t('dynamic_time.relative') }}</div>
             <div class="setting-value select">
-              <el-select v-model="timeRange.relativeToCurrentRange">
+              <el-select :teleported="false" v-model="timeRange.relativeToCurrentRange">
                 <el-option
                   v-for="item in relativeToCurrentListRange"
                   :key="item.value"
@@ -356,7 +356,7 @@ const relativeToCurrentListRange = computed(() => {
                   :min="0"
                   controls-position="right"
                 />
-                <el-select v-model="timeRange.relativeToCurrentType">
+                <el-select :teleported="false" v-model="timeRange.relativeToCurrentType">
                   <el-option
                     v-for="item in relativeToCurrentTypeList"
                     :key="item.value"
@@ -364,7 +364,7 @@ const relativeToCurrentListRange = computed(() => {
                     :value="item.value"
                   />
                 </el-select>
-                <el-select v-model="timeRange.around">
+                <el-select :teleported="false" v-model="timeRange.around">
                   <el-option
                     v-for="item in aroundList"
                     :key="item.value"
@@ -389,7 +389,7 @@ const relativeToCurrentListRange = computed(() => {
                   step-strictly
                   controls-position="right"
                 />
-                <el-select v-model="timeRange.relativeToCurrentTypeRange">
+                <el-select :teleported="false" v-model="timeRange.relativeToCurrentTypeRange">
                   <el-option
                     v-for="item in relativeToCurrentTypeList"
                     :key="item.value"
@@ -397,7 +397,7 @@ const relativeToCurrentListRange = computed(() => {
                     :value="item.value"
                   />
                 </el-select>
-                <el-select v-model="timeRange.aroundRange">
+                <el-select :teleported="false" v-model="timeRange.aroundRange">
                   <el-option
                     v-for="item in aroundList"
                     :key="item.value"