Skip to content

fix(web): 修复页面切换时 App 样式作用域失效 #31925 #6042

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

Open
StrivingRabbit wants to merge 1 commit into
base: uni-app-vue3-dev
Choose a base branch
from
+20 −15
Open

fix(web): 修复页面切换时 App 样式作用域失效 #31925 #6042

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 20 additions & 15 deletions packages/uni-h5/src/framework/setup/page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,13 +294,7 @@ export function onPageShow(
instance: ComponentInternalInstance,
pageMeta: UniApp.PageRouteMeta
) {
if (__X__) {
const type = instance.type as { styleIsolation?: string }
if (type.styleIsolation !== 'isolated') {
const scopeId = getScopeId(instance.root)
scopeId && updateCurPageBodyScopeId(scopeId)
}
}
updateCurPageBodyScopeId(instance)
updateBodyScopeId(instance)
updateCurPageCssVar(pageMeta)
updateCurPageAttrs(pageMeta)
Expand All @@ -311,17 +305,28 @@ export function onPageShow(
}

export function onPageReady(instance: ComponentInternalInstance) {
const scopeId = getScopeId(instance)
scopeId && updateCurPageBodyScopeId(scopeId)
if (!updateCurPageBodyScopeId(instance) && __DEV__) {
console.warn('uni-page-body not found')
}
}

function updateCurPageBodyScopeId(scopeId: string) {
const pageBodyEl = document.querySelector('uni-page-body')
if (pageBodyEl) {
pageBodyEl.setAttribute(scopeId, '')
} else if (__DEV__) {
console.warn('uni-page-body not found')
function updateCurPageBodyScopeId(instance: ComponentInternalInstance) {
const pageRoot = getPageInstanceByChild(instance)?.subTree
?.el as Element | null
const pageBodyEl = pageRoot?.querySelector?.('uni-page-body')
if (!pageBodyEl) {
return false
}

const type = instance.type as { styleIsolation?: string }
if (__X__ && type.styleIsolation !== 'isolated') {
const appScopeId = getScopeId(instance.root)
appScopeId && pageBodyEl.setAttribute(appScopeId, '')
}

const pageScopeId = getScopeId(instance)
pageScopeId && pageBodyEl.setAttribute(pageScopeId, '')
return true
}

function getScopeId(instance: ComponentInternalInstance) {
Expand Down
Loading