Merge pull request #8838 from dataease/pr@dev-v2_bug_fix

Pr@dev v2 bug fix

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%;

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>

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" />

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;

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;