Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 35 additions & 15 deletions packages/plugins/page/src/composable/usePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -383,33 +383,53 @@ const switchPageWithConfirm = (pageId) => {
})
}

const handlePageDetail = async (pages) => {
const ROOT_ID = '0'

if (pages.length > 0) {
for (let i = 0; i < pages.length; i++) {
if (!pages[i].page_content) {
const pageDetail = await http.fetchPageDetail(pages[i].id)
pages[i].page_content = pageDetail.page_content
}
const updatePageContent = (page, currentPage) => {
if (currentPage.id && currentPage.pageInfo?.schema && page.id === currentPage.id) {
page.page_content = currentPage.pageInfo?.schema
}
}

if (pages[i].parentId !== ROOT_ID && !pages.find((item) => item.id === pages[i].parentId)) {
pages[i].parentId = pages[i - 1]?.id ? pages[i - 1].id : ROOT_ID
}
const fetchPageDetailIfNeeded = async (page) => {
if (!page.page_content) {
try {
const pageDetail = await http.fetchPageDetail(page.id)
page.page_content = pageDetail.page_content
} catch (error) {
page.page_content = {}
}
}
}

const getFamily = async (id) => {
const updateParentId = (page, pages, index, ROOT_ID) => {
if (page.parentId !== ROOT_ID && !pages.find((item) => item.id === page.parentId)) {
page.parentId = pages[index - 1]?.id ? pages[index - 1].id : ROOT_ID
}
}

const handlePageDetail = async (pages, currentPage) => {
Comment thread
lichunn marked this conversation as resolved.
const { ROOT_ID } = pageSettingState

if (pages.length > 0) {
await Promise.all(
pages.map(async (page, index) => {
updatePageContent(page, currentPage)
await fetchPageDetailIfNeeded(page)
updateParentId(page, pages, index, ROOT_ID)
})
)
}
}

const getFamily = async (previewParams) => {
if (pageSettingState.pages.length === 0) {
await getPageList()
}

const familyPages = getAncestorsRecursively(id)
const familyPages = getAncestorsRecursively(previewParams.id)
Comment thread
chilingling marked this conversation as resolved.
.filter((item) => item.isPage)
.reverse()

await handlePageDetail(familyPages)
await handlePageDetail(familyPages, previewParams)

return familyPages
}
Comment thread
lichunn marked this conversation as resolved.
Expand Down
2 changes: 1 addition & 1 deletion packages/toolbars/preview/src/Main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export default {
const theme = getMetaApi(META_SERVICE.ThemeSwitch)?.getThemeState()?.theme
params.id = page?.id
params.pageInfo.name = page?.name
params.ancestors = await getFamily(params.id)
params.ancestors = await getFamily(params)
params.theme = theme
previewPage(params)
}
Expand Down