Skip to content

fix: init app without pageId cannot save page #1440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hexqi merged 2 commits into from
May 29, 2025
Merged

fix: init app without pageId cannot save page #1440

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df82c13
fix: init app without pageId cannot save page
chilingling May 28, 2025
6ec4c83
chore: add necessary comment
chilingling May 28, 2025
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
41 changes: 18 additions & 23 deletions packages/plugins/materials/src/composable/useResource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,30 +79,21 @@ interface PageInfo {

const initPage = (pageInfo: PageInfo) => {
try {
if (pageInfo.meta) {
const { occupier } = pageInfo.meta

useLayout().layoutState.pageStatus = getCanvasStatus(occupier)
goPage(pageInfo.meta?.id)
if (pageInfo?.occupier) {
useLayout().layoutState.pageStatus = getCanvasStatus(pageInfo.occupier)
goPage(pageInfo.id)
Comment thread
hexqi marked this conversation as resolved.
} else {
useLayout().layoutState.pageStatus = {
state: 'empty',
data: {}
}
}

pageInfo.id = pageInfo.meta?.id
} catch (error) {
console.log(error) // eslint-disable-line
}

const { id, meta, ...pageSchema } = pageInfo
// 画布传递 schema ，多余的数据不能传递
useCanvas().initData(pageSchema, {
id,
name: pageInfo?.fileName
})
useBreadcrumb().setBreadcrumbPage([pageInfo.fileName])
useCanvas().initData(pageInfo?.page_content || {}, pageInfo)
useBreadcrumb().setBreadcrumbPage([pageInfo?.name || ''])
}

/**
Expand All @@ -125,16 +116,11 @@ const initBlock = async (blockId: string) => {

const initPageOrBlock = async () => {
const { pageId, blockId } = getMetaApi(META_SERVICE.GlobalService).getBaseInfo()
const { setBreadcrumbPage } = useBreadcrumb()
const pagePluginApi = getMetaApi(META_APP.AppManage)

if (pageId) {
const pagePluginApi = getMetaApi(META_APP.AppManage)

const data = await pagePluginApi.getPageById(pageId)

useLayout().layoutState.pageStatus = getCanvasStatus(data.occupier)
useCanvas().initData(data.page_content, data)
setBreadcrumbPage([data.name])
initPage(data)
return
}

Expand All @@ -149,9 +135,18 @@ const initPageOrBlock = async () => {
appSchemaState.pageTree.find(
(page) => page.componentName === COMPONENT_NAME.Page && page?.meta?.group !== 'publicPages'
) || {
componentName: COMPONENT_NAME.Page
page_content: {
componentName: COMPONENT_NAME.Page
}
}
initPage(toRaw(pageInfo))

if (pageInfo.meta?.id) {
// 这里重新请求一遍页面详情数据，是因为 appSchemaState 的页面信息存在字段转换，比如 route 被转换成了 router 字段，导致调用页面保存接口的时候报错
const data = await pagePluginApi.getPageById(pageInfo.meta.id)
initPage(data)
} else {
initPage(toRaw(pageInfo))
}
}

const handlePopStateEvent = async () => {
Expand Down