diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index 0b14481380..2a044f3c09 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -516,6 +516,14 @@ public class DataVisualizationServer implements DataVisualizationApi { coreVisualizationManage.delete(dvId); } + private void resourceTreeTypeAdaptor(List tree,String type){ + if(!CollectionUtils.isEmpty(tree)){ + tree.forEach(busiNodeVO -> { + busiNodeVO.setType(type); + resourceTreeTypeAdaptor(busiNodeVO.getChildren(),type); + }); + } + } @Override public List tree(BusiNodeRequest request) { @@ -529,6 +537,7 @@ public class DataVisualizationServer implements DataVisualizationApi { List dataVResult = coreVisualizationManage.tree(requestDv); List result = new ArrayList<>(); if (!CollectionUtils.isEmpty(dashboardResult)) { + resourceTreeTypeAdaptor(dashboardResult,"dashboard"); BusiNodeVO dashboardResultParent = new BusiNodeVO(); dashboardResultParent.setName(Translator.get("i18n_menu.panel")); dashboardResultParent.setId(-101L); @@ -540,6 +549,7 @@ public class DataVisualizationServer implements DataVisualizationApi { result.add(dashboardResultParent); } if (!CollectionUtils.isEmpty(dataVResult)) { + resourceTreeTypeAdaptor(dataVResult,"dataV"); BusiNodeVO dataVResultParent = new BusiNodeVO(); dataVResultParent.setName(Translator.get("i18n_menu.screen")); dataVResultParent.setId(-102L); diff --git a/core/core-frontend/src/components/visualization/LinkJumpSet.vue b/core/core-frontend/src/components/visualization/LinkJumpSet.vue index 8c40d83f5e..2b9c3baa9b 100644 --- a/core/core-frontend/src/components/visualization/LinkJumpSet.vue +++ b/core/core-frontend/src/components/visualization/LinkJumpSet.vue @@ -187,8 +187,12 @@ v-if="data.leaf" > + > + + @@ -618,6 +622,7 @@ import dvDashboardSpine from '@/assets/svg/dv-dashboard-spine.svg' import dvFolder from '@/assets/svg/dv-folder.svg' import icon_deleteTrash_outlined from '@/assets/svg/icon_delete-trash_outlined.svg' import icon_info_outlined from '@/assets/svg/icon_info_outlined.svg' +import dvScreenSpine from '@/assets/svg/dv-screen-spine.svg' import { queryVisualizationJumpInfo, queryWithViewId, diff --git a/core/core-frontend/src/components/visualization/component-background/CanvasBackground.vue b/core/core-frontend/src/components/visualization/component-background/CanvasBackground.vue index 3d69493daa..b1107faa94 100644 --- a/core/core-frontend/src/components/visualization/component-background/CanvasBackground.vue +++ b/core/core-frontend/src/components/visualization/component-background/CanvasBackground.vue @@ -21,7 +21,7 @@ v-model="dvInfo.selfWatermarkStatus" @change="onBackgroundChange" > - {{ t('visualization.watermark') }}} + {{ t('visualization.watermark') }}