From c3308edebc550728bec9abf9242200a5714ce6f5 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 1 Apr 2024 16:54:57 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix(=E6=99=BA=E8=83=BD=E5=8A=A9=E6=89=8B):?=
 =?UTF-8?q?=20=E5=8D=A1=E7=89=87=E7=9A=84=E6=8A=95=E5=BD=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/layout/components/AiComponent.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/core-frontend/src/layout/components/AiComponent.vue b/core/core-frontend/src/layout/components/AiComponent.vue
index 04b240c7d7..7d7937dafc 100644
--- a/core/core-frontend/src/layout/components/AiComponent.vue
+++ b/core/core-frontend/src/layout/components/AiComponent.vue
@@ -62,5 +62,6 @@ onMounted(() => {
   height: 50%;
   min-height: 450px;
   max-height: 600px;
+  box-shadow: 0px 6px 24px 0px #1f232914;
 }
 </style>

From 406d24680697989dbf498fa33e1cee80867eaa68 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 1 Apr 2024 16:55:30 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20hover?=
 =?UTF-8?q?=E8=A1=8C=E6=97=B6=20=E9=BC=A0=E6=A0=87=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=20=E6=8A=93=E6=89=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/share/share/ShareGrid.vue    | 4 ++++
 core/core-frontend/src/views/workbranch/ShortcutTable.vue | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/core/core-frontend/src/views/share/share/ShareGrid.vue b/core/core-frontend/src/views/share/share/ShareGrid.vue
index 1729e041bf..b01fd82c8f 100644
--- a/core/core-frontend/src/views/share/share/ShareGrid.vue
+++ b/core/core-frontend/src/views/share/share/ShareGrid.vue
@@ -225,6 +225,10 @@ watch(
   margin-top: 16px;
   height: calc(100% - 110px);
 
+  :deep(.ed-table__row):hover {
+    cursor: pointer;
+  }
+
   .name-content {
     display: flex;
     align-items: center;
diff --git a/core/core-frontend/src/views/workbranch/ShortcutTable.vue b/core/core-frontend/src/views/workbranch/ShortcutTable.vue
index 543ee1f115..e459f8b840 100644
--- a/core/core-frontend/src/views/workbranch/ShortcutTable.vue
+++ b/core/core-frontend/src/views/workbranch/ShortcutTable.vue
@@ -432,6 +432,10 @@ const getEmptyDesc = (): string => {
     margin-top: 16px;
     height: calc(100% - 110px);
 
+    :deep(.ed-table__row):hover {
+      cursor: pointer;
+    }
+
     .name-content {
       display: flex;
       align-items: center;

From a2971cc42ba9340c3bcf9194be4f16f1a98f4a2d Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 1 Apr 2024 16:56:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix(=E6=99=BA=E8=83=BD=E5=8A=A9=E6=89=8B):?=
 =?UTF-8?q?=20=E5=9B=BE=E6=A0=87=E5=8F=B3=E4=BE=A7=E9=97=B4=E8=B7=9D?=
 =?UTF-8?q?=E4=B8=BA20px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/layout/components/Header.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-frontend/src/layout/components/Header.vue b/core/core-frontend/src/layout/components/Header.vue
index f05f7b2cba..8d66874dfa 100644
--- a/core/core-frontend/src/layout/components/Header.vue
+++ b/core/core-frontend/src/layout/components/Header.vue
@@ -96,7 +96,7 @@ onMounted(() => {
     </el-menu>
     <div class="operate-setting" v-if="!desktop">
       <XpackComponent jsname="c3dpdGNoZXI=" />
-      <el-icon class="ai-icon" v-if="aiBaseUrl">
+      <el-icon style="margin: 0 10px" class="ai-icon" v-if="aiBaseUrl">
         <Icon name="dv-ai" @click="handleAiClick" />
       </el-icon>
       <ToolboxCfg v-if="showToolbox" />

From 893633001c38667bc99b30332df8b37d1b3746c6 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 1 Apr 2024 16:56:34 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):?=
 =?UTF-8?q?=20=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E4=BC=9A=E7=95=99=E5=9C=A8=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue   | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

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 ce58aa0b50..867ed78df4 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -498,6 +498,7 @@ const handleBeforeClose = () => {
   inputCom.value?.mult?.handleClickOutside?.()
   handleDialogClick()
   dialogVisible.value = false
+  visiblePopover.value = false
 }
 
 const confirmClick = () => {
@@ -1408,12 +1409,34 @@ defineExpose({
           </div>
           <div class="list-item" v-if="+curComponent.displayType === 0">
             <div class="label">
-              <el-checkbox v-model="curComponent.showEmpty" label="选项值包含空数据" />
+              <el-tooltip
+                effect="dark"
+                content="绑定参数后，不支持传空数据"
+                :disabled="!curComponent.parametersCheck"
+                placement="top"
+              >
+                <el-checkbox
+                  :disabled="curComponent.parametersCheck"
+                  v-model="curComponent.showEmpty"
+                  label="选项值包含空数据"
+                />
+              </el-tooltip>
             </div>
           </div>
           <div class="list-item">
             <div class="label">
-              <el-checkbox v-model="curComponent.parametersCheck" label="绑定参数" />
+              <el-tooltip
+                effect="dark"
+                content="空数据不支持传参数"
+                :disabled="!curComponent.showEmpty"
+                placement="top"
+              >
+                <el-checkbox
+                  :disabled="curComponent.showEmpty"
+                  v-model="curComponent.parametersCheck"
+                  label="绑定参数"
+                />
+              </el-tooltip>
             </div>
             <template v-if="curComponent.parametersCheck">
               <div v-if="curComponent.displayType !== '7'" class="parameters">
@@ -1701,8 +1724,10 @@ defineExpose({
     border-radius: 4px;
     border: 1px solid #dee0e3;
     display: flex;
-    .ed-checkbox__label:hover {
-      color: #1f2329;
+    .ed-checkbox:not(.is-disabled) {
+      .ed-checkbox__label:hover {
+        color: #1f2329;
+      }
     }
     .query-condition-list {
       height: 100%;