Skip to content

fix: 修复pages.config.ts中tabbar属性无法正确合并到pages.json中的问题 #251

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
merged 2 commits into from
Oct 9, 2025
Merged

fix: 修复pages.config.ts中tabbar属性无法正确合并到pages.json中的问题 #251

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d569ed
fix: 修复pages.config.ts中tabbar属性无法正确合并到pages.json中的问题
Oct 2, 2025
9dfd5ad
perf: 优化合并 pagesJson 的逻辑
edwinhuish Oct 9, 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
30 changes: 14 additions & 16 deletions packages/core/src/context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,21 +442,19 @@ export class PageContext {
private async genratePagesJSON() {
const content = await fs.promises.readFile(this.resolvedPagesJSONPath, { encoding: 'utf-8' }).catch(() => '')

let pageJson = cjParse(content || '{}') as CommentObject
const { pages: oldPages, subPackages: oldSubPackages, tabBar: oldTabBar } = cjParse(content || '{}') as CommentObject

const { pages: _, subPackages: __, tabBar: ___, ...others } = this.pagesGlobConfig || {}

pageJson = Object.assign(pageJson, {
...others,
})
const pageJson = { ...others }

const currentPlatform = platform.toUpperCase()

// pages
pageJson.pages = mergePlatformItems(pageJson?.pages as any, currentPlatform, this.pageMetaData, 'path')
pageJson.pages = mergePlatformItems(oldPages as any, currentPlatform, this.pageMetaData, 'path')

// subPackages
pageJson.subPackages = pageJson?.subPackages || new CommentArray<CommentObject>()
pageJson.subPackages = oldSubPackages || new CommentArray<CommentObject>()
const newSubPackages = new Map<string, SubPageMetaDatum>()
for (const item of this.subPageMetaData) {
newSubPackages.set(item.root, item)
Expand All @@ -476,18 +474,18 @@ export class PageContext {
}

// tabbar
const tabBar = await this.getTabBarMerged()
if (tabBar) {
const list = mergePlatformItems((pageJson?.tabBar as any)?.list as any, currentPlatform, tabBar.list!, 'pagePath')

if ((pageJson?.tabBar as any)?.list) {
(pageJson!.tabBar as any)!.list = list
}
else {
(pageJson as any).tabBar = (pageJson as any).tabBar || {};
(pageJson as any).tabBar.list = list
const { list, ...tabBarOthers } = (await this.getTabBarMerged()) || {}
if (list) {
const { list: oldList } = (oldTabBar as any) || {}
const newList = mergePlatformItems(oldList, currentPlatform, list, 'pagePath')
pageJson.tabBar = {
...tabBarOthers, // 每次都直接更新除 list 外的其他属性
list: newList,
}
}
else {
pageJson.tabBar = undefined // 直接清空，暂不支持 A 平台有 tabBar， B 平台无 tabBar 的情况。
}

return pageJson
}
Expand Down