fix: cannot select common page

gene9831 · Jan 13, 2025 · 11c1628 · 11c1628
1 parent 1edb7bf
commit 11c1628
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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