From 553c46c583c123e24ae5c579320c07f653f77c15 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 26 Jul 2022 10:35:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E8=B0=83=E6=95=B4=E5=90=AF=E7=94=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8E=BB=E6=8E=89=E6=97=A0=E6=95=88=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/LinkJumpSet/index.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue
index b984715cff..b05ea27d76 100644
--- a/frontend/src/views/panel/LinkJumpSet/index.vue
+++ b/frontend/src/views/panel/LinkJumpSet/index.vue
@@ -13,7 +13,7 @@
           </el-row>
           <el-tree
             ref="linkJumpInfoTree"
-            :data="linkJumpInfoArray"
+            :data="linkJumpInfoXArray"
             node-key="sourceFieldId"
             highlight-current
             :props="treeProp"
@@ -295,6 +295,7 @@ export default {
       },
       linkJump: null,
       linkJumpInfoArray: [],
+      linkJumpInfoXArray: [],
       mapJumpInfoArray: {},
       panelList: [],
       linkJumpInfo: null,
@@ -358,7 +359,9 @@ export default {
   methods: {
     init() {
       const chartDetails = JSON.parse(this.panelViewDetailsInfo[this.viewId])
-      const checkStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt
+      const checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt
+      const checkJumpStr = chartDetails.type.includes('table') ? checkAllAxisStr : chartDetails.xaxis + chartDetails.xaxisExt
+
       // 获取可关联的仪表板
       groupTree({}).then(rsp => {
         this.panelList = rsp.data
@@ -367,10 +370,14 @@ export default {
       queryWithViewId(this.panelInfo.id, this.viewId).then(rsp => {
         this.linkJump = rsp.data
         this.linkJumpInfoArray = []
+        this.linkJumpInfoXArray = []
         this.linkJump.linkJumpInfoArray.forEach(linkJumpInfo => {
-          if (checkStr.indexOf(linkJumpInfo.sourceFieldId) > -1) {
+          if (checkJumpStr.indexOf(linkJumpInfo.sourceFieldId) > -1) {
             this.mapJumpInfoArray[linkJumpInfo.sourceFieldId] = linkJumpInfo
             this.linkJumpInfoArray.push(linkJumpInfo)
+            this.linkJumpInfoXArray.push(linkJumpInfo)
+          } else if (checkAllAxisStr.indexOf(linkJumpInfo.sourceFieldId) > -1) {
+            this.linkJumpInfoArray.push(linkJumpInfo)
           }
         })
         this.linkJumpInfoArray.forEach(linkJumpInfo => {