public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-23 22:08:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 仪表板复用时支持选择存量视图

Browse Source
This commit is contained in:
wangjiahao
2022-05-25 10:53:50 +08:00
parent 1a75c3ed33
commit d8c73873a2
3 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
View File

@@ -329,13 +329,13 @@ public class PanelGroupService {
// result.addAll(viewResult);
// }
result = TreeUtils.mergeTree(result, "panel_list");
// if (AuthUtils.getUser().getIsAdmin()) {
// // 原有视图的目录结构
// List<VAuthModelDTO> viewOriginal = extVAuthModelMapper.queryAuthViewsOriginal(viewRequest);
// if (CollectionUtils.isNotEmpty(viewOriginal) && viewOriginal.size() > 1) {
// result.addAll(TreeUtils.mergeTree(viewOriginal, "public_chart"));
// }
// }
if (AuthUtils.getUser().getIsAdmin()) {
// 原有视图的目录结构
List<VAuthModelDTO> viewOriginal = extVAuthModelMapper.queryAuthViewsOriginal(viewRequest);
if (CollectionUtils.isNotEmpty(viewOriginal) && viewOriginal.size() > 1) {
result.addAll(TreeUtils.mergeTree(viewOriginal, "public_chart"));
}
}
}
return result;