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 059883fea9..6b00e16144 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 @@ -35,6 +35,7 @@ import io.dataease.datasource.provider.ExcelUtils; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import io.dataease.extensions.view.dto.ChartViewDTO; +import io.dataease.i18n.Translator; import io.dataease.license.config.XpackInteract; import io.dataease.license.manage.CoreLicManage; import io.dataease.log.DeLog; @@ -509,7 +510,41 @@ public class DataVisualizationServer implements DataVisualizationApi { @Override public List tree(BusiNodeRequest request) { - return coreVisualizationManage.tree(request); + String busiFlag = request.getBusiFlag(); + if(busiFlag.equals("dashboard-dataV")){ + BusiNodeRequest requestDv = new BusiNodeRequest(); + BeanUtils.copyBean(requestDv,request); + requestDv.setBusiFlag("dashboard"); + List dashboardResult = coreVisualizationManage.tree(requestDv); + requestDv.setBusiFlag("dataV"); + List dataVResult = coreVisualizationManage.tree(requestDv); + List result = new ArrayList<>(); + if(!CollectionUtils.isEmpty(dashboardResult)){ + BusiNodeVO dashboardResultParent = new BusiNodeVO(); + dashboardResultParent.setName(Translator.get("i18n_menu.panel")); + dashboardResultParent.setId(-101L); + if(dashboardResult.get(0).getId() == 0){ + dashboardResultParent.setChildren(dashboardResult.get(0).getChildren()); + }else{ + dashboardResultParent.setChildren(dashboardResult); + } + result.add(dashboardResultParent); + } + if(!CollectionUtils.isEmpty(dataVResult)){ + BusiNodeVO dataVResultParent = new BusiNodeVO(); + dataVResultParent.setName(Translator.get("i18n_menu.screen")); + dataVResultParent.setId(-102L); + if(dataVResult.get(0).getId() == 0){ + dataVResultParent.setChildren(dataVResult.get(0).getChildren()); + }else{ + dataVResultParent.setChildren(dataVResult); + } + result.add(dataVResultParent); + } + return result; + }else{ + return coreVisualizationManage.tree(request); + } } @Override diff --git a/core/core-frontend/src/components/visualization/LinkJumpSet.vue b/core/core-frontend/src/components/visualization/LinkJumpSet.vue index 9bf0874a6e..151c61984a 100644 --- a/core/core-frontend/src/components/visualization/LinkJumpSet.vue +++ b/core/core-frontend/src/components/visualization/LinkJumpSet.vue @@ -143,7 +143,13 @@
- + dvInfo.value.type === 'dashboard' ? t('work_branch.dashboard') : t('work_branch.big_data_screen') ) -const selectSourceTips = - dvInfo.type === 'dashboard' - ? t('visualization.select_target_dashboard_tips') - : t('visualization.select_target_screen_tips') +const selectSourceTips = t('visualization.select_target_resource') -const targetSource = - dvInfo.value.type === 'dashboard' - ? t('visualization.target_dashboard') - : t('visualization.target_screen') +const targetSource = t('visualization.target_dashboard_dataV') const curSource = dvInfo.value.type === 'dashboard' @@ -760,7 +760,7 @@ const init = viewItem => { } else { checkJumpStr = checkAllAxisStr } - const request = { busiFlag: dvInfo.value.type } as BusiTreeRequest + const request = { busiFlag: 'dashboard-dataV' } as BusiTreeRequest // 获取可关联的仪表板 queryTreeApi(request).then(rsp => { if (rsp && rsp[0]?.id === '0') { diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 88772e14c3..031d03bf31 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -2717,6 +2717,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr column_name: 'Field name' }, visualization: { + select_target_resource: 'Please select the target resource', + target_dashboard_dataV: 'Target Dashboard\\Screen', effective_during_link: 'Public link active', condition_style_set: 'Condition Style Settings', cell_merge_tips: diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 4310a7508e..e5e32e11b0 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -2651,6 +2651,8 @@ export default { column_name: '欄位名稱' }, visualization: { + select_target_resource: '請選擇目標資源', + target_dashboard_dataV: '目標儀表板\\數據大屏', condition_style_set: '條件樣式設定', cell_merge_tips: '合併單元格後,行列凍結、自動換行將失效。', image: '圖片', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index fdead27394..4e8746ff83 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -2653,6 +2653,8 @@ export default { column_name: '字段名称' }, visualization: { + select_target_resource: '请选择目标资源', + target_dashboard_dataV: '目标仪表板\\数据大屏', effective_during_link: '公共链接生效', condition_style_set: '条件样式设置', cell_merge_tips: '合并单元格后,行列冻结、自动换行会失效。',