diff --git a/packages/configurator/src/router-select-configurator/RouterSelectConfigurator.vue b/packages/configurator/src/router-select-configurator/RouterSelectConfigurator.vue index e14964ba9..763516e53 100644 --- a/packages/configurator/src/router-select-configurator/RouterSelectConfigurator.vue +++ b/packages/configurator/src/router-select-configurator/RouterSelectConfigurator.vue @@ -37,9 +37,11 @@ watch( } ) -const { pageSettingState, getPageList, STATIC_PAGE_GROUP_ID } = usePage() +const { pageSettingState, getPageList, STATIC_PAGE_GROUP_ID, COMMON_PAGE_GROUP_ID } = usePage() -const pages = computed(() => pageSettingState.pages[STATIC_PAGE_GROUP_ID].data) +const pages = computed(() => + pageSettingState.pages[STATIC_PAGE_GROUP_ID].data.concat(pageSettingState.pages[COMMON_PAGE_GROUP_ID].data) +) if (!Array.isArray(pages.value)) { getPageList() diff --git a/packages/plugins/page/src/composable/usePage.js b/packages/plugins/page/src/composable/usePage.js index 66926432c..29c475925 100644 --- a/packages/plugins/page/src/composable/usePage.js +++ b/packages/plugins/page/src/composable/usePage.js @@ -256,7 +256,8 @@ const getPageList = async (appId) => { }) const firstGroupTreeData = generateTree(firstGroupData.data) - pageSettingState.treeDataMapping = firstGroupTreeData + const secondGroupTreeData = generateTree(secondGroupData.data) + pageSettingState.treeDataMapping = { ...firstGroupTreeData, ...secondGroupTreeData } firstGroupData.data = firstGroupTreeData[pageSettingState.ROOT_ID].children pageSettingState.pages = [firstGroupData, secondGroupData] return pageSettingState.pages