From b5dbf8deda2c2cd02a1a12957f836e63bcf37bbd Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 21 Nov 2024 13:41:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AA=E6=9D=A1=E4=BB=B6=E5=88=A0=E9=99=A4=E4=BC=9A=E4=B8=B2?=
 =?UTF-8?q?=E8=A1=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ExtVisualizationLinkJumpMapper.xml        |  2 ++
 .../components/visualization/LinkJumpSet.vue  | 20 +++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
index 8dd6b068a3..b2751b098e 100644
--- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
+++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
@@ -43,6 +43,7 @@
         <result column="publicJumpId" jdbcType="VARCHAR" property="publicJumpId"/>
         <collection property="targetViewInfoList"
                     ofType="io.dataease.api.visualization.vo.VisualizationLinkJumpTargetViewInfoVO">
+            <result column="target_id" jdbcType="BIGINT" property="targetId"/>
             <result column="target_view_id" jdbcType="BIGINT" property="targetViewId"/>
             <result column="target_field_id" jdbcType="BIGINT" property="targetFieldId"/>
             <result column="source_field_active_id" jdbcType="VARCHAR" property="sourceFieldActiveId"/>
@@ -87,6 +88,7 @@
             xpack_share.uuid AS publicJumpId,
             ifnull( visualization_link_jump_info.checked, 0 ) AS checked,
             ifnull( visualization_link_jump_info.attach_params, 0 ) AS attach_params,
+            visualization_link_jump_target_view_info.target_id,
             visualization_link_jump_target_view_info.target_view_id,
             visualization_link_jump_target_view_info.target_field_id,
             visualization_link_jump_target_view_info.target_type,
diff --git a/core/core-frontend/src/components/visualization/LinkJumpSet.vue b/core/core-frontend/src/components/visualization/LinkJumpSet.vue
index bf90baba53..85e262c6ed 100644
--- a/core/core-frontend/src/components/visualization/LinkJumpSet.vue
+++ b/core/core-frontend/src/components/visualization/LinkJumpSet.vue
@@ -324,7 +324,7 @@
                               <el-button
                                 class="m-del-icon-btn"
                                 text
-                                @click="deleteLinkJumpField(index)"
+                                @click="deleteLinkJumpFieldById(targetViewInfo.targetId)"
                               >
                                 <el-icon size="20px">
                                   <Icon name="icon_delete-trash_outlined"
@@ -442,7 +442,7 @@
                                 <el-button
                                   class="m-del-icon-btn"
                                   text
-                                  @click="deleteLinkJumpField(index)"
+                                  @click="deleteLinkJumpFieldById(targetViewInfo.targetId)"
                                 >
                                   <el-icon size="20px">
                                     <Icon name="icon_delete-trash_outlined"
@@ -601,6 +601,7 @@ import { useAppStoreWithOut } from '@/store/modules/app'
 import { XpackComponent } from '@/components/plugin'
 import { useCache } from '@/hooks/web/useCache'
 import { useEmbedded } from '@/store/modules/embedded'
+import { guid } from '@/views/visualized/data/dataset/form/util'
 const dvMainStore = dvMainStoreWithOut()
 const { dvInfo, canvasViewInfo, componentData } = storeToRefs(dvMainStore)
 const linkJumpInfoTree = ref(null)
@@ -909,14 +910,25 @@ const dvNodeClick = data => {
 }
 const addLinkJumpField = (type = 'view') => {
   state.linkJumpInfo.targetViewInfoList.push({
+    targetId: guid(),
     targetViewId: '',
     targetType: type,
     targetFieldId: ''
   })
 }
 
-const deleteLinkJumpFieldById = index => {
-  state.linkJumpInfo.targetViewInfoList.splice(index, 1)
+const deleteLinkJumpFieldById = targetId => {
+  if (targetId) {
+    let indexResult
+    state.linkJumpInfo.targetViewInfoList.forEach((item, index) => {
+      if (targetId === item.targetId) {
+        indexResult = index
+      }
+    })
+    if (indexResult !== undefined) {
+      state.linkJumpInfo.targetViewInfoList.splice(indexResult, 1)
+    }
+  }
 }
 
 const deleteLinkJumpField = index => {