@mpxjs/core 2.10.4-beta.2 → 2.10.4-beta.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.4-beta.2",
+  "version": "2.10.4-beta.20",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -25,7 +25,7 @@
   },
   "peerDependencies": {
     "@d11/react-native-fast-image": "*",
-    "@mpxjs/api-proxy": "^2.9.0",
+    "@mpxjs/api-proxy": "^2.10.4-beta.0",
     "@mpxjs/store": "^2.9.0",
     "@react-navigation/native": "*",
     "@react-navigation/native-stack": "*",

package/src/platform/builtInMixins/styleHelperMixin.ios.js

@@ -2,12 +2,14 @@ import { isObject, isArray, dash2hump, cached, isEmptyObject } from '@mpxjs/util
 import { Dimensions, StyleSheet } from 'react-native'
 
 let { width, height } = Dimensions.get('screen')
+// TODO 临时适配折叠屏场景适配
+const isLargeFoldableLike = (__mpx_mode__ === 'android') && (height / width < 1.5) && (width > 600)
+if (isLargeFoldableLike) width = width / 2
 
 Dimensions.addEventListener('change', ({ screen }) => {
   width = screen.width
   height = screen.height
 })
-
 function rpx (value) {
   // rn 单位 dp = 1(css)px =  1 物理像素 * pixelRatio(像素比)
   // px = rpx * (750 / 屏幕宽度)

package/src/platform/createApp.ios.js

@@ -4,10 +4,12 @@ import { makeMap, spreadProp, getFocusedNavigation, hasOwn } from '@mpxjs/utils'
 import { mergeLifecycle } from '../convertor/mergeLifecycle'
 import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 import Mpx from '../index'
+import { reactive } from '../observer/reactive'
+import { watch } from '../observer/watch'
 import { createElement, memo, useRef, useEffect } from 'react'
 import * as ReactNative from 'react-native'
 import { initAppProvides } from './export/inject'
-import { NavigationContainer, createStackNavigator, SafeAreaProvider } from './env/navigationHelper'
+import { NavigationContainer, createNativeStackNavigator, SafeAreaProvider } from './env/navigationHelper'
 
 const appHooksMap = makeMap(mergeLifecycle(LIFECYCLE).app)
 
@@ -52,25 +54,25 @@ export default function createApp (options) {
 
   const pages = currentInject.getPages() || {}
   const firstPage = currentInject.firstPage
-  const Stack = createStackNavigator()
+  const Stack = createNativeStackNavigator()
   const getPageScreens = (initialRouteName, initialParams) => {
     return Object.entries(pages).map(([key, item]) => {
-      const options = {
-        // __mpxPageStatusMap 为编译注入的全局变量
-        headerShown: !(Object.assign({}, global.__mpxPageConfig, global.__mpxPageConfigsMap[key]).navigationStyle === 'custom')
-      }
+      // const options = {
+      //   // __mpxPageStatusMap 为编译注入的全局变量
+      //   headerShown: !(Object.assign({}, global.__mpxPageConfig, global.__mpxPageConfigsMap[key]).navigationStyle === 'custom')
+      // }
       if (key === initialRouteName) {
         return createElement(Stack.Screen, {
           name: key,
           component: item,
-          initialParams,
-          options
+          initialParams
+          // options
         })
       }
       return createElement(Stack.Screen, {
         name: key,
-        component: item,
-        options
+        component: item
+        // options
       })
     })
   }
@@ -90,6 +92,57 @@ export default function createApp (options) {
       global.__navigationHelper.lastFailCallback = null
     }
   }
+  const appState = reactive({ state: '' })
+  // TODO hideReason 暂未完全模拟
+  // 0用户退出小程序
+  // 1进入其他小程序
+  // 2打开原生功能页
+  // 3其他
+  watch(() => appState.state, (value) => {
+    if (value === 'show') {
+      let options = appState.showOptions
+      delete appState.showOptions
+      if (!options) {
+        const navigation = getFocusedNavigation()
+        if (navigation) {
+          const state = navigation.getState()
+          const current = state.routes[state.index]
+          options = {
+            path: current.name,
+            query: current.params,
+            scene: 0,
+            shareTicket: '',
+            referrerInfo: {}
+          }
+        }
+      }
+      global.__mpxAppCbs.show.forEach((cb) => {
+        cb(options || {})
+      })
+    } else if (value === 'hide') {
+      global.__mpxAppCbs.hide.forEach((cb) => {
+        cb({
+          reason: appState.hideReason ?? 3
+        })
+        delete appState.hideReason
+      })
+    }
+  }, { sync: true })
+  const onAppStateChange = (currentState) => {
+    const navigation = getFocusedNavigation()
+    if (currentState === 'active') {
+      appState.state = 'show'
+      if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
+        global.__mpxPageStatusMap[navigation.pageId] = 'show'
+      }
+    } else if (currentState === 'inactive' || currentState === 'background') {
+      appState.hideReason = 3
+      appState.state = 'hide'
+      if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
+        global.__mpxPageStatusMap[navigation.pageId] = 'hide'
+      }
+    }
+  }
 
   global.__mpxAppLaunched = false
   global.__mpxOptionsMap[currentInject.moduleId] = memo((props) => {
@@ -127,47 +180,18 @@ export default function createApp (options) {
           global.__mpxLaunchOptions = options
           defaultOptions.onLaunch && defaultOptions.onLaunch.call(appInstance, options)
         }
-        global.__mpxAppCbs.show.forEach((cb) => {
-          cb(options)
-        })
+        appState.showOptions = options
+        appState.state = 'show'
         global.__mpxAppLaunched = true
         global.__mpxAppHotLaunched = true
       }
     }
 
     useEffect(() => {
-      const changeSubscription = ReactNative.AppState.addEventListener('change', (currentState) => {
-        if (currentState === 'active') {
-          let options = global.__mpxEnterOptions
-          const navigation = getFocusedNavigation()
-          if (navigation) {
-            const state = navigation.getState()
-            const current = state.routes[state.index]
-            options = {
-              path: current.name,
-              query: current.params,
-              scene: 0,
-              shareTicket: '',
-              referrerInfo: {}
-            }
-          }
-          global.__mpxAppCbs.show.forEach((cb) => {
-            cb(options)
-          })
-          if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
-            global.__mpxPageStatusMap[navigation.pageId] = 'show'
-          }
-        } else if (currentState === 'inactive' || currentState === 'background') {
-          global.__mpxAppCbs.hide.forEach((cb) => {
-            cb({
-              reason: 3
-            })
-          })
-          const navigation = getFocusedNavigation()
-          if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
-            global.__mpxPageStatusMap[navigation.pageId] = 'hide'
-          }
-        }
+      const changeSubscription = ReactNative.AppState.addEventListener('change', (state) => {
+        // 外层可能会异常设置此配置，因此加载监听函数内部
+        if (Mpx.config.rnConfig.disableAppStateListener) return
+        onAppStateChange(state)
       })
 
       let count = 0
@@ -182,12 +206,8 @@ export default function createApp (options) {
         }
       })
       return () => {
-        // todo 跳到原生页面或者其他rn bundle可以考虑使用reason 1/2进行模拟抹平
-        global.__mpxAppCbs.hide.forEach((cb) => {
-          cb({
-            reason: 0
-          })
-        })
+        appState.hideReason = 0
+        appState.state = 'hide'
         changeSubscription && changeSubscription.remove()
         resizeSubScription && resizeSubScription.remove()
       }
@@ -195,32 +215,10 @@ export default function createApp (options) {
 
     const { initialRouteName, initialParams } = initialRouteRef.current
     const navScreenOpts = {
-      // 7.x替换headerBackTitleVisible
-      // headerBackButtonDisplayMode: 'minimal',
-      headerBackTitleVisible: false,
-      headerShadowVisible: false
-      // 整体切换native-stack时进行修改如下
-      // statusBarTranslucent: true,
-      // statusBarBackgroundColor: 'transparent'
-    }
-    if (__mpx_mode__ === 'ios') {
-      // ios使用native-stack
-      const headerBackImageSource = Mpx.config.rnConfig.headerBackImageSource || null
-      if (headerBackImageSource) {
-        navScreenOpts.headerBackImageSource = headerBackImageSource
-      }
-    } else {
-      // 安卓上会出现导航条闪现的问题所以默认加headerShown false（stack版本， native-stack版本可以干掉）
-      // iOS加上默认headerShown false的话会因为iOS根高度是screenHeight - useHeaderHeight()会导致出现渲染两次情况，因此iOS不加此默认值
-      navScreenOpts.headerShown = false
-      // 安卓和鸿蒙先用stack
-      const headerBackImageProps = Mpx.config.rnConfig.headerBackImageProps || null
-      if (headerBackImageProps) {
-        navScreenOpts.headerBackImage = () => {
-          return createElement(ReactNative.Image, headerBackImageProps)
-        }
-      }
-    }
+      headerShown: false,
+      statusBarTranslucent: true,
+      statusBarBackgroundColor: 'transparent'
+   }
 
     return createElement(SafeAreaProvider,
       null,
@@ -256,4 +254,12 @@ export default function createApp (options) {
       global.__mpxPageStatusMap[navigation.pageId] = status
     }
   }
+
+  // 用于外层业务用来设置App的展示情况
+  global.setAppShow = function () {
+    onAppStateChange('active')
+  }
+  global.setAppHide = function () {
+    onAppStateChange('inactive')
+  }
 }

package/src/platform/env/nav.js

@@ -0,0 +1,130 @@
+import { createElement, useState, useMemo } from 'react'
+import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import * as ReactNative from 'react-native'
+import Mpx from '../../index'
+
+function convertToHex (color) {
+  try {
+    const intColor = ReactNative.processColor(color)
+    if (intColor === null || intColor === undefined) {
+      return null
+    }
+    // 将32位整数颜色值转换为RGBA
+    const r = (intColor >> 16) & 255
+    const g = (intColor >> 8) & 255
+    const b = intColor & 255
+    // 转换为十六进制
+    const hexR = r.toString(16).padStart(2, '0')
+    const hexG = g.toString(16).padStart(2, '0')
+    const hexB = b.toString(16).padStart(2, '0')
+    return `#${hexR}${hexG}${hexB}`
+  } catch (error) {
+    return null
+  }
+}
+
+const titleHeight = 44
+export function useInnerHeaderHeight (pageconfig) {
+  if (pageconfig.navigationStyle === 'custom') {
+    return 0
+  } else {
+    const safeAreaTop = useSafeAreaInsets()?.top || 0
+    const headerHeight = safeAreaTop + titleHeight
+    return headerHeight
+  }
+}
+
+const styles = ReactNative.StyleSheet.create({
+  header: {
+    elevation: 3
+  },
+  headerContent: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  backButton: {
+    position: 'absolute',
+    height: '100%',
+    width: 40,
+    left: 0,
+    top: 0,
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  backButtonImage: {
+    width: 22,
+    height: 22
+  },
+  title: {
+    fontSize: 17,
+    fontWeight: 600,
+    width: '60%',
+    textAlign: 'center'
+  }
+})
+const NavColor = {
+  White: '#ffffff',
+  Black: '#000000'
+}
+// navigationBarTextStyle只支持黑白'white'/'black
+const validBarTextStyle = (textStyle) => {
+  const textStyleColor = convertToHex(textStyle)
+  if (textStyle && [NavColor.White, NavColor.Black].includes(textStyleColor)) {
+    return textStyleColor
+  } else {
+    return NavColor.White
+  }
+}
+export function innerNav ({ props, navigation }) {
+  const { pageConfig } = props
+  const [innerPageConfig, setPageConfig] = useState(pageConfig || {})
+  navigation.setPageConfig = (config) => {
+    const newConfig = Object.assign({}, innerPageConfig, config)
+    setPageConfig(newConfig)
+  }
+  const isCustom = innerPageConfig.navigationStyle === 'custom'
+  const navigationBarTextStyle = useMemo(() => validBarTextStyle(innerPageConfig.navigationBarTextStyle), [innerPageConfig.navigationBarTextStyle])
+  // 状态栏的颜色
+  const statusBarElement = createElement(ReactNative.StatusBar, {
+    translucent: true,
+    backgroundColor: 'transparent',
+    barStyle: (navigationBarTextStyle === NavColor.White) ? 'light-content' : 'dark-content' // 'default'/'light-content'/'dark-content'
+  })
+
+  if (isCustom) return statusBarElement
+  const safeAreaTop = useSafeAreaInsets()?.top || 0
+  // 假设是栈导航，获取栈的长度
+  const stackLength = navigation.getState()?.routes?.length
+  // 用于外部注册打开RN容器之前的栈长度
+  const beforeStackLength = Mpx.config?.rnConfig?.beforeStackLength || 0
+
+  // 回退按钮与图标
+  const backElement = stackLength + beforeStackLength > 1
+  ? createElement(ReactNative.TouchableOpacity, {
+    style: [styles.backButton],
+    onPress: () => { navigation.goBack() }
+  }, createElement(ReactNative.Image, {
+    source: { uri: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAABICAYAAACqT5alAAAA2UlEQVR4nO3bMQrCUBRE0Yla6AYEN2nnBrTL+izcitW3MRDkEUWSvPzJvfCqgMwhZbAppWhNbbIHzB1g9wATERFRVyvpkj1irlpJ5X326D7WHh1hbdFD2CLpLmmftm7kfsEe09aNHFiBrT+wAlt/YAW2/sAKbP2BFdj6Ayuwy+ufz6XPL893krZ//O6iu2n4LT8kndLWTRTo4EC7BDo40C6BDg60S6CDA+0S6OBAuwQ6uNWiD2nrJmoIfU7cNWkR2hbb1UfbY7uuWhGWiIg+a/iHuHmA3QPs3gu4JW9Gan+OJAAAAABJRU5ErkJggg==' },
+    // 回退按钮的颜色与设置的title文案颜色一致
+    style: [styles.backButtonImage, { tintColor: navigationBarTextStyle }]
+  }))
+  : null
+
+  return createElement(ReactNative.View, {
+      style: [styles.header, {
+          paddingTop: safeAreaTop,
+          backgroundColor: innerPageConfig.navigationBarBackgroundColor || '#000000'
+        }]
+      },
+      statusBarElement,
+      createElement(ReactNative.View, {
+        style: styles.headerContent,
+        height: titleHeight
+      }, backElement,
+      createElement(ReactNative.Text, {
+        style: [styles.title, { color: navigationBarTextStyle }],
+        numberOfLines: 1
+      }, innerPageConfig.navigationBarTitleText?.trim() || ''))
+    )
+}

package/src/platform/env/navigationHelper.android.js

@@ -1,4 +1,4 @@
-import { createStackNavigator } from '@react-navigation/stack'
+import { createNativeStackNavigator } from '@react-navigation/native-stack'
 import { NavigationContainer, StackActions } from '@react-navigation/native'
 import PortalHost from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal/portal-host'
 import { useHeaderHeight } from '@react-navigation/elements'
@@ -6,7 +6,7 @@ import { SafeAreaProvider, useSafeAreaInsets } from 'react-native-safe-area-cont
 import { GestureHandlerRootView } from 'react-native-gesture-handler'
 
 export {
-  createStackNavigator,
+  createNativeStackNavigator,
   NavigationContainer,
   useHeaderHeight,
   StackActions,

package/src/platform/env/navigationHelper.ios.js

@@ -1,4 +1,4 @@
-import { createNativeStackNavigator as createStackNavigator } from '@react-navigation/native-stack'
+import { createNativeStackNavigator } from '@react-navigation/native-stack'
 import { NavigationContainer, StackActions } from '@react-navigation/native'
 import PortalHost from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/mpx-portal/portal-host'
 import { useHeaderHeight } from '@react-navigation/elements'
@@ -6,7 +6,7 @@ import { SafeAreaProvider, useSafeAreaInsets } from 'react-native-safe-area-cont
 import { GestureHandlerRootView } from 'react-native-gesture-handler'
 
 export {
-  createStackNavigator,
+  createNativeStackNavigator,
   NavigationContainer,
   useHeaderHeight,
   StackActions,

package/src/platform/patch/getDefaultOptions.ios.js

@@ -1,4 +1,4 @@
-import { useEffect, useLayoutEffect, useSyncExternalStore, useRef, useMemo, createElement, memo, forwardRef, useImperativeHandle, useContext, Fragment, cloneElement, createContext } from 'react'
+import { useEffect, useSyncExternalStore, useRef, useMemo, createElement, memo, forwardRef, useImperativeHandle, useContext, Fragment, cloneElement, createContext } from 'react'
 import * as ReactNative from 'react-native'
 import { ReactiveEffect } from '../../observer/effect'
 import { watch } from '../../observer/watch'
@@ -15,7 +15,8 @@ import {
   KeyboardAvoidContext,
   RouteContext
 } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/context'
-import { PortalHost, useSafeAreaInsets, GestureHandlerRootView, useHeaderHeight } from '../env/navigationHelper'
+import { PortalHost, useSafeAreaInsets, GestureHandlerRootView } from '../env/navigationHelper'
+import { innerNav, useInnerHeaderHeight } from '../env/nav'
 
 const ProviderContext = createContext(null)
 function getSystemInfo () {
@@ -392,7 +393,7 @@ function usePageEffect (mpxProxy, pageId) {
           } else if (/^resize/.test(newVal)) {
             triggerResizeEvent(mpxProxy)
           }
-        })
+        }, { sync: true })
       }
     }
     return () => {
@@ -445,11 +446,30 @@ const checkRelation = (options) => {
     hasAncestorRelation
   }
 }
+function getLayoutData (headerHeight) {
+  const screenDimensions = ReactNative.Dimensions.get('screen')
+  const windowDimensions = ReactNative.Dimensions.get('window')
+  // 在横屏状态下 screen.height = window.height + bottomVirtualHeight
+  // 在正常状态   screen.height =  window.height + bottomVirtualHeight + statusBarHeight
+  const isLandscape = screenDimensions.height < screenDimensions.width
+  const bottomVirtualHeight = isLandscape ? screenDimensions.height - windowDimensions.height : ((screenDimensions.height - windowDimensions.height - ReactNative.StatusBar.currentHeight) || 0)
+  return {
+    x: 0,
+    y: headerHeight,
+    left: 0,
+    top: headerHeight,
+    // 此处必须为windowDimensions.width，在横屏状态下windowDimensions.width才符合预期
+    width: windowDimensions.width,
+    height: screenDimensions.height - headerHeight - bottomVirtualHeight,
+    // ios为0 android为实际statusbar高度
+    statusBarHeight: ReactNative.StatusBar.currentHeight || 0,
+    bottomVirtualHeight: bottomVirtualHeight,
+    isLandscape: isLandscape
+  }
+}
 
-// 临时用来存储安卓底部（iOS没有这个）的高度（虚拟按键等高度）根据第一次进入推算
-let bottomVirtualHeight = null
-export function PageWrapperHOC (WrappedComponent) {
-  return function PageWrapperCom ({ navigation, route, pageConfig = {}, ...props }) {
+export function PageWrapperHOC (WrappedComponent, pageConfig = {}) {
+  return function PageWrapperCom ({ navigation, route, ...props }) {
     const rootRef = useRef(null)
     const keyboardAvoidRef = useRef(null)
     const intersectionObservers = useRef({})
@@ -464,59 +484,15 @@ export function PageWrapperHOC (WrappedComponent) {
       error('Using pageWrapper requires passing navigation and route')
       return null
     }
-    usePageStatus(navigation, currentPageId)
-    useLayoutEffect(() => {
-      navigation.setOptions({
-        title: currentPageConfig.navigationBarTitleText?.trim() || '',
-        headerStyle: {
-          backgroundColor: currentPageConfig.navigationBarBackgroundColor || '#000000'
-        },
-        headerTintColor: currentPageConfig.navigationBarTextStyle || 'white'
-      })
-
-      // TODO 此部分内容在native-stack可删除，用setOptions设置
-      if (__mpx_mode__ !== 'ios') {
-        ReactNative.StatusBar.setBarStyle(currentPageConfig.barStyle || 'dark-content')
-        ReactNative.StatusBar.setTranslucent(true) // 控制statusbar是否占位
-        ReactNative.StatusBar.setBackgroundColor('transparent')
-      }
-    }, [])
-
-    const headerHeight = useHeaderHeight()
+    const headerHeight = useInnerHeaderHeight(currentPageConfig)
+    navigation.layout = getLayoutData(headerHeight)
     const onLayout = () => {
-      const screenDimensions = ReactNative.Dimensions.get('screen')
-      if (__mpx_mode__ === 'ios') {
-        navigation.layout = {
-          x: 0,
-          y: headerHeight,
-          width: screenDimensions.width,
-          height: screenDimensions.height - headerHeight
-        }
-      } else {
-        if (bottomVirtualHeight === null) {
-          rootRef.current?.measureInWindow((x, y, width, height) => {
-            // 沉浸模式的计算方式
-            bottomVirtualHeight = screenDimensions.height - height - headerHeight
-            // 非沉浸模式（translucent=true）计算方式, 现在默认是全用沉浸模式，所以先不算这个
-            // bottomVirtualHeight = windowDimensions.height - height - headerHeight
-            navigation.layout = {
-              x: 0,
-              y: headerHeight,
-              width: screenDimensions.width,
-              height: height
-            }
-          })
-        } else {
-          navigation.layout = {
-            x: 0,
-            y: headerHeight, // 这个y值
-            width: screenDimensions.width,
-            // 后续页面的layout是通过第一次路由进入时候推算出来的底部区域来推算出来的
-            height: screenDimensions.height - bottomVirtualHeight - headerHeight
-          }
-        }
-      }
+      // 当用户处于横屏或者竖屏状态的时候，需要进行layout修正
+      navigation.layout = getLayoutData(headerHeight)
     }
+
+    usePageStatus(navigation, currentPageId)
+
     const withKeyboardAvoidingView = (element) => {
       return createElement(KeyboardAvoidContext.Provider,
         {
@@ -535,26 +511,26 @@ export function PageWrapperHOC (WrappedComponent) {
         )
       )
     }
-
+    // android存在第一次打开insets都返回为0情况，后续会触发第二次渲染后正确
     navigation.insets = useSafeAreaInsets()
-
     return createElement(GestureHandlerRootView,
       {
-        // https://github.com/software-mansion/react-native-reanimated/issues/6639 因存在此问题，iOS在页面上进行定宽来暂时规避
-        style: __mpx_mode__ === 'ios' && currentPageConfig?.navigationStyle !== 'custom'
-          ? {
-            height: ReactNative.Dimensions.get('screen').height - useHeaderHeight()
-          }
-          : {
-            flex: 1
-          }
+        style: {
+          flex: 1
+        }
       },
+      createElement(innerNav, {
+        props: { pageConfig: currentPageConfig },
+        navigation
+      }),
       withKeyboardAvoidingView(
         createElement(ReactNative.View,
           {
             style: {
               flex: 1,
-              backgroundColor: currentPageConfig?.backgroundColor || '#fff'
+              backgroundColor: currentPageConfig?.backgroundColor || '#fff',
+              // 解决页面内有元素定位relative left为负值的时候，回退的时候还能看到对应元素问题
+              overflow: 'hidden'
             },
             ref: rootRef,
             onLayout
@@ -582,7 +558,6 @@ export function PageWrapperHOC (WrappedComponent) {
       ))
   }
 }
-
 export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
   rawOptions = mergeOptions(rawOptions, type, false)
   const components = Object.assign({}, rawOptions.components, currentInject.getComponents())
@@ -656,8 +631,13 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
       return () => {
         proxy.unmounted()
         proxy.target.__resetInstance()
+        // 热更新下会销毁旧页面并创建新页面组件，且旧页面组件销毁时机晚于新页面组件创建，此时__mpxPagesMap中存储的为新页面组件，不应该删除
+        // 所以需要判断路由表中存储的页面实例是否为当前页面实例
         if (type === 'page') {
-          delete global.__mpxPagesMap[props.route.key]
+          const routeKey = props.route.key
+          if (global.__mpxPagesMap[routeKey] && global.__mpxPagesMap[routeKey][0] === instance) {
+            delete global.__mpxPagesMap[routeKey]
+          }
         }
       }
     }, [])
@@ -718,11 +698,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
   }
 
   if (type === 'page') {
-    return (props) =>
-      createElement(PageWrapperHOC(defaultOptions), {
-        pageConfig: currentInject.pageConfig,
-        ...props
-      })
+    return PageWrapperHOC(defaultOptions, currentInject.pageConfig)
   }
   return defaultOptions
 }