From 2f0293aa6fcb8d37ab19ab33823bcdbcabd7dd78 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 30 Oct 2023 10:05:49 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E9=A6=96=E6=AC=A1=E5=B0=86=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E8=87=B3tab?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=E4=B8=8D=E5=81=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E5=8F=AF=E4=BB=A5=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6tab=E7=BB=84=E4=BB=B6=E5=A4=96=E7=9A=84=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/custom-component/v-query/Component.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue
index 459ad1a1fd..ee830c7ab2 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -184,6 +184,7 @@ onMounted(() => {
   emitter.on(`addQueryCriteria${element.value.id}`, addCriteriaConfigOut)
   emitter.on(`editQueryCriteria${element.value.id}`, editQueryCriteria)
   emitter.on(`updateQueryCriteria${element.value.id}`, updateQueryCriteria)
+  updateQueryCriteria()
 })
 
 const dragover = () => {

From f8c74631decade6b06bf8f41637b1e9b80172c3f Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 30 Oct 2023 10:25:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=9C=B0=E7=90=86=E4=BD=8D=E7=BD=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=B1=95=E7=A4=BA=E7=B1=BB=E5=9E=8B=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=AF=B9=E5=BA=94=E7=9A=84=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue                | 7 +++++++
 1 file changed, 7 insertions(+)

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 fd63850655..f00e9b5cc4 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -729,10 +729,17 @@ defineExpose({
                   value="0"
                 />
                 <el-option
+                  v-if="curComponent.displayType === '2'"
                   :disabled="curComponent.displayType !== '2'"
                   label="数字下拉"
                   value="2"
                 />
+                <el-option
+                  v-else
+                  :disabled="curComponent.displayType !== '5'"
+                  label="数字下拉"
+                  value="5"
+                />
                 <el-option
                   :disabled="!['1', '7'].includes(curComponent.displayType)"
                   label="时间"

From 6637f8b57f8a94772d651903b11fdbe0625a7e0e Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 30 Oct 2023 11:48:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=A4=A7=E5=B1=8F=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=BC=BA=E5=B0=91=E5=9B=BE=E8=A1=A8/?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E6=8E=A7=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=B7=BB=E5=8A=A0=E5=9B=BE=E8=A1=A8/?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/data-visualization/DvToolbar.vue           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/DvToolbar.vue b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
index f34babd585..d81e98b940 100644
--- a/core/core-frontend/src/components/data-visualization/DvToolbar.vue
+++ b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
@@ -152,8 +152,8 @@ eventBus.on('clearCanvas', clearCanvas)
         </div>
         <div class="middle-area"></div>
       </template>
-      <template v-else-if="!isDataEaseBi">
-        <el-icon class="custom-el-icon back-icon" @click="backToMain()">
+      <template v-else>
+        <el-icon v-if="!isDataEaseBi" class="custom-el-icon back-icon" @click="backToMain()">
           <Icon class="toolbar-icon" name="icon_left_outlined" />
         </el-icon>
         <div class="left-area">