Skip to content

Commit 9f91aff

Browse files
committed
fix(bugs): 修改当没有pageId时页面的顺位逻辑
1 parent dd21f2c commit 9f91aff

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

packages/plugins/materials/src/composable/useResource.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,14 @@ const initPageOrBlock = async () => {
133133
return
134134
}
135135

136-
// url 没有 pageid 或 blockid,到当前用户自己创建的页面顺位第一页,如果没有则停留在全部公共页面顺位第一页或者页面首页
137-
const pageInfo = appSchemaState.pageTree.find((page) => page?.meta?.isHome) ||
138-
appSchemaState.pageTree.find((page) => {
139-
if (page.componentName === COMPONENT_NAME.Page && globalState.userInfo.id === page.meta.occupier.id) {
140-
return true
141-
}
142-
return page.componentName === COMPONENT_NAME.Page && page?.meta?.group !== 'publicPages'
143-
}) || {
136+
// url 没有 pageid 或 blockid,到当前用户锁定的页面顺位第一位,如果没有则停留在页面首页 或者 全部公共页面顺位第一页
137+
const pageInfo = appSchemaState.pageTree.find(
138+
(page) => page.componentName === COMPONENT_NAME.Page && globalState.userInfo.id === page.meta.occupier.id
139+
) ||
140+
appSchemaState.pageTree.find((page) => page?.meta?.isHome) ||
141+
appSchemaState.pageTree.find(
142+
(page) => page.componentName === COMPONENT_NAME.Page && page?.meta?.group !== 'publicPages'
143+
) || {
144144
page_content: {
145145
componentName: COMPONENT_NAME.Page
146146
}

0 commit comments

Comments
 (0)