From 6f15134491d4bfef11e3bc456c94dadab7828574 Mon Sep 17 00:00:00 2001 From: lichunn <269031597@qq.com> Date: Tue, 7 Jan 2025 01:01:57 -0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E9=A2=84=E8=A7=88=E5=A4=9A=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=85=BC=E5=AE=B9=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/plugins/page/src/composable/usePage.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/packages/plugins/page/src/composable/usePage.js b/packages/plugins/page/src/composable/usePage.js index 704e1d8c2e..33547d1066 100644 --- a/packages/plugins/page/src/composable/usePage.js +++ b/packages/plugins/page/src/composable/usePage.js @@ -247,15 +247,28 @@ const getAncestors = async (id, withFolders) => { return ancestors.filter((item) => item.isPage).map((item) => item.id) } +const getPageDetailList = async (pages) => { + if (pages.length > 0 && !pages[0].page_content) { + for (let i = 0; i < pages.length; i++) { + const pageDetail = await http.fetchPageDetail(pages[i].id) + pages[i].page_content = pageDetail.page_content + } + } +} + const getFamily = async (id) => { if (pageSettingState.pages.length === 0) { const appId = getMetaApi(META_SERVICE.GlobalService).getBaseInfo().id await getPageList(appId) } - return getAncestorsRecursively(id) + const familytPages = getAncestorsRecursively(id) .filter((item) => item.isPage) .reverse() + + await getPageDetailList(familytPages) + + return familytPages } export default () => { From 8014889628193d27bb03404e9e178f1dbc23d267 Mon Sep 17 00:00:00 2001 From: lichunn <269031597@qq.com> Date: Tue, 7 Jan 2025 01:02:26 -0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E8=B7=AF=E7=94=B1=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=B9/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/vue-generator/src/plugins/genRouterPlugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue-generator/src/plugins/genRouterPlugin.js b/packages/vue-generator/src/plugins/genRouterPlugin.js index d08b1b90cb..6b3440baae 100644 --- a/packages/vue-generator/src/plugins/genRouterPlugin.js +++ b/packages/vue-generator/src/plugins/genRouterPlugin.js @@ -121,7 +121,7 @@ function genRouterPlugin(options = {}) { const exportSnippet = ` export default createRouter({ history: createWebHashHistory(), - routes + routes: [{path: '/',children: routes}] })` const routeSnippets = `const routes = ${resultStr}` From 51ffb53b478498c58a66245a7f0854eb64b9b631 Mon Sep 17 00:00:00 2001 From: lichunn <269031597@qq.com> Date: Tue, 7 Jan 2025 23:49:34 -0800 Subject: [PATCH 3/4] fix: fix review --- packages/plugins/page/src/composable/usePage.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/plugins/page/src/composable/usePage.js b/packages/plugins/page/src/composable/usePage.js index 33547d1066..ec56ba2c1a 100644 --- a/packages/plugins/page/src/composable/usePage.js +++ b/packages/plugins/page/src/composable/usePage.js @@ -249,9 +249,9 @@ const getAncestors = async (id, withFolders) => { const getPageDetailList = async (pages) => { if (pages.length > 0 && !pages[0].page_content) { - for (let i = 0; i < pages.length; i++) { - const pageDetail = await http.fetchPageDetail(pages[i].id) - pages[i].page_content = pageDetail.page_content + for (let page of pages) { + const pageDetail = await http.fetchPageDetail(page.id) + pages.page_content = pageDetail.page_content } } } From 6aced7f647e13bb9fe0bd340f7d559fe4b72885d Mon Sep 17 00:00:00 2001 From: lichunn <269031597@qq.com> Date: Tue, 7 Jan 2025 23:56:36 -0800 Subject: [PATCH 4/4] fix: fix review --- packages/plugins/page/src/composable/usePage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/plugins/page/src/composable/usePage.js b/packages/plugins/page/src/composable/usePage.js index ec56ba2c1a..de5b701b54 100644 --- a/packages/plugins/page/src/composable/usePage.js +++ b/packages/plugins/page/src/composable/usePage.js @@ -249,9 +249,9 @@ const getAncestors = async (id, withFolders) => { const getPageDetailList = async (pages) => { if (pages.length > 0 && !pages[0].page_content) { - for (let page of pages) { + for (const page of pages) { const pageDetail = await http.fetchPageDetail(page.id) - pages.page_content = pageDetail.page_content + page.page_content = pageDetail.page_content } } }