From ad79d63dc53ce6032ffbfd4541ab3fb86a83dc87 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 11 Jul 2024 15:29:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20tab?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=95=B0=E5=80=BC=E8=A7=84=E5=88=99=E5=8F=AF=E4=BB=A5=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4tab=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

---
 .../v-query/QueryConditionConfiguration.vue   | 38 ++++++-------------
 .../core-frontend/src/views/copilot/index.vue |  1 +
 2 files changed, 12 insertions(+), 27 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 8afe679612..e4a7124910 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -69,32 +69,22 @@ const datasetMap = {}
 const snapshotStore = snapshotStoreWithOut()
 
 const dfsComponentData = () => {
-  const isMain = componentData.value.some(ele => ele.id === queryElement.value.id)
-  let isGroup = false
   let arr = componentData.value.filter(
     com => !['VQuery', 'DeTabs'].includes(com.innerType) && com.component !== 'Group'
   )
-  let tabArr = []
-  let groupArr = []
   componentData.value.forEach(ele => {
     if (ele.innerType === 'DeTabs') {
       ele.propValue.forEach(itx => {
-        if (itx.componentData.some(item => item.id === queryElement.value.id) && !isMain) {
-          tabArr = itx.componentData.filter(
+        arr = [
+          ...arr,
+          ...itx.componentData.filter(
             com => !['VQuery', 'DeTabs'].includes(com.innerType) && com.component !== 'Group'
           )
-        } else {
-          arr = [
-            ...arr,
-            ...itx.componentData.filter(
-              com => !['VQuery', 'DeTabs'].includes(com.innerType) && com.component !== 'Group'
-            )
-          ]
-        }
+        ]
       })
     } else if (ele.component === 'Group') {
-      isGroup = ele.propValue.some(item => item.id === queryElement.value.id)
-      groupArr = [
+      arr = [
+        ...arr,
         ele.propValue.filter(
           com => !['VQuery', 'DeTabs'].includes(com.innerType) && com.component !== 'Group'
         )
@@ -102,25 +92,19 @@ const dfsComponentData = () => {
       ele.propValue.forEach(element => {
         if (element.innerType === 'DeTabs') {
           element.propValue.forEach(itx => {
-            if (itx.componentData.some(item => item.id === queryElement.value.id) && !isMain) {
-              tabArr = itx.componentData.filter(
+            arr = [
+              ...arr,
+              ...itx.componentData.filter(
                 com => !['VQuery', 'DeTabs'].includes(com.innerType) && com.component !== 'Group'
               )
-            } else {
-              groupArr = [
-                ...groupArr,
-                ...itx.componentData.filter(
-                  com => !['VQuery', 'DeTabs'].includes(com.innerType) && com.component !== 'Group'
-                )
-              ]
-            }
+            ]
           })
         }
       })
     }
   })
 
-  return isMain || isGroup ? [...arr, ...groupArr].flat() : tabArr
+  return arr.flat()
 }
 
 const datasetFieldList = computed(() => {
diff --git a/core/core-frontend/src/views/copilot/index.vue b/core/core-frontend/src/views/copilot/index.vue
index 936d5ccc79..d7fdebe872 100644
--- a/core/core-frontend/src/views/copilot/index.vue
+++ b/core/core-frontend/src/views/copilot/index.vue
@@ -473,6 +473,7 @@ const queryAnswer = () => {
           .label-tooltip {
             margin-left: 5.33px;
             width: 70%;
+            font-size: 14px;
             overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;