From de99f0a89385954d0f26076d5fb47bfdb9b34958 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Mon, 16 Jan 2023 18:05:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A1=80=E7=BC=98=E5=85=B3=E7=B3=BB):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BB=98=E8=AE=A4=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/relationship/consanguinity.vue     | 25 +++++++++++--------
 .../src/views/system/relationship/index.vue   | 14 ++++++++---
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/frontend/src/views/system/relationship/consanguinity.vue b/frontend/src/views/system/relationship/consanguinity.vue
index f12674a135..0a174f0052 100644
--- a/frontend/src/views/system/relationship/consanguinity.vue
+++ b/frontend/src/views/system/relationship/consanguinity.vue
@@ -32,17 +32,17 @@ export default {
   },
   watch: {
     chartSize: {
-        handler(val) {
-            if (this.myChart) {
-                this.myChart.resize(val)
-            }
-        },
-        deep: true
+      handler(val) {
+        if (this.myChart) {
+          this.myChart.resize(val)
+        }
+      },
+      deep: true
     }
   },
   methods: {
     getChartData(current) {
-      this.current = {...current}
+      this.current = { ...current }
       const { queryType, num: id } = current
       this.activeId = id
       switch (queryType) {
@@ -52,9 +52,14 @@ export default {
         case 'dataset':
           this.getDatasetRelationship(id)
           break
-        case 'panel':
-          this.getPanelRelationship(id)
+        case 'panel': {
+          let targetId = id
+          if (current.nodeData?.source) {
+            targetId = current.nodeData.source
+          }
+          this.getPanelRelationship(targetId)
           break
+        }
         default:
           break
       }
@@ -485,4 +490,4 @@ export default {
     }
   }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/frontend/src/views/system/relationship/index.vue b/frontend/src/views/system/relationship/index.vue
index 4a5390be5b..d96ac23586 100644
--- a/frontend/src/views/system/relationship/index.vue
+++ b/frontend/src/views/system/relationship/index.vue
@@ -230,7 +230,8 @@ export default {
       return {
         queryType: this.formInline.queryType,
         num: this.formInline.dataSourceName,
-        label: this.nodeData.name
+        label: this.nodeData.name,
+        nodeData: this.nodeData
       }
     },
     queryTypeTitle() {
@@ -305,9 +306,14 @@ export default {
         case 'dataset':
           this.getDatasetRelationship(id)
           break
-        case 'panel':
-          this.getPanelRelationship(id)
+        case 'panel': {
+          let targetId = id
+          if (this.nodeData.source) {
+            targetId = this.nodeData.source
+          }
+          this.getPanelRelationship(targetId)
           break
+        }
         default:
           break
       }
@@ -632,7 +638,7 @@ export default {
   visibility: visible;
 }
 .relation-popover {
-  max-height: 80%;
+  max-height: 70%;
   overflow-y: scroll;
 }
 </style>