fix(x-web): 修复非栈顶页面打开 dialogPage 触发 onShow 生命周期问题 (issues/detail?id=26547)

Author: zhenyuWang

packages/uni-core/src/helpers/dialogPage.ts

@@ -1,6 +1,8 @@
 import type { UniDialogPage } from '@dcloudio/uni-app-x/types/page'
 import { ON_HIDE, ON_SHOW } from '@dcloudio/uni-shared'
 import { invokeHook } from './hook'
+import { getCurrentPage } from '@dcloudio/uni-core'
+import type { ComponentInternalInstance } from 'vue'
 
 export const SYSTEM_DIALOG_PAGE_PATH_STARTER = 'uni:'
 export const SYSTEM_DIALOG_ACTION_SHEET_PAGE_PATH = 'uni:actionSheet'
@@ -116,3 +118,38 @@ export function invokeLastDialogPageHookByUniPage(
     invokeHook(lastDialogPage.vm, hook)
   }
 }
+
+export function invokeNewDialogPageHook(page: UniDialogPage, hook: string) {
+  let shouldInvoke = false
+  const currentPage = getCurrentPage() as unknown as UniPage
+  if (isSystemDialogPage(page)) {
+    const systemDialogPages = getSystemDialogPages(currentPage)
+    shouldInvoke = systemDialogPages.includes(page as UniDialogPage)
+  } else {
+    const dialogPages = currentPage.getDialogPages()
+    shouldInvoke = dialogPages.includes(page as UniDialogPage)
+  }
+  shouldInvoke && invokeHook(page.vm, hook)
+}
+
+export function getPageInstanceByChild(child: ComponentInternalInstance) {
+  let pageInstance: ComponentInternalInstance | null = child
+  while (pageInstance && pageInstance.type?.name !== 'Page') {
+    pageInstance = pageInstance.parent
+  }
+  return pageInstance
+}
+
+export const DIALOG_TAG = 'dialog'
+export const SYSTEM_DIALOG_TAG = 'systemDialog'
+
+export function isDialogPageInstance(vm: ComponentInternalInstance | null) {
+  if (!vm) return false
+  return isNormalDialogPageInstance(vm) || isSystemDialogPageInstance(vm)
+}
+export function isNormalDialogPageInstance(vm: ComponentInternalInstance) {
+  return vm.attrs['data-type'] === DIALOG_TAG
+}
+export function isSystemDialogPageInstance(vm: ComponentInternalInstance) {
+  return vm.attrs['data-type'] === SYSTEM_DIALOG_TAG
+}

packages/uni-h5/src/framework/components/page/index.ts

@@ -32,7 +32,7 @@ import {
   isDialogPageInstance,
   isNormalDialogPageInstance,
   isSystemDialogPageInstance,
-} from '../../../x/framework/helpers/utils'
+} from '@dcloudio/uni-core'
 //#endif
 
 export default /*#__PURE__*/ defineSystemComponent({

packages/uni-h5/src/framework/setup/index.ts

@@ -49,17 +49,16 @@ import {
   onPageShow,
 } from './page'
 import { usePageMeta, usePageRoute } from './provide'
-import {
-  getEnterOptions,
-  getPageInstanceByChild,
-  initLaunchOptions,
-} from './utils'
+import { getEnterOptions, initLaunchOptions } from './utils'
 import type { RouteLocationNormalizedLoaded } from 'vue-router'
 import { useRouter } from 'vue-router'
 import { handleBeforeEntryPageRoutes } from '../../service/api/route/utils'
 import { updateCurPageCssVar } from '../../helpers/cssVar'
 //#if _X_
-import { isDialogPageInstance } from '../../x/framework/helpers/utils'
+import {
+  getPageInstanceByChild,
+  isDialogPageInstance,
+} from '@dcloudio/uni-core'
 import { useBackgroundColorContent } from '../../x/framework/setup/page'
 //#endif
 import { getPageProxyId } from '@dcloudio/uni-core'

packages/uni-h5/src/framework/setup/utils.ts

@@ -28,11 +28,3 @@ export function initLaunchOptions({
   extend(enterOptions, launchOptions)
   return extend({}, launchOptions)
 }
-
-export function getPageInstanceByChild(child: ComponentInternalInstance) {
-  let pageInstance: ComponentInternalInstance | null = child
-  while (pageInstance && pageInstance.type?.name !== 'Page') {
-    pageInstance = pageInstance.parent
-  }
-  return pageInstance
-}

packages/uni-h5/src/x/framework/helpers/utils.ts

@@ -26,7 +26,7 @@ import {
   normalizeRouteKey,
 } from '../../../framework/setup/page'
 import type { RouteLocationNormalizedLoadedGeneric } from 'vue-router'
-import { isDialogPageInstance } from '../helpers/utils'
+import { isDialogPageInstance } from '@dcloudio/uni-core'
 import type { UniSafeAreaInsets } from '@dcloudio/uni-app-x/types/native/UniSafeAreaInsets'
 import { normalizeStyles } from '@dcloudio/uni-shared'
 

packages/uni-h5/src/x/framework/setup/page.ts

@@ -1,4 +1,11 @@
 import { invokeHook } from '@dcloudio/uni-core'
+//#if _X_
+import {
+  getPageInstanceByChild,
+  invokeNewDialogPageHook,
+  isDialogPageInstance,
+} from '@dcloudio/uni-core'
+//#endif
 import {
   LINEFEED,
   ON_LOAD,
@@ -7,8 +14,7 @@ import {
   decodedQuery,
   isUniLifecycleHook,
 } from '@dcloudio/uni-shared'
-import { isArray, isFunction } from '@vue/shared'
-import { hasOwn } from '@vue/shared'
+import { hasOwn, isArray, isFunction } from '@vue/shared'
 
 import type {
   ComponentInternalInstance,
@@ -87,6 +93,10 @@ export function initHooks(
         : (publicThis.$page as Page.PageInstance['$page'])
       if (!(__PLATFORM__ === 'app' && __X__ && $basePage?.meta.isTabBar)) {
         if ($basePage?.openType !== 'preloadPage') {
+          if (__X__ && isDialogPageInstance(getPageInstanceByChild(instance))) {
+            invokeNewDialogPageHook(publicThis.$page as UniDialogPage, ON_SHOW)
+            return
+          }
           invokeHook(publicThis, ON_SHOW)
         }
       }