From 1dd26fc1e95e2804f535f1d7f029ae3da4f6c2d3 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 3 Apr 2025 16:19:02 +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=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E7=9B=B8=E4=BA=92=E8=B7=B3=E8=BD=AC=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8D=E6=AD=A3=E7=A1=AE=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E8=B7=B3=E8=BD=AC=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatis/ExtVisualizationLinkJumpMapper.xml    | 5 +++++
 .../src/views/chart/components/views/index.vue              | 6 +++---
 .../api/visualization/dto/VisualizationLinkJumpInfoDTO.java | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
index f520fbaeba..f33d2bb3d2 100644
--- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
+++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml
@@ -45,6 +45,7 @@
 
     <resultMap id="LinkJumpInfoMap" type="io.dataease.api.visualization.dto.VisualizationLinkJumpInfoDTO"
                extends="LinkJumpInfoBaseResultMap">
+        <result column="target_dv_type" jdbcType="VARCHAR" property="targetDvType"/>
         <result column="source_field_id" jdbcType="BIGINT" property="sourceFieldId"/>
         <result column="source_de_type" jdbcType="INTEGER" property="sourceDeType"/>
         <result column="source_field_name" jdbcType="VARCHAR" property="sourceFieldName"/>
@@ -92,6 +93,7 @@
                 vlji.jump_type,
                 vlji.window_size,
                 vlji.target_dv_id,
+                dvi.type as target_dv_type,
                 vlji.content,
                 <if test="!isDesktop">
                 xpack_share.uuid AS publicJumpId,
@@ -111,6 +113,7 @@
                     AND vlj.id = #{id}
                     LEFT JOIN snapshot_visualization_link_jump_info vlji ON vlj.id = vlji.link_jump_id
                     AND cdtf.id = vlji.source_field_id
+                    LEFT JOIN snapshot_data_visualization_info dvi ON vlji.target_dv_id = dvi.id
                     LEFT JOIN snapshot_visualization_link_jump_target_view_info vljtvi ON vlji.id = vljtvi.link_jump_info_id
                     <if test="!isDesktop">
                     LEFT JOIN xpack_share ON xpack_share.creator = #{uid}
@@ -141,6 +144,7 @@
             vlji.jump_type,
             vlji.window_size,
             vlji.target_dv_id,
+            dvi.type as target_dv_type,
             vlji.content,
             <if test="!isDesktop">
             xpack_share.uuid AS publicJumpId,
@@ -160,6 +164,7 @@
                 AND vlj.id = #{id}
                 LEFT JOIN visualization_link_jump_info vlji ON vlj.id = vlji.link_jump_id
                 AND cdtf.id = vlji.source_field_id
+                LEFT JOIN snapshot_data_visualization_info dvi ON vlji.target_dv_id = dvi.id
                 LEFT JOIN visualization_link_jump_target_view_info vljtvi ON vlji.id = vljtvi.link_jump_info_id
                 <if test="!isDesktop">
                 LEFT JOIN xpack_share ON xpack_share.creator = #{uid}
diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue
index 4ed6b0ad65..c87e86249f 100644
--- a/core/core-frontend/src/views/chart/components/views/index.vue
+++ b/core/core-frontend/src/views/chart/components/views/index.vue
@@ -431,7 +431,7 @@ const windowsJump = (url, jumpType, size = 'middle') => {
 }
 
 const jumpClick = param => {
-  let dimension, jumpInfo, sourceInfo
+  let dimension, jumpInfo, sourceInfo, targetDvType
   // 如果有名称name 获取和name匹配的dimension 否则倒序取最后一个能匹配的
   if (param.name) {
     param.dimensionList.forEach(dimensionItem => {
@@ -501,7 +501,7 @@ const jumpClick = param => {
         if (publicLinkStatus.value) {
           // 判断是否有公共链接ID
           if (jumpInfo.publicJumpId) {
-            let url = `${embeddedBaseUrl}#/de-link/${jumpInfo.publicJumpId}?fromLink=true&dvType=${dvInfo.value.type}`
+            let url = `${embeddedBaseUrl}#/de-link/${jumpInfo.publicJumpId}?fromLink=true&dvType=${jumpInfo.targetDvType}`
             if (attachParamsInfo) {
               url = url + attachParamsInfo + jumpInfoParam
             } else {
@@ -514,7 +514,7 @@ const jumpClick = param => {
             ElMessage.warning(t('visualization.public_link_tips'))
           }
         } else {
-          let url = `${embeddedBaseUrl}#/preview?dvId=${jumpInfo.targetDvId}&fromLink=true&dvType=${dvInfo.value.type}`
+          let url = `${embeddedBaseUrl}#/preview?dvId=${jumpInfo.targetDvId}&fromLink=true&dvType=${jumpInfo.targetDvType}`
           if (attachParamsInfo) {
             url = url + attachParamsInfo + jumpInfoParam
           } else {
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpInfoDTO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpInfoDTO.java
index ddc7334f3c..5968fbd365 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpInfoDTO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/dto/VisualizationLinkJumpInfoDTO.java
@@ -22,6 +22,9 @@ public class VisualizationLinkJumpInfoDTO extends VisualizationLinkJumpInfoVO {
     //存在公共链接的目标仪表板
     private String publicJumpId;
 
+    // 目标类型
+    private String targetDvType;
+
     private List<VisualizationLinkJumpTargetViewInfoVO> targetViewInfoList=new ArrayList<>();// linkType = inner 时使用
 
 }