diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkJumpMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkJumpMapper.java index cfb906119a..06f8514aab 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkJumpMapper.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtVisualizationLinkJumpMapper.java @@ -12,9 +12,9 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper public interface ExtVisualizationLinkJumpMapper { - List queryWithDvId(@Param("dvId") Long dvId,@Param("uid") Long uid); + List queryWithDvId(@Param("dvId") Long dvId,@Param("uid") Long uid,@Param("isDesktop") Boolean isDesktop); - VisualizationLinkJumpDTO queryWithViewId(@Param("dvId") Long dvId,@Param("viewId") Long viewId,@Param("uid") Long uid); + VisualizationLinkJumpDTO queryWithViewId(@Param("dvId") Long dvId,@Param("viewId") Long viewId,@Param("uid") Long uid,@Param("isDesktop") Boolean isDesktop); void deleteJumpTargetViewInfo(@Param("dvId") Long dvId,@Param("viewId") Long viewId); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java index c5caa5c3a9..42734e6a2a 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationLinkJumpService.java @@ -15,6 +15,7 @@ import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; import io.dataease.utils.AuthUtils; import io.dataease.utils.BeanUtils; import io.dataease.utils.IDUtils; +import io.dataease.utils.ModelUtils; import io.dataease.visualization.dao.auto.entity.DataVisualizationInfo; import io.dataease.visualization.dao.auto.entity.VisualizationLinkJump; import io.dataease.visualization.dao.auto.entity.VisualizationLinkJumpInfo; @@ -74,7 +75,7 @@ public class VisualizationLinkJumpService implements VisualizationLinkJumpApi { @Override public VisualizationLinkJumpBaseResponse queryVisualizationJumpInfo(Long dvId) { Map resultBase = new HashMap<>(); - List resultLinkJumpList = extVisualizationLinkJumpMapper.queryWithDvId(dvId, AuthUtils.getUser().getUserId()); + List resultLinkJumpList = extVisualizationLinkJumpMapper.queryWithDvId(dvId, AuthUtils.getUser().getUserId(), ModelUtils.isDesktop()); Optional.ofNullable(resultLinkJumpList).orElse(new ArrayList<>()).forEach(resultLinkJump -> { if (resultLinkJump.getChecked()) { Long sourceViewId = resultLinkJump.getSourceViewId(); @@ -99,7 +100,7 @@ public class VisualizationLinkJumpService implements VisualizationLinkJumpApi { @Override public VisualizationLinkJumpDTO queryWithViewId(Long dvId, Long viewId) { - return extVisualizationLinkJumpMapper.queryWithViewId(dvId, viewId, AuthUtils.getUser().getUserId()); + return extVisualizationLinkJumpMapper.queryWithViewId(dvId, viewId, AuthUtils.getUser().getUserId(), ModelUtils.isDesktop()); } @Transactional diff --git a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml index 0413c7dde2..e1be07a325 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtVisualizationLinkJumpMapper.xml @@ -30,7 +30,7 @@ @@ -85,7 +85,9 @@ visualization_link_jump_info.window_size, visualization_link_jump_info.target_dv_id, visualization_link_jump_info.content, + 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, @@ -102,20 +104,29 @@ LEFT JOIN visualization_link_jump_info ON visualization_link_jump.id = visualization_link_jump_info.link_jump_id AND core_dataset_table_field.id = visualization_link_jump_info.source_field_id LEFT JOIN visualization_link_jump_target_view_info ON visualization_link_jump_info.id = visualization_link_jump_target_view_info.link_jump_info_id + LEFT JOIN xpack_share ON xpack_share.creator = #{uid} AND visualization_link_jump_info.target_dv_id = xpack_share.resource_id + left join visualization_outer_params_info on visualization_outer_params_info.params_info_id = visualization_link_jump_target_view_info.target_view_id WHERE core_chart_view.id = #{source_view_id} AND core_chart_view.type != 'VQuery' - ORDER BY - CONVERT ( - core_dataset_table_field.NAME USING gbk) + + ORDER BY + CONVERT ( + core_dataset_table_field.NAME USING gbk) + + + ORDER BY core_dataset_table_field.name; + + SELECT core_chart_view.id AS source_view_id, ${uid} as queryUid, + ${isDesktop} as isDesktop, visualization_link_jump.id, #{dvId} as source_dv_id, visualization_link_jump.link_jump_info, ifnull(visualization_link_jump.checked, 0) AS checked @@ -176,109 +188,58 @@ - DELETE - ljtv - FROM - visualization_link_jump_target_view_info ljtv, - visualization_link_jump_info lji, - visualization_link_jump lj - WHERE - ljtv.link_jump_info_id = lji.id - AND lji.link_jump_id = lj.id - AND lj.source_dv_id = - #{dvId} - AND - lj - . - source_view_id - = - #{viewId} + DELETE FROM visualization_link_jump_target_view_info + WHERE link_jump_info_id IN ( + SELECT lji.id + FROM visualization_link_jump_info lji + JOIN visualization_link_jump lj ON lji.link_jump_id = lj.id + WHERE lj.source_dv_id = #{dvId} + AND lj.source_view_id = #{viewId} + ); - DELETE - lji - FROM - visualization_link_jump_info lji, - visualization_link_jump lj - WHERE - lji.link_jump_id = lj.id - AND lj.source_dv_id = - #{dvId} - AND - lj - . - source_view_id - = - #{viewId} + DELETE FROM visualization_link_jump_info + WHERE link_jump_id IN ( + SELECT lj.id + FROM visualization_link_jump lj + WHERE lj.source_dv_id = #{dvId} + AND lj.source_view_id = #{viewId} + ); - DELETE - lj - FROM - visualization_link_jump lj - WHERE - lj.source_dv_id = - #{dvId} - AND - lj - . - source_view_id - = - #{viewId} + DELETE FROM visualization_link_jump + WHERE source_dv_id = #{dvId} + AND source_view_id = #{viewId} - DELETE - ljtv - FROM - visualization_link_jump_target_view_info ljtv, - visualization_link_jump_info lji, - visualization_link_jump lj - WHERE - ljtv.link_jump_info_id = lji.id - AND lji.link_jump_id = lj.id - AND (lj.source_dv_id = - #{dvId} - or - lji - . - target_dv_id - = - #{dvId} + DELETE FROM visualization_link_jump_target_view_info + WHERE link_jump_info_id IN ( + SELECT lji.id + FROM visualization_link_jump_info lji + JOIN visualization_link_jump lj ON lji.link_jump_id = lj.id + WHERE lj.source_dv_id = #{dvId} + OR lji.target_dv_id = #{dvId} ) - DELETE - lji - FROM - visualization_link_jump_info lji, - visualization_link_jump lj - WHERE - lji.link_jump_id = lj.id - AND (lj.source_dv_id = - #{dvId} - or - lji - . - target_dv_id - = - #{dvId} + DELETE FROM visualization_link_jump_info + WHERE link_jump_id IN ( + SELECT lj.id + FROM visualization_link_jump lj + WHERE lj.source_dv_id = #{dvId} + OR lj.target_dv_id = #{dvId} ) - - DELETE - lj - FROM - visualization_link_jump lj - WHERE - lj.source_dv_id = - #{dvId} - + + DELETE FROM visualization_link_jump + WHERE source_dv_id = #{dvId} + diff --git a/core/core-frontend/src/utils/treeSortUtils.ts b/core/core-frontend/src/utils/treeSortUtils.ts index 9c5264665f..52cc6e948b 100644 --- a/core/core-frontend/src/utils/treeSortUtils.ts +++ b/core/core-frontend/src/utils/treeSortUtils.ts @@ -4,7 +4,6 @@ import _ from 'lodash' export function treeParentWeight(tree: BusiTreeNode[], pWeight) { const pWeightResult = {} weightCheckCircle(tree, pWeightResult, pWeight) - console.log('===test===' + JSON.stringify(pWeightResult)) return pWeightResult }