diff --git a/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index 14e849d996..ec5f89a0d5 100644 --- a/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -167,7 +167,7 @@ public class PanelGroupService { panelGroupRequest.setUserId(userId); panelGroupRequest.setIsAdmin(AuthUtils.getUser().getIsAdmin()); List panelGroupDTOList = extPanelGroupMapper.panelGroupListDefault(panelGroupRequest); - return TreeUtils.mergeTree(panelGroupDTOList, "default_panel"); + return TreeUtils.mergeTree(panelGroupDTOList, "0"); } public List list() { diff --git a/core/frontend/src/views/panel/list/PanelList.vue b/core/frontend/src/views/panel/list/PanelList.vue index 3f4d7c9323..824d891b1c 100644 --- a/core/frontend/src/views/panel/list/PanelList.vue +++ b/core/frontend/src/views/panel/list/PanelList.vue @@ -94,7 +94,7 @@ - + {{ $t('panel.default_panel') }}
{ - localStorage.setItem('panel-default-tree', JSON.stringify(res.data)) + this.rootDefaultAuth = res.data ? res.data[0]?.privileges || '' : '' + const resDefaultData = res.data ? res.data[0]?.children || [] : [] + localStorage.setItem('panel-default-tree', JSON.stringify(resDefaultData)) if (!userCache) { - this.defaultData = res.data || [] + this.defaultData = resDefaultData if (showFirst && this.defaultData && this.defaultData.length > 0) { this.activeDefaultNodeAndClickOnly(this.defaultData[0].id) } @@ -1055,11 +1057,14 @@ export default { this.$refs.default_panel_tree.filter(this.filterText) }) } - if (currentKey) { this.$nextTick(() => { - this.$refs.default_panel_tree.setCurrentKey(currentKey) + const currentKey = this.$refs.default_panel_tree?.getCurrentKey() + if (currentKey) { + this.$nextTick(() =>{ + this.$refs.default_panel_tree.setCurrentKey(currentKey) + }) + } }) - } }) },