@mpxjs/core 2.10.5 → 2.10.6

package/@types/node.d.ts

@@ -1,5 +1,7 @@
 declare let global: Record<string, any> // in web, we use global varible to do some things, here to declare
 
+declare let mpxGlobal: Record<string, any>
+
 type Dict<T> = {
   [k: string]: T | undefined
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.5",
+  "version": "2.10.6",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.4",
+    "@mpxjs/utils": "^2.10.6",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
@@ -109,5 +109,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "80a4120733a1ee64e394ae58240497ea6721f435"
+  "gitHead": "e28605bc2d8ab33f4dccf13ea98d9ca996f43ed6"
 }

package/src/platform/createApp.ios.js

@@ -273,13 +273,6 @@ export default function createApp (options) {
     return []
   }
 
-  global.setCurrentPageStatus = function (status) {
-    const navigation = getFocusedNavigation()
-    if (navigation && hasOwn(global.__mpxPageStatusMap, navigation.pageId)) {
-      global.__mpxPageStatusMap[navigation.pageId] = status
-    }
-  }
-
   // 用于外层业务用来设置App的展示情况
   global.setAppShow = function () {
     onAppStateChange('active')

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

@@ -3,6 +3,8 @@ import { createI18n } from '../builtInMixins/i18nMixin'
 import * as navigationHelper from './navigationHelper'
 
 export function init (Mpx) {
+  // 为避免多个mpx应用运行时互相覆盖global __mpx对象，导致业务异常，例如插件模式下，插件应用和业务应用互相覆盖global.__mpx，因此创建mpxGlobal局部对象
+  mpxGlobal.__mpx = Mpx
   global.__mpx = Mpx
   global.__mpxAppCbs = global.__mpxAppCbs || {
     show: [],

package/src/platform/env/index.js

@@ -1,6 +1,8 @@
 import { createI18n } from '../builtInMixins/i18nMixin'
 
 export function init (Mpx) {
+  // 为避免多个mpx应用运行时互相覆盖global __mpx对象，导致业务异常，例如插件模式下，插件应用和业务应用互相覆盖global.__mpx，因此创建mpxGlobal局部对象
+  mpxGlobal.__mpx = Mpx
   global.__mpx = Mpx
   if (global.i18n) {
     Mpx.i18n = createI18n(global.i18n)

package/src/platform/env/index.web.js

@@ -4,6 +4,8 @@ import { isBrowser, error, warn } from '@mpxjs/utils'
 import { initEvent } from './event'
 
 export function init (Mpx) {
+  // 为避免多个mpx应用运行时互相覆盖global __mpx对象，导致业务异常，例如插件模式下，插件应用和业务应用互相覆盖global.__mpx，因此创建mpxGlobal局部对象
+  mpxGlobal.__mpx = Mpx
   global.__mpx = Mpx
   global.__mpxAppCbs = global.__mpxAppCbs || {
     show: [],

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

@@ -51,7 +51,7 @@ function createEffect (proxy, components) {
     if (tagName === 'block') return Fragment
     const appComponents = global.__getAppComponents?.() || {}
     const generichash = proxy.target.generichash || ''
-    const genericComponents = global.__mpxGenericsMap[generichash] || noop
+    const genericComponents = global.__mpxGenericsMap?.[generichash] || noop
     return components[tagName] || genericComponents(tagName) || appComponents[tagName] || getByPath(ReactNative, tagName)
   }
   const innerCreateElement = (type, ...rest) => {
@@ -302,15 +302,8 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
   proxy.created()
 
   if (type === 'page') {
-    const loadParams = {}
     const props = propsRef.current
-    // 此处拿到的props.route.params内属性的value被进行过了一次decode, 不符合预期，此处额外进行一次encode来与微信对齐
-    if (isObject(props.route.params)) {
-      for (const key in props.route.params) {
-        loadParams[key] = encodeURIComponent(props.route.params[key])
-      }
-    }
-    proxy.callHook(ONLOAD, [loadParams])
+    proxy.callHook(ONLOAD, [props.route.params || {}])
   }
 
   Object.assign(proxy, {
@@ -467,16 +460,16 @@ export function PageWrapperHOC (WrappedComponent) {
     usePageStatus(navigation, currentPageId)
     useLayoutEffect(() => {
       navigation.setOptions({
-        title: pageConfig.navigationBarTitleText?.trim() || '',
+        title: currentPageConfig.navigationBarTitleText?.trim() || '',
         headerStyle: {
-          backgroundColor: pageConfig.navigationBarBackgroundColor || '#000000'
+          backgroundColor: currentPageConfig.navigationBarBackgroundColor || '#000000'
         },
-        headerTintColor: pageConfig.navigationBarTextStyle || 'white'
+        headerTintColor: currentPageConfig.navigationBarTextStyle || 'white'
       })
 
       // TODO 此部分内容在native-stack可删除，用setOptions设置
       if (__mpx_mode__ !== 'ios') {
-        ReactNative.StatusBar.setBarStyle(pageConfig.barStyle || 'dark-content')
+        ReactNative.StatusBar.setBarStyle(currentPageConfig.barStyle || 'dark-content')
         ReactNative.StatusBar.setTranslucent(true) // 控制statusbar是否占位
         ReactNative.StatusBar.setBackgroundColor('transparent')
       }