@mpxjs/core 2.9.66 → 2.9.69

package/@types/global.d.ts

@@ -4,6 +4,8 @@ declare let __mpx_mode__: 'wx' | 'ali' | 'swan' | 'qq' | 'tt' | 'web' | 'dd' | '
 // declaration for mpx env
 declare let __mpx_env__: string
 
+declare const Mixin: WechatMiniprogram.Behavior.Constructor
+
 // Wildcard module declarations for ?resolve case
 declare module '*?resolve' {
   const resourcePath: string

package/@types/index.d.ts

@@ -137,6 +137,11 @@ interface ComponentOpt<D extends Data, P extends Properties, C, M extends Method
 
   initData?: Record<string, any>
 
+  provide?: Record<string, any> | (() => Record<string, any>)
+  inject?:
+    | { [key: string]: string | Symbol | { from?: string | Symbol; default?: any } }
+    | Array<string>
+
   [index: string]: any
 }
 
@@ -259,13 +264,15 @@ interface MpxConfig {
   ignoreWarning: boolean | string | RegExp | ((msg: string, location: string, e: Error) => boolean)
   ignoreProxyWhiteList: Array<string>
   observeClassInstance: boolean | Array<AnyConstructor>
-  errorHandler: (e: Error, target: ComponentIns<{}, {}, {}, {}, []>, hookName: string) => any | null
+  errorHandler: (msg: String, location: String, e: Error) => any | null
+  warnHandler: (msg: String, location: String, e: Error) => any | null
   proxyEventHandler: (e: WechatMiniprogram.CustomEvent) => any | null
   setDataHandler: (data: object, target: ComponentIns<{}, {}, {}, {}, []>) => any | null
   forceFlushSync: boolean,
   webRouteConfig: object,
   webConfig: object,
-  webviewConfig?: WebviewConfig
+  webviewConfig: WebviewConfig,
+  rnConfig: object,
 }
 
 type SupportedMode = 'wx' | 'ali' | 'qq' | 'swan' | 'tt' | 'web' | 'qa'
@@ -306,6 +313,8 @@ export interface Mpx {
 
   delete: typeof del
 
+  provide: typeof provide
+
   config: MpxConfig
 
   i18n: {
@@ -570,6 +579,13 @@ export function onScopeDispose (fn: () => void): void
 export function set<T extends object> (target: T, key: string | number, value: any): void
 export function del<T extends object> (target: T, key: keyof T): void
 
+// provide & inject
+export declare function provide<T>(key: InjectionKey<T> | string | number, value: T): void;
+export declare function inject<T>(key: InjectionKey<T> | string): T | undefined;
+export declare function inject<T>(key: InjectionKey<T> | string, defaultValue: T, treatDefaultAsFactory?: false): T;
+export declare function inject<T>(key: InjectionKey<T> | string, defaultValue: T | (() => T), treatDefaultAsFactory: true): T;
+export declare interface InjectionKey<T> extends Symbol {}
+
 // nextTick
 export function nextTick (fn: () => any): void
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.9.66",
+  "version": "2.9.69",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,21 +19,23 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.9.65",
+    "@mpxjs/utils": "^2.9.69",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
   "peerDependencies": {
     "@ant-design/react-native": "^5.1.3",
+    "@d11/react-native-fast-image": "^8.6.12",
     "@mpxjs/api-proxy": "^2.9.0",
     "@mpxjs/store": "^2.9.0",
-    "@react-navigation/native": "^6.1.17",
-    "@react-navigation/native-stack": "^6.9.26",
+    "@react-navigation/native": "^7.0.3",
+    "@react-navigation/stack": "^7.0.4",
     "react": "*",
     "react-native": "*",
     "react-native-gesture-handler": "^2.19.0",
     "react-native-linear-gradient": "^2.8.3",
-    "react-native-safe-area-context": "^4.10.1",
+    "react-native-safe-area-context": "^4.14.0",
+    "react-native-screens": "^4.1.0",
     "react-native-webview": "^13.10.5",
     "vue": "^2.7.10",
     "vue-demi": "^0.14.6",
@@ -62,7 +64,7 @@
     "@react-navigation/native": {
       "optional": true
     },
-    "@react-navigation/native-stack": {
+    "@react-navigation/stack": {
       "optional": true
     },
     "@ant-design/react-native": {
@@ -71,6 +73,9 @@
     "react-native-safe-area-context": {
       "optional": true
     },
+    "react-native-screens": {
+      "optional": true
+    },
     "react-native-webview": {
       "optional": true
     },
@@ -79,6 +84,9 @@
     },
     "react-native-linear-gradient": {
       "optional": true
+    },
+    "@d11/react-native-fast-image": {
+      "optional": true
     }
   },
   "publishConfig": {
@@ -97,5 +105,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "ff9eb06a3be28538870823cebf813ed56f39bbd7"
+  "gitHead": "e23c51acc4c2ffdd31fcc6c27aae1aed42d1ade2"
 }

package/src/convertor/wxToReact.js

@@ -5,7 +5,7 @@ import {
 import { implemented } from '../core/implement'
 
 // 暂不支持的wx选项，后期需要各种花式支持
-const unsupported = ['relations', 'moved', 'definitionFilter', 'onShareAppMessage']
+const unsupported = ['relations', 'moved', 'definitionFilter']
 
 function convertErrorDesc (key) {
   error(`Options.${key} is not supported in runtime conversion from wx to react native.`, global.currentResource)

package/src/core/mergeOptions.js

@@ -354,7 +354,7 @@ function transformHOOKS (options) {
     const componentHooksMap = makeMap(convertRule.lifecycle.component)
     for (const key in options) {
       // 使用Component创建page实例，页面专属生命周期&自定义方法需写在methods内部
-      if (typeof options[key] === 'function' && key !== 'dataFn' && key !== 'setup' && !componentHooksMap[key]) {
+      if (typeof options[key] === 'function' && key !== 'dataFn' && key !== 'setup' && key !== 'provide' && !componentHooksMap[key]) {
         if (!options.methods) options.methods = {}
         options.methods[key] = options[key]
         delete options[key]

package/src/core/proxy.js

@@ -8,10 +8,12 @@ import Mpx from '../index'
 import {
   noop,
   type,
+  isArray,
   isFunction,
   isObject,
   isEmptyObject,
   isPlainObject,
+  isWeb,
   doGetByPath,
   getByPath,
   setByPath,
@@ -25,6 +27,7 @@ import {
   processUndefined,
   getFirstKey,
   callWithErrorHandling,
+  wrapMethodsWithErrorHandling,
   warn,
   error,
   getEnvObj
@@ -47,6 +50,7 @@ import {
 } from './innerLifecycle'
 import contextMap from '../dynamic/vnode/context'
 import { getAst } from '../dynamic/astCache'
+import { inject, provide } from '../platform/export/apiInject'
 
 let uid = 0
 
@@ -160,11 +164,15 @@ export default class MpxProxy {
       // web中BEFORECREATE钩子通过vue的beforeCreate钩子单独驱动
       this.callHook(BEFORECREATE)
       setCurrentInstance(this)
+      // 在 props/data 初始化之前初始化 inject
+      this.initInject()
       this.initProps()
       this.initSetup()
       this.initData()
       this.initComputed()
       this.initWatch()
+      // 在 props/data 初始化之后初始化 provide
+      this.initProvide()
       unsetCurrentInstance()
     }
 
@@ -219,6 +227,16 @@ export default class MpxProxy {
       // 页面/组件销毁清除上下文的缓存
       contextMap.remove(this.uid)
     }
+    if (!isWeb && this.options.__type__ === 'page') {
+      // 小程序页面销毁时移除对应的 provide
+      if (isFunction(this.target.getPageId)) {
+        const pageId = this.target.getPageId()
+        const providesMap = global.__mpxProvidesMap
+        if (providesMap.__pages[pageId]) {
+          delete providesMap.__pages[pageId]
+        }
+      }
+    }
     this.callHook(BEFOREUNMOUNT)
     this.scope?.stop()
     if (this.update) this.update.active = false
@@ -277,7 +295,7 @@ export default class MpxProxy {
   initSetup () {
     const setup = this.options.setup
     if (setup) {
-      const setupResult = callWithErrorHandling(setup, this, 'setup function', [
+      let setupResult = callWithErrorHandling(setup, this, 'setup function', [
         this.props,
         {
           triggerEvent: this.target.triggerEvent ? this.target.triggerEvent.bind(this.target) : noop,
@@ -294,6 +312,7 @@ export default class MpxProxy {
         error(`Setup() should return a object, received: ${type(setupResult)}.`, this.options.mpxFileResource)
         return
       }
+      setupResult = wrapMethodsWithErrorHandling(setupResult, this)
       proxy(this.target, setupResult, undefined, false, this.createProxyConflictHandler('setup result'))
       this.collectLocalKeys(setupResult, (key, val) => !isFunction(val))
     }
@@ -350,6 +369,55 @@ export default class MpxProxy {
     }
   }
 
+  initProvide () {
+    const provideOpt = this.options.provide
+    if (provideOpt) {
+      const provided = isFunction(provideOpt)
+        ? callWithErrorHandling(provideOpt.bind(this.target), this, 'provide function')
+        : provideOpt
+      if (!isObject(provided)) {
+        return
+      }
+      Object.keys(provided).forEach(key => {
+        provide(key, provided[key])
+      })
+    }
+  }
+
+  initInject () {
+    const injectOpt = this.options.inject
+    if (injectOpt) {
+      this.resolveInject(injectOpt)
+    }
+  }
+
+  resolveInject (injectOpt) {
+    if (isArray(injectOpt)) {
+      const normalized = {}
+      for (let i = 0; i < injectOpt.length; i++) {
+        normalized[injectOpt[i]] = injectOpt[i]
+      }
+      injectOpt = normalized
+    }
+    const injectObj = {}
+    for (const key in injectOpt) {
+      const opt = injectOpt[key]
+      let injected
+      if (isObject(opt)) {
+        if ('default' in opt) {
+          injected = inject(opt.from || key, opt.default, true)
+        } else {
+          injected = inject(opt.from || key)
+        }
+      } else {
+        injected = inject(opt)
+      }
+      injectObj[key] = injected
+    }
+    proxy(this.target, injectObj, undefined, false, this.createProxyConflictHandler('inject'))
+    this.collectLocalKeys(injectObj)
+  }
+
   watch (source, cb, options) {
     const target = this.target
     const getter = isString(source)

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

@@ -1,19 +1,22 @@
-import { isObject, isArray, dash2hump, isFunction, cached, getFocusedNavigation } from '@mpxjs/utils'
+import { isObject, isArray, dash2hump, cached } from '@mpxjs/utils'
 import { Dimensions, StyleSheet } from 'react-native'
 
+let { width, height } = Dimensions.get('screen')
+
+Dimensions.addEventListener('change', ({ screen }) => {
+  width = screen.width
+  height = screen.height
+})
+
 function rpx (value) {
-  const { width } = Dimensions.get('screen')
   // rn 单位 dp = 1(css)px =  1 物理像素 * pixelRatio(像素比)
   // px = rpx * (750 / 屏幕宽度)
   return value * width / 750
 }
 function vw (value) {
-  const { width } = Dimensions.get('screen')
   return value * width / 100
 }
 function vh (value) {
-  const navigation = getFocusedNavigation()
-  const height = navigation?.layout?.height || Dimensions.get('screen').height
   return value * height / 100
 }
 
@@ -24,14 +27,15 @@ const unit = {
 }
 
 function formatValue (value) {
-  let matched
-  if ((matched = numberRegExp.exec(value))) {
-    value = +matched[1]
-  } else if ((matched = unitRegExp.exec(value))) {
-    value = unit[matched[2]](+matched[1])
-  } else if (hairlineRegExp.test(value)) {
-    value = StyleSheet.hairlineWidth
+  const matched = unitRegExp.exec(value)
+  if (matched) {
+    if (!matched[2] || matched[2] === 'px') {
+      return +matched[1]
+    } else {
+      return unit[matched[2]](+matched[1])
+    }
   }
+  if (hairlineRegExp.test(value)) return StyleSheet.hairlineWidth
   return value
 }
 
@@ -106,8 +110,7 @@ function stringifyDynamicClass (value) {
 
 const listDelimiter = /;(?![^(]*[)])/g
 const propertyDelimiter = /:(.+)/
-const unitRegExp = /^\s*(-?\d+(?:\.\d+)?)(rpx|vw|vh)\s*$/
-const numberRegExp = /^\s*(-?\d+(\.\d+)?)(px)?\s*$/
+const unitRegExp = /^\s*(-?\d+(?:\.\d+)?)(rpx|vw|vh|px)?\s*$/
 const hairlineRegExp = /^\s*hairlineWidth\s*$/
 const varRegExp = /^--/
 
@@ -164,14 +167,8 @@ export default function styleHelperMixin () {
       },
       __getStyle (staticClass, dynamicClass, staticStyle, dynamicStyle, hide) {
         const result = {}
-        const classMap = {}
-        // todo 全局样式在每个页面和组件中生效，以支持全局原子类，后续支持样式模块复用后可考虑移除
-        if (isFunction(global.__getAppClassMap)) {
-          Object.assign(classMap, global.__getAppClassMap())
-        }
-        if (isFunction(this.__getClassMap)) {
-          Object.assign(classMap, this.__getClassMap())
-        }
+        const classMap = this.__getClassMap?.() || {}
+        const appClassMap = global.__getAppClassMap?.() || {}
 
         if (staticClass || dynamicClass) {
           // todo 当前为了复用小程序unocss产物，暂时进行mpEscape，等后续正式支持unocss后可不进行mpEscape
@@ -179,6 +176,9 @@ export default function styleHelperMixin () {
           classString.split(/\s+/).forEach((className) => {
             if (classMap[className]) {
               Object.assign(result, classMap[className])
+            } else if (appClassMap[className]) {
+              // todo 全局样式在每个页面和组件中生效，以支持全局原子类，后续支持样式模块复用后可考虑移除
+              Object.assign(result, appClassMap[className])
             } else if (this.props[className] && isObject(this.props[className])) {
               // externalClasses必定以对象形式传递下来
               Object.assign(result, this.props[className])

package/src/platform/createApp.ios.js

@@ -1,6 +1,6 @@
 import transferOptions from '../core/transferOptions'
 import builtInKeysMap from './patch/builtInKeysMap'
-import { makeMap, spreadProp } from '@mpxjs/utils'
+import { makeMap, spreadProp, parseUrlQuery, getFocusedNavigation } from '@mpxjs/utils'
 import { mergeLifecycle } from '../convertor/mergeLifecycle'
 import * as wxLifecycle from '../platform/patch/wx/lifecycle'
 import Mpx from '../index'
@@ -40,7 +40,7 @@ function createAppInstance (appData) {
 export default function createApp (option, config = {}) {
   const appData = {}
 
-  const { NavigationContainer, createNavigationContainerRef, createNativeStackNavigator, SafeAreaProvider } = global.__navigationHelper
+  const { NavigationContainer, createStackNavigator, SafeAreaProvider } = global.__navigationHelper
   // app选项目前不需要进行转换
   const { rawOptions, currentInject } = transferOptions(option, 'app', false)
   const defaultOptions = filterOptions(spreadProp(rawOptions, 'methods'), appData)
@@ -51,16 +51,25 @@ export default function createApp (option, config = {}) {
   }
   const pages = currentInject.getPages() || {}
   const firstPage = currentInject.firstPage
-  const Stack = createNativeStackNavigator()
-  const navigationRef = createNavigationContainerRef()
-  const pageScreens = Object.entries(pages).map(([key, item]) => {
-    return createElement(Stack.Screen, {
-      name: key,
-      component: item
+  const Stack = createStackNavigator()
+  const getPageScreens = (initialRouteName, initialParams) => {
+    return Object.entries(pages).map(([key, item]) => {
+      if (key === initialRouteName) {
+        return createElement(Stack.Screen, {
+          name: key,
+          component: item,
+          initialParams
+        })
+      }
+      return createElement(Stack.Screen, {
+        name: key,
+        component: item
+      })
     })
-  })
+  }
   global.__mpxOptionsMap = global.__mpxOptionsMap || {}
-  const onStateChange = () => {
+  const onStateChange = (state) => {
+    Mpx.config.rnConfig.onStateChange?.(state)
     if (global.__navigationHelper.lastSuccessCallback) {
       global.__navigationHelper.lastSuccessCallback()
       global.__navigationHelper.lastSuccessCallback = null
@@ -81,26 +90,48 @@ export default function createApp (option, config = {}) {
     error: []
   }
 
+  global.__mpxAppLaunched = false
+
   global.__mpxAppFocusedState = ref('show')
-  global.__mpxOptionsMap[currentInject.moduleId] = memo(() => {
+  global.__mpxOptionsMap[currentInject.moduleId] = memo((props) => {
     const instanceRef = useRef(null)
     if (!instanceRef.current) {
       instanceRef.current = createAppInstance(appData)
     }
     const instance = instanceRef.current
-    useEffect(() => {
-      const current = navigationRef.isReady() ? navigationRef.getCurrentRoute() : {}
-      const options = {
-        path: current.name,
-        query: current.params,
-        scene: 0,
-        shareTicket: '',
-        referrerInfo: {}
+    const initialRouteRef = useRef({
+      initialRouteName: firstPage,
+      initialParams: {}
+    })
+
+    if (!global.__mpxAppLaunched) {
+      const parsed = Mpx.config.rnConfig.parseAppProps?.(props) || {}
+      if (parsed.url) {
+        const { path, queryObj } = parseUrlQuery(parsed.url)
+        Object.assign(initialRouteRef.current, {
+          initialRouteName: path.startsWith('/') ? path.slice(1) : path,
+          initialParams: queryObj
+        })
+      }
+      global.__mpxAppOnLaunch = (navigation) => {
+        global.__mpxAppLaunched = true
+        const state = navigation.getState()
+        Mpx.config.rnConfig.onStateChange?.(state)
+        const current = state.routes[state.index]
+        global.__mpxEnterOptions = {
+          path: current.name,
+          query: current.params,
+          scene: 0,
+          shareTicket: '',
+          referrerInfo: {}
+        }
+        defaultOptions.onLaunch && defaultOptions.onLaunch.call(instance, global.__mpxEnterOptions)
+        defaultOptions.onShow && defaultOptions.onShow.call(instance, global.__mpxEnterOptions)
       }
-      global.__mpxEnterOptions = options
-      defaultOptions.onLaunch && defaultOptions.onLaunch.call(instance, options)
+    }
+
+    useEffect(() => {
       if (defaultOptions.onShow) {
-        defaultOptions.onShow.call(instance, options)
         global.__mpxAppCbs.show.push(defaultOptions.onShow.bind(instance))
       }
       if (defaultOptions.onHide) {
@@ -112,6 +143,19 @@ export default function createApp (option, config = {}) {
 
       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)
           })
@@ -138,26 +182,33 @@ export default function createApp (option, config = {}) {
       }
     }, [])
 
+    const { initialRouteName, initialParams } = initialRouteRef.current
     return createElement(SafeAreaProvider,
       null,
       createElement(NavigationContainer,
         {
-          ref: navigationRef,
           onStateChange,
           onUnhandledAction
         },
         createElement(Stack.Navigator,
           {
-            initialRouteName: firstPage
+            initialRouteName,
+            screenOptions: {
+              gestureEnabled: true,
+              // 7.x替换headerBackTitleVisible
+              // headerBackButtonDisplayMode: 'minimal',
+              headerBackTitleVisible: false,
+              headerMode: 'float'
+            }
           },
-          ...pageScreens
+          ...getPageScreens(initialRouteName, initialParams)
         )
       )
     )
   })
 
   global.getCurrentPages = function () {
-    const navigation = Object.values(global.__mpxPagesMap || {})[0]?.[1]
+    const navigation = getFocusedNavigation()
     if (navigation) {
       return navigation.getState().routes.map((route) => {
         return global.__mpxPagesMap[route.key] && global.__mpxPagesMap[route.key][0]

package/src/platform/createApp.js

@@ -5,6 +5,7 @@ import { makeMap, spreadProp, isBrowser } from '@mpxjs/utils'
 import { mergeLifecycle } from '../convertor/mergeLifecycle'
 import * as webLifecycle from '../platform/patch/web/lifecycle'
 import Mpx from '../index'
+import { initAppProvides } from './export/apiInject'
 
 const webAppHooksMap = makeMap(mergeLifecycle(webLifecycle.LIFECYCLE).app)
 
@@ -14,7 +15,7 @@ function filterOptions (options, appData) {
     if (builtInKeysMap[key]) {
       return
     }
-    if (__mpx_mode__ === 'web' && !webAppHooksMap[key]) {
+    if (__mpx_mode__ === 'web' && !webAppHooksMap[key] && key !== 'provide') {
       appData[key] = options[key]
     } else {
       newOptions[key] = options[key]
@@ -87,6 +88,7 @@ export default function createApp (option, config = {}) {
       return appData
     }
   } else {
+    initAppProvides(rawOptions)
     defaultOptions.onAppInit && defaultOptions.onAppInit()
     const ctor = config.customCtor || global.currentCtor || App
     ctor(defaultOptions)

package/src/platform/export/apiInject.js

@@ -0,0 +1,68 @@
+import { callWithErrorHandling, isFunction, isObject, warn } from '@mpxjs/utils'
+import { currentInstance } from '../../core/proxy'
+
+const providesMap = {
+  /** 全局 scope */
+  __app: Object.create(null),
+  /** 页面 scope */
+  __pages: Object.create(null)
+}
+
+global.__mpxProvidesMap = providesMap
+
+/** @internal createApp() 初始化应用层 scope provide */
+export function initAppProvides (appOptions) {
+  const provideOpt = appOptions.provide
+  if (provideOpt) {
+    const provided = isFunction(provideOpt)
+      ? callWithErrorHandling(provideOpt.bind(appOptions), appOptions, 'createApp provide function')
+      : provideOpt
+    if (isObject(provided)) {
+      providesMap.__app = provided
+    } else {
+      warn('App provides must be an object or a function that returns an object.')
+    }
+  }
+}
+
+function resolvePageId (context) {
+  if (context && isFunction(context.getPageId)) {
+    return context.getPageId()
+  }
+}
+
+function resolvePageProvides (context) {
+  const pageId = resolvePageId(context)
+  return providesMap.__pages[pageId] || (providesMap.__pages[pageId] = Object.create(null))
+}
+
+export function provide (key, value) {
+  const instance = currentInstance
+  if (!instance) {
+    warn('provide() can only be used inside setup().')
+    return
+  }
+  // 小程序无法实现组件父级引用，所以 provide scope 设置为组件所在页面
+  const provides = resolvePageProvides(instance.target)
+  provides[key] = value
+}
+
+export function inject (key, defaultValue, treatDefaultAsFactory = false) {
+  const instance = currentInstance
+  if (!instance) {
+    warn('inject() can only be used inside setup()')
+    return
+  }
+  const provides = resolvePageProvides(instance.target)
+  if (key in provides) {
+    return provides[key]
+  } else if (key in providesMap.__app) {
+    return providesMap.__app[key]
+  } else if (arguments.length > 1) {
+    return treatDefaultAsFactory && isFunction(defaultValue)
+      ? defaultValue.call(instance && instance.target)
+      : defaultValue
+  } else {
+    warn(`injection "${String(key)}" not found.`)
+  }
+}

package/src/platform/export/apiInject.web.js

@@ -0,0 +1 @@
+export { provide, inject } from 'vue'

package/src/platform/export/index.js

@@ -42,3 +42,8 @@ export {
 export {
   useI18n
 } from '../../platform/builtInMixins/i18nMixin'
+
+export {
+  provide,
+  inject
+} from './apiInject'

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

@@ -27,7 +27,9 @@ export {
   // effectScope
   effectScope,
   getCurrentScope,
-  onScopeDispose
+  onScopeDispose,
+  provide,
+  inject
 } from 'vue'
 
 export {

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

@@ -1,7 +1,7 @@
 import MpxProxy from '../../../core/proxy'
 import builtInKeysMap from '../builtInKeysMap'
 import mergeOptions from '../../../core/mergeOptions'
-import { error, diffAndCloneA, hasOwn, noop } from '@mpxjs/utils'
+import { error, diffAndCloneA, hasOwn, noop, wrapMethodsWithErrorHandling } from '@mpxjs/utils'
 
 function transformApiForProxy (context, currentInject) {
   const rawSetData = context.setData.bind(context)
@@ -100,12 +100,25 @@ function filterOptions (options, type) {
       if (!hasOwn(newOptions, 'props')) {
         newOptions.props = Object.assign({}, options.props, options.properties)
       }
-    } else if (key === 'methods' && type === 'page') {
-      Object.assign(newOptions, options[key])
+    } else if (key === 'methods') {
+      const newMethods = wrapMethodsWithErrorHandling(options[key])
+      if (type === 'page') {
+        // 构造器为Page时抽取所有methods方法到顶层
+        Object.assign(newOptions, newMethods)
+      } else {
+        newOptions[key] = newMethods
+      }
+    } else if (key === 'behaviors') {
+      newOptions.mixins = options[key]
     } else {
       newOptions[key] = options[key]
     }
   })
+  if (newOptions.relations) {
+    // ali relations 需要设置 options.relations = true
+    newOptions.options = newOptions.options || {}
+    newOptions.options.relations = true
+  }
   return newOptions
 }
 

package/src/platform/patch/builtInKeysMap.js

@@ -24,6 +24,8 @@ if (__mpx_mode__ === 'web') {
     'initData',
     'watch',
     'computed',
+    'provide',
+    'inject',
     'mpxCustomKeysForBlend',
     'mpxConvertMode',
     'mpxFileResource',

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

@@ -1,15 +1,15 @@
-import { useEffect, useLayoutEffect, useSyncExternalStore, useRef, useMemo, useCallback, createElement, memo, forwardRef, useImperativeHandle, useContext, createContext, Fragment, cloneElement } from 'react'
+import { useEffect, useLayoutEffect, useSyncExternalStore, useRef, useMemo, useCallback, createElement, memo, forwardRef, useImperativeHandle, useContext, Fragment, cloneElement } from 'react'
 import * as ReactNative from 'react-native'
 import { ReactiveEffect } from '../../../observer/effect'
 import { watch } from '../../../observer/watch'
 import { reactive, set, del } from '../../../observer/reactive'
-import { hasOwn, isFunction, noop, isObject, getByPath, collectDataset, hump2dash } from '@mpxjs/utils'
+import { hasOwn, isFunction, noop, isObject, isArray, getByPath, collectDataset, hump2dash, wrapMethodsWithErrorHandling } from '@mpxjs/utils'
 import MpxProxy from '../../../core/proxy'
 import { BEFOREUPDATE, ONLOAD, UPDATED, ONSHOW, ONHIDE, ONRESIZE, REACTHOOKSEXEC } from '../../../core/innerLifecycle'
 import mergeOptions from '../../../core/mergeOptions'
 import { queueJob } from '../../../observer/scheduler'
 import { createSelectorQuery, createIntersectionObserver } from '@mpxjs/api-proxy'
-import { IntersectionObserverContext } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/context'
+import { IntersectionObserverContext, RouteContext } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/context'
 
 function getSystemInfo () {
   const window = ReactNative.Dimensions.get('window')
@@ -105,26 +105,33 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
       this.__refs = {}
       this.__dispatchedSlotSet = new WeakSet()
     },
-    __getSlot (name) {
+    __getSlot (name, slot) {
       const { children } = propsRef.current
       if (children) {
-        const result = []
-        if (Array.isArray(children)) {
+        let result = []
+        if (isArray(children) && !hasOwn(children, '__slot')) {
           children.forEach(child => {
-            if (child?.props?.slot === name) {
+            if (isObject(child) && hasOwn(child, '__slot')) {
+              if (child.__slot === name) result.push(...child)
+            } else if (child?.props?.slot === name) {
               result.push(child)
             }
           })
         } else {
-          if (children?.props?.slot === name) {
+          if (isObject(children) && hasOwn(children, '__slot')) {
+            if (children.__slot === name) result.push(...children)
+          } else if (children?.props?.slot === name) {
             result.push(children)
           }
         }
-        return result.filter(item => {
+        result = result.filter(item => {
           if (!isObject(item) || this.__dispatchedSlotSet.has(item)) return false
           this.__dispatchedSlotSet.add(item)
           return true
         })
+        if (!result.length) return null
+        result.__slot = slot
+        return result
       }
       return null
     },
@@ -134,7 +141,7 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
     _i (val, fn) {
       let i, l, keys, key
       const result = []
-      if (Array.isArray(val) || typeof val === 'string') {
+      if (isArray(val) || typeof val === 'string') {
         for (i = 0, l = val.length; i < l; i++) {
           result.push(fn.call(this, val[i], i))
         }
@@ -266,8 +273,6 @@ function hasPageHook (mpxProxy, hookNames) {
   })
 }
 
-const RouteContext = createContext(null)
-
 const triggerPageStatusHook = (mpxProxy, event) => {
   mpxProxy.callHook(event === 'show' ? ONSHOW : ONHIDE)
   const pageLifetimes = mpxProxy.options.pageLifetimes
@@ -347,6 +352,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
   rawOptions = mergeOptions(rawOptions, type, false)
   const components = Object.assign({}, rawOptions.components, currentInject.getComponents())
   const validProps = Object.assign({}, rawOptions.props, rawOptions.properties)
+  if (rawOptions.methods) rawOptions.methods = wrapMethodsWithErrorHandling(rawOptions.methods)
   const defaultOptions = memo(forwardRef((props, ref) => {
     const instanceRef = useRef(null)
     const propsRef = useRef(null)
@@ -365,7 +371,21 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
 
     const proxy = instance.__mpxProxy
 
-    proxy.callHook(REACTHOOKSEXEC)
+    let hooksResult = proxy.callHook(REACTHOOKSEXEC, [props])
+    if (isObject(hooksResult)) {
+      hooksResult = wrapMethodsWithErrorHandling(hooksResult, proxy)
+      if (isFirst) {
+        const onConflict = proxy.createProxyConflictHandler('react hooks result')
+        Object.keys(hooksResult).forEach((key) => {
+          if (key in proxy.target) {
+            onConflict(key)
+          }
+          proxy.target[key] = hooksResult[key]
+        })
+      } else {
+        Object.assign(proxy.target, hooksResult)
+      }
+    }
 
     useEffect(() => {
       if (!isFirst) {
@@ -391,6 +411,9 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
 
     useEffect(() => {
       if (type === 'page') {
+        if (!global.__mpxAppLaunched && global.__mpxAppOnLaunch) {
+          global.__mpxAppOnLaunch(props.navigation)
+        }
         proxy.callHook(ONLOAD, [props.route.params || {}])
       }
       proxy.mounted()
@@ -429,29 +452,20 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
 
       useLayoutEffect(() => {
         const isCustom = pageConfig.navigationStyle === 'custom'
-        let opt = {}
-        if (__mpx_mode__ === 'android') {
-          opt = {
-            statusBarTranslucent: isCustom,
-            statusBarStyle: pageConfig.statusBarStyle, // 枚举值 'auto' | 'dark' | 'light' 控制statusbar字体颜色
-            statusBarColor: isCustom ? 'transparent' : pageConfig.statusBarColor // 控制statusbar背景颜色
-          }
-        } else if (__mpx_mode__ === 'ios') {
-          opt = {
-            headerBackTitleVisible: false
-          }
-        }
         navigation.setOptions({
           headerShown: !isCustom,
-          headerShadowVisible: false,
-          headerTitle: pageConfig.navigationBarTitleText || '',
+          title: pageConfig.navigationBarTitleText || '',
           headerStyle: {
             backgroundColor: pageConfig.navigationBarBackgroundColor || '#000000'
           },
-          headerTitleAlign: 'center',
-          headerTintColor: pageConfig.navigationBarTextStyle || 'white',
-          ...opt
+          headerTintColor: pageConfig.navigationBarTextStyle || 'white'
         })
+        if (__mpx_mode__ === 'android') {
+          ReactNative.StatusBar.setBarStyle(pageConfig.barStyle || 'dark-content')
+          ReactNative.StatusBar.setTranslucent(isCustom) // 控制statusbar是否占位
+          const color = isCustom ? 'transparent' : pageConfig.statusBarColor
+          color && ReactNative.StatusBar.setBackgroundColor(color)
+        }
       }, [])
 
       const rootRef = useRef(null)
@@ -484,9 +498,9 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
                 value: currentPageId
               },
               createElement(IntersectionObserverContext.Provider,
-              {
-                value: intersectionObservers.current
-              },
+                {
+                  value: intersectionObservers.current
+                },
                 createElement(defaultOptions,
                   {
                     navigation,

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

@@ -1,6 +1,6 @@
 import builtInKeysMap from '../builtInKeysMap'
 import mergeOptions from '../../../core/mergeOptions'
-import { diffAndCloneA, hasOwn } from '@mpxjs/utils'
+import { diffAndCloneA, hasOwn, wrapMethodsWithErrorHandling } from '@mpxjs/utils'
 import { getCurrentInstance as getCurrentVueInstance } from '../../export/index'
 import MpxProxy, { setCurrentInstance, unsetCurrentInstance } from '../../../core/proxy'
 import {
@@ -27,6 +27,8 @@ function filterOptions (options) {
           )
         }
       }
+    } else if (key === 'methods') {
+      newOptions[key] = wrapMethodsWithErrorHandling(options[key])
     } else {
       newOptions[key] = options[key]
     }
@@ -62,7 +64,7 @@ export function getDefaultOptions ({ type, rawOptions = {} }) {
       }
       const setupRes = rawSetup(props, newContext)
       unsetCurrentInstance(instance.__mpxProxy)
-      return setupRes
+      return wrapMethodsWithErrorHandling(setupRes, instance.__mpxProxy)
     }
   }
   const rootMixins = [{

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

@@ -1,4 +1,4 @@
-import { hasOwn, noop, isFunction } from '@mpxjs/utils'
+import { hasOwn, noop, isFunction, wrapMethodsWithErrorHandling } from '@mpxjs/utils'
 import MpxProxy from '../../../core/proxy'
 import builtInKeysMap from '../builtInKeysMap'
 import mergeOptions from '../../../core/mergeOptions'
@@ -140,9 +140,14 @@ export function filterOptions (options) {
       if (!hasOwn(newOptions, 'properties')) {
         newOptions.properties = transformProperties(Object.assign({}, options.props, options.properties))
       }
-    } else if (key === 'methods' && options.__pageCtor__) {
-      // 构造器为Page时抽取所有methods方法到顶层
-      Object.assign(newOptions, options[key])
+    } else if (key === 'methods') {
+      const newMethods = wrapMethodsWithErrorHandling(options[key])
+      if (options.__pageCtor__) {
+        // 构造器为Page时抽取所有methods方法到顶层
+        Object.assign(newOptions, newMethods)
+      } else {
+        newOptions[key] = newMethods
+      }
     } else {
       newOptions[key] = options[key]
     }

package/src/runtime/createFactory.js

@@ -6,6 +6,9 @@ const factoryMap = {
 
 module.exports = (type) => (...args) => {
   if (type === 'Behavior') {
+    if (__mpx_mode__ === 'ali') {
+      return Mixin.apply(null, args)
+    }
     if (args[0]) {
       Object.defineProperty(args[0], '__mpx_behaviors_to_mixins__', {
         configurable: true,

package/src/platform/builtInMixins/directiveHelperMixin.android.js

@@ -1,2 +0,0 @@
-import directiveHelperMixin from './directiveHelperMixin.ios'
-export default directiveHelperMixin

package/src/platform/builtInMixins/proxyEventMixin.android.js

@@ -1,2 +0,0 @@
-import proxyEventMixin from './proxyEventMixin.ios'
-export default proxyEventMixin

package/src/platform/builtInMixins/refsMixin.android.js

@@ -1,2 +0,0 @@
-import refsMixin from './refsMixin.ios'
-export default refsMixin

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

@@ -1,2 +0,0 @@
-import styleHelperMixin from './styleHelperMixin.ios'
-export default styleHelperMixin

package/src/platform/createApp.android.js

@@ -1,2 +0,0 @@
-import createApp from './createApp.ios'
-export default createApp

package/src/platform/patch/react/getDefaultOptions.android.js

@@ -1 +0,0 @@
-export { getDefaultOptions } from './getDefaultOptions.ios'