From 0643ee63ca1a363fee0a5d8464493bceaccfdade Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 19 Jun 2024 17:00:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E9=A1=B5=E9=9D=A2=E9=80=9A=E8=BF=87iframe?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=B5=8C=E5=85=A5=E5=90=8E=EF=BC=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=E5=90=8E=E9=A1=B5=E9=9D=A2=E4=B8=80=E7=9B=B4?=
 =?UTF-8?q?=E5=9C=A8=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/v-query/QueryCascade.vue | 38 ++++++++++++-------
 .../views/visualized/data/dataset/index.vue   |  2 +-
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
index 55fcf777f0..e86413b9ca 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryCascade.vue
@@ -172,6 +172,10 @@ const deleteCascade = (idx, item) => {
   setPlaceholder()
 }
 
+const deleteCascadeBlock = idx => {
+  cascadeList.value.splice(idx, 1)
+}
+
 const addCascadeBlock = () => {
   const arr = []
   addCascadeItem(arr)
@@ -214,12 +218,19 @@ defineExpose({
       添加级联配置
     </el-button>
     <div class="cascade-content" v-for="(item, index) in cascadeList" :key="index">
-      <el-button :disabled="item.length === 5" text @click="addCascadeItem(item)">
-        <template #icon>
-          <Icon name="icon_add_outlined"></Icon>
-        </template>
-        添加级联条件
-      </el-button>
+      <div style="display: flex; align-items: center; justify-content: space-between">
+        <el-button :disabled="item.length === 5" text @click="addCascadeItem(item)">
+          <template #icon>
+            <Icon name="icon_add_outlined"></Icon>
+          </template>
+          添加级联条件
+        </el-button>
+        <el-button @click="deleteCascadeBlock(index)" class="cascade-delete-block" text>
+          <template #icon>
+            <Icon name="icon_delete-trash_outlined"></Icon>
+          </template>
+        </el-button>
+      </div>
       <div class="cascade-item">
         <div class="label">查询条件层级</div>
         <div class="item-name">请选择查询条件</div>
@@ -267,7 +278,7 @@ defineExpose({
             />
           </el-select>
         </div>
-        <el-button @click="deleteCascade(idx, item)" class="cascade-delete" text>
+        <el-button v-show="idx !== 0" @click="deleteCascade(idx, item)" class="cascade-delete" text>
           <template #icon>
             <Icon name="icon_delete-trash_outlined"></Icon>
           </template>
@@ -345,13 +356,14 @@ defineExpose({
       .item-field {
         width: 300px;
       }
+    }
 
-      .cascade-delete {
-        width: 40px;
-        font-size: 20px;
-        color: #646a73;
-        margin-left: 20px;
-      }
+    .cascade-delete-block,
+    .cascade-delete {
+      width: 40px;
+      font-size: 20px;
+      color: #646a73;
+      margin-left: 20px;
     }
   }
 }
diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue
index 6548715469..d708b3442a 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue
@@ -683,7 +683,7 @@ const getMenuList = (val: boolean) => {
     <div
       class="dataset-content"
       :class="{
-        auto: isIframe || isDataEaseBi
+        auto: isDataEaseBi
       }"
     >
       <template v-if="!state.datasetTree.length && mounted">