Merge pull request dataease#4389 from dataease/pr@dev@fix_relation_search_default_panel

wisonic-s · web-flow · commit 39b0e65c9a7e · 2023-01-16T18:13:49.000+08:00
fix(血缘关系): 修复默认仪表板查询结果为空
diff --git 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>
+</script>
diff --git 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>
