@mpxjs/core 2.10.1-beta.7 → 2.10.2

package/@types/index.d.ts

@@ -119,7 +119,8 @@ interface Context {
   selectComponent: ReplaceWxComponentIns['selectComponent']
   selectAllComponents: ReplaceWxComponentIns['selectAllComponents']
   createSelectorQuery: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['createSelectorQuery']
-  createIntersectionObserver: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['createIntersectionObserver']
+  createIntersectionObserver: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['createIntersectionObserver'],
+  getPageId: WechatMiniprogram.Component.InstanceMethods<Record<string, any>>['getPageId']
 }
 
 interface ComponentOpt<D extends Data, P extends Properties, C, M extends Methods, Mi extends Array<any>, S extends Record<any, any>> extends Partial<WechatMiniprogram.Component.Lifetimes & WechatMiniprogram.Component.OtherOption> {

package/LICENSE

@@ -0,0 +1,433 @@
+                              Apache License
+
+                        Version 2.0, January 2004
+
+                     http://www.apache.org/licenses/
+
+
+
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+
+
+
+1. Definitions.
+
+
+
+
+   "License" shall mean the terms and conditions for use, reproduction,
+
+   and distribution as defined by Sections 1 through 9 of this document.
+
+
+
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+
+   the copyright owner that is granting the License.
+
+
+
+
+   "Legal Entity" shall mean the union of the acting entity and all
+
+   other entities that control, are controlled by, or are under common
+
+   control with that entity. For the purposes of this definition,
+
+   "control" means (i) the power, direct or indirect, to cause the
+
+   direction or management of such entity, whether by contract or
+
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+
+
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+
+   exercising permissions granted by this License.
+
+
+
+
+   "Source" form shall mean the preferred form for making modifications,
+
+   including but not limited to software source code, documentation
+
+   source, and configuration files.
+
+
+
+
+   "Object" form shall mean any form resulting from mechanical
+
+   transformation or translation of a Source form, including but
+
+   not limited to compiled object code, generated documentation,
+
+   and conversions to other media types.
+
+
+
+
+   "Work" shall mean the work of authorship, whether in Source or
+
+   Object form, made available under the License, as indicated by a
+
+   copyright notice that is included in or attached to the work
+
+   (an example is provided in the Appendix below).
+
+
+
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+
+   form, that is based on (or derived from) the Work and for which the
+
+   editorial revisions, annotations, elaborations, or other modifications
+
+   represent, as a whole, an original work of authorship. For the purposes
+
+   of this License, Derivative Works shall not include works that remain
+
+   separable from, or merely link (or bind by name) to the interfaces of,
+
+   the Work and Derivative Works thereof.
+
+
+
+
+   "Contribution" shall mean any work of authorship, including
+
+   the original version of the Work and any modifications or additions
+
+   to that Work or Derivative Works thereof, that is intentionally
+
+   submitted to Licensor for inclusion in the Work by the copyright owner
+
+   or by an individual or Legal Entity authorized to submit on behalf of
+
+   the copyright owner. For the purposes of this definition, "submitted"
+
+   means any form of electronic, verbal, or written communication sent
+
+   to the Licensor or its representatives, including but not limited to
+
+   communication on electronic mailing lists, source code control systems,
+
+   and issue tracking systems that are managed by, or on behalf of, the
+
+   Licensor for the purpose of discussing and improving the Work, but
+
+   excluding communication that is conspicuously marked or otherwise
+
+   designated in writing by the copyright owner as "Not a Contribution."
+
+
+
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+
+   on behalf of whom a Contribution has been received by Licensor and
+
+   subsequently incorporated within the Work.
+
+
+
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+
+   this License, each Contributor hereby grants to You a perpetual,
+
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+
+   copyright license to reproduce, prepare Derivative Works of,
+
+   publicly display, publicly perform, sublicense, and distribute the
+
+   Work and such Derivative Works in Source or Object form.
+
+
+
+
+3. Grant of Patent License. Subject to the terms and conditions of
+
+   this License, each Contributor hereby grants to You a perpetual,
+
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+
+   (except as stated in this section) patent license to make, have made,
+
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+
+   where such license applies only to those patent claims licensable
+
+   by such Contributor that are necessarily infringed by their
+
+   Contribution(s) alone or by combination of their Contribution(s)
+
+   with the Work to which such Contribution(s) was submitted. If You
+
+   institute patent litigation against any entity (including a
+
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+
+   or a Contribution incorporated within the Work constitutes direct
+
+   or contributory patent infringement, then any patent licenses
+
+   granted to You under this License for that Work shall terminate
+
+   as of the date such litigation is filed.
+
+
+
+
+4. Redistribution. You may reproduce and distribute copies of the
+
+   Work or Derivative Works thereof in any medium, with or without
+
+   modifications, and in Source or Object form, provided that You
+
+   meet the following conditions:
+
+
+
+
+   (a) You must give any other recipients of the Work or
+
+       Derivative Works a copy of this License; and
+
+
+
+
+   (b) You must cause any modified files to carry prominent notices
+
+       stating that You changed the files; and
+
+
+
+
+   (c) You must retain, in the Source form of any Derivative Works
+
+       that You distribute, all copyright, patent, trademark, and
+
+       attribution notices from the Source form of the Work,
+
+       excluding those notices that do not pertain to any part of
+
+       the Derivative Works; and
+
+
+
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+
+       distribution, then any Derivative Works that You distribute must
+
+       include a readable copy of the attribution notices contained
+
+       within such NOTICE file, excluding those notices that do not
+
+       pertain to any part of the Derivative Works, in at least one
+
+       of the following places: within a NOTICE text file distributed
+
+       as part of the Derivative Works; within the Source form or
+
+       documentation, if provided along with the Derivative Works; or,
+
+       within a display generated by the Derivative Works, if and
+
+       wherever such third-party notices normally appear. The contents
+
+       of the NOTICE file are for informational purposes only and
+
+       do not modify the License. You may add Your own attribution
+
+       notices within Derivative Works that You distribute, alongside
+
+       or as an addendum to the NOTICE text from the Work, provided
+
+       that such additional attribution notices cannot be construed
+
+       as modifying the License.
+
+
+
+
+   You may add Your own copyright statement to Your modifications and
+
+   may provide additional or different license terms and conditions
+
+   for use, reproduction, or distribution of Your modifications, or
+
+   for any such Derivative Works as a whole, provided Your use,
+
+   reproduction, and distribution of the Work otherwise complies with
+
+   the conditions stated in this License.
+
+
+
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+
+   any Contribution intentionally submitted for inclusion in the Work
+
+   by You to the Licensor shall be under the terms and conditions of
+
+   this License, without any additional terms or conditions.
+
+   Notwithstanding the above, nothing herein shall supersede or modify
+
+   the terms of any separate license agreement you may have executed
+
+   with Licensor regarding such Contributions.
+
+
+
+
+6. Trademarks. This License does not grant permission to use the trade
+
+   names, trademarks, service marks, or product names of the Licensor,
+
+   except as required for reasonable and customary use in describing the
+
+   origin of the Work and reproducing the content of the NOTICE file.
+
+
+
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+
+   agreed to in writing, Licensor provides the Work (and each
+
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+
+   implied, including, without limitation, any warranties or conditions
+
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+
+   appropriateness of using or redistributing the Work and assume any
+
+   risks associated with Your exercise of permissions under this License.
+
+
+
+
+8. Limitation of Liability. In no event and under no legal theory,
+
+   whether in tort (including negligence), contract, or otherwise,
+
+   unless required by applicable law (such as deliberate and grossly
+
+   negligent acts) or agreed to in writing, shall any Contributor be
+
+   liable to You for damages, including any direct, indirect, special,
+
+   incidental, or consequential damages of any character arising as a
+
+   result of this License or out of the use or inability to use the
+
+   Work (including but not limited to damages for loss of goodwill,
+
+   work stoppage, computer failure or malfunction, or any and all
+
+   other commercial damages or losses), even if such Contributor
+
+   has been advised of the possibility of such damages.
+
+
+
+
+9. Accepting Warranty or Additional Liability. While redistributing
+
+   the Work or Derivative Works thereof, You may choose to offer,
+
+   and charge a fee for, acceptance of support, warranty, indemnity,
+
+   or other liability obligations and/or rights consistent with this
+
+   License. However, in accepting such obligations, You may act only
+
+   on Your own behalf and on Your sole responsibility, not on behalf
+
+   of any other Contributor, and only if You agree to indemnify,
+
+   defend, and hold each Contributor harmless for any liability
+
+   incurred by, or claims asserted against, such Contributor by reason
+
+   of your accepting any such warranty or additional liability.
+
+
+
+
+END OF TERMS AND CONDITIONS
+
+
+
+
+APPENDIX: How to apply the Apache License to your work.
+
+
+
+
+   To apply the Apache License to your work, attach the following
+
+   boilerplate notice, with the fields enclosed by brackets "{}"
+
+   replaced with your own identifying information. (Don't include
+
+   the brackets!)  The text should be enclosed in the appropriate
+
+   comment syntax for the file format. We also recommend that a
+
+   file or class name and description of purpose be included on the
+
+   same "printed page" as the copyright notice for easier
+
+   identification within third-party archives.
+
+
+
+
+Copyright (C) 2017 Beijing Didi Infinity Technology and Development Co.,Ltd. All rights reserved.
+
+
+
+
+Licensed under the Apache License, Version 2.0 (the "License");
+
+you may not use this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+
+
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+
+
+
+Unless required by applicable law or agreed to in writing, software
+
+distributed under the License is distributed on an "AS IS" BASIS,
+
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+See the License for the specific language governing permissions and
+
+limitations under the License.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.1-beta.7",
+  "version": "2.10.2",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.0",
+    "@mpxjs/utils": "^2.10.2",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },
@@ -109,5 +109,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "2d37697869b9bdda3efab92dda8c910b68fd05c0"
+  "gitHead": "4445de7c3ce29fb0166d3bb77a1a0460e41a32d3"
 }

package/src/convertor/convertor.js

@@ -37,8 +37,7 @@ const rulesMap = {
   wxToDd: extend({}, defaultConvertRule, wxToDdRule),
   wxToJd: extend({}, defaultConvertRule, wxToJdRule),
   wxToIos: extend({}, defaultConvertRule, wxToReactRule),
-  wxToAndroid: extend({}, defaultConvertRule, wxToReactRule),
-  wxToHarmony: extend({}, defaultConvertRule, wxToReactRule)
+  wxToAndroid: extend({}, defaultConvertRule, wxToReactRule)
 }
 
 export function getConvertRule (convertMode) {

package/src/convertor/getConvertMode.js

@@ -7,8 +7,7 @@ const convertModes = {
   'wx-jd': 'wxToJd',
   'wx-dd': 'wxToDd',
   'wx-ios': 'wxToIos',
-  'wx-android': 'wxToAndroid',
-  'wx-harmony': 'wxToHarmony'
+  'wx-android': 'wxToAndroid'
 }
 
 export function getConvertMode (srcMode) {

package/src/core/mergeOptions.js

@@ -2,6 +2,8 @@ import { getConvertRule } from '../convertor/convertor'
 import builtInKeysMap from '../platform/patch/builtInKeysMap'
 import { implemented } from './implement'
 import {
+  isArray,
+  isFunction,
   isObject,
   aliasReplace,
   makeMap,
@@ -221,6 +223,10 @@ function mergeMixins (parent, child) {
       mergeToArray(parent, child, key)
     } else if (/^behaviors|externalClasses$/.test(key)) {
       mergeArray(parent, child, key)
+    } else if (key === 'inject') {
+      mergeInject(parent, child, key)
+    } else if (key === 'provide') {
+      mergeProvide(parent, child, key)
     } else if (key !== 'mixins' && key !== 'mpxCustomKeysForBlend') {
       // 收集非函数的自定义属性，在Component创建的页面中挂载到this上，模拟Page创建页面的表现，swan当中component构造器也能自动挂载自定义数据，不需要框架模拟挂载
       if (curType === 'blend' && typeof child[key] !== 'function' && !builtInKeysMap[key] && __mpx_mode__ !== 'swan') {
@@ -277,6 +283,37 @@ function mergeDataFn (parent, child, key) {
   }
 }
 
+function normalizeInject (options) {
+  const injectOpt = options.inject
+  if (isArray(injectOpt)) {
+    const normalized = (options.inject = {})
+    for (let i = 0; i < injectOpt.length; i++) {
+      normalized[injectOpt[i]] = injectOpt[i]
+    }
+  }
+}
+
+function mergeInject (parent, child, key) {
+  normalizeInject(child)
+  mergeShallowObj(parent, child, key)
+}
+
+function mergeProvide (parent, child, key) {
+  const parentVal = parent[key]
+  const childVal = child[key]
+  if (!parentVal) {
+    parent[key] = childVal
+  } else if (!childVal) {
+    parent[key] = parentVal
+  } else {
+    parent[key] = function mergedProvide () {
+      const to = isFunction(parentVal) ? parentVal.call(this) : parentVal
+      const from = isFunction(childVal) ? childVal.call(this) : childVal
+      return Object.assign(to, from)
+    }
+  }
+}
+
 export function mergeArray (parent, child, key) {
   const childVal = child[key]
   if (!parent[key]) {

package/src/core/proxy.js

@@ -101,7 +101,6 @@ function preProcessRenderData (renderData) {
   })
   return processedRenderData
 }
-
 export default class MpxProxy {
   constructor (options, target, reCreated) {
     this.target = target
@@ -317,7 +316,8 @@ export default class MpxProxy {
           selectComponent: this.target.selectComponent.bind(this.target),
           selectAllComponents: this.target.selectAllComponents.bind(this.target),
           createSelectorQuery: this.target.createSelectorQuery ? this.target.createSelectorQuery.bind(this.target) : envObj.createSelectorQuery.bind(envObj),
-          createIntersectionObserver: this.target.createIntersectionObserver ? this.target.createIntersectionObserver.bind(this.target) : envObj.createIntersectionObserver.bind(envObj)
+          createIntersectionObserver: this.target.createIntersectionObserver ? this.target.createIntersectionObserver.bind(this.target) : envObj.createIntersectionObserver.bind(envObj),
+          getPageId: this.target.getPageId.bind(this.target)
         }
       ])
       if (!isObject(setupResult)) {

package/src/platform/builtInMixins/index.js

@@ -1,4 +1,3 @@
-import { isReact } from '@mpxjs/utils'
 import pageStatusMixin from './pageStatusMixin'
 import proxyEventMixin from './proxyEventMixin'
 import renderHelperMixin from './renderHelperMixin'
@@ -14,10 +13,11 @@ import pageRouteMixin from './pageRouteMixin'
 import { dynamicRefsMixin, dynamicRenderHelperMixin, dynamicSlotMixin } from '../../dynamic/dynamicRenderMixin.empty'
 import styleHelperMixin from './styleHelperMixin'
 import directiveHelperMixin from './directiveHelperMixin'
+import pageIdMixin from './pageIdMixin'
 
 export default function getBuiltInMixins ({ type, rawOptions = {} }) {
   let bulitInMixins
-  if (isReact) {
+  if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
     bulitInMixins = [
       proxyEventMixin(),
       directiveHelperMixin(),
@@ -37,7 +37,8 @@ export default function getBuiltInMixins ({ type, rawOptions = {} }) {
       getTabBarMixin(type),
       pageRouteMixin(type),
       // 由于relation可能是通过mixin注入的，不能通过当前的用户options中是否存在relations来简单判断是否注入该项mixin
-      relationsMixin(type)
+      relationsMixin(type),
+      pageIdMixin(type)
     ]
   } else {
     // 此为差异抹平类mixins，原生模式下也需要注入也抹平平台差异
@@ -47,6 +48,11 @@ export default function getBuiltInMixins ({ type, rawOptions = {} }) {
       refsMixin(),
       relationsMixin(type)
     ]
+    if (__mpx_mode__ === 'ali') {
+      bulitInMixins = bulitInMixins.concat([
+        pageIdMixin(type)
+      ])
+    }
     // 此为纯增强类mixins，原生模式下不需要注入
     if (!rawOptions.__nativeRender__) {
       bulitInMixins = bulitInMixins.concat([

package/src/platform/builtInMixins/pageIdMixin.js

@@ -0,0 +1,13 @@
+export default function pageIdMixin (mixinType) {
+  return {
+    methods: {
+      getPageId () {
+        if (mixinType === 'component') {
+          return this.$page.$id
+        } else {
+          return this.$id
+        }
+      }
+    }
+  }
+}

package/src/platform/builtInMixins/pageIdMixin.web.js

@@ -0,0 +1,25 @@
+let pageId = 0
+
+export default function pageIdMixin (mixinType) {
+  const mixin = {}
+
+  if (mixinType === 'page') {
+    Object.assign(mixin, {
+      beforeCreate () {
+        this.__pageId = ++pageId
+      },
+      provide () {
+        return {
+          __pageId: this.__pageId
+        }
+      }
+    })
+  }
+  if (mixinType === 'component') {
+    Object.assign(mixin, {
+      inject: ['__pageId']
+    })
+  }
+
+  return mixin
+}

package/src/platform/createApp.ios.js

@@ -6,8 +6,6 @@ import { LIFECYCLE } from '../platform/patch/lifecycle/index'
 import Mpx from '../index'
 import { createElement, memo, useRef, useEffect } from 'react'
 import * as ReactNative from 'react-native'
-import { Image } from 'react-native'
-
 import { initAppProvides } from './export/inject'
 
 const appHooksMap = makeMap(mergeLifecycle(LIFECYCLE).app)
@@ -183,23 +181,29 @@ export default function createApp (options) {
     }, [])
 
     const { initialRouteName, initialParams } = initialRouteRef.current
-    const headerBackImageProps = Mpx.config.rnConfig.headerBackImageProps || null
-    const headerBackImageSource = Mpx.config.rnConfig.headerBackImageSource || null
     const navScreenOpts = {
       // 7.x替换headerBackTitleVisible
       // headerBackButtonDisplayMode: 'minimal',
       headerBackTitleVisible: false,
-      // 安卓上会出现初始化时闪现导航条的问题
-      headerShown: false,
       headerShadowVisible: false
     }
-    if (headerBackImageProps) {
-      navScreenOpts.headerBackImage = () => {
-        return createElement(Image, headerBackImageProps)
+    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)
+        }
       }
-    }
-    if (headerBackImageSource) {
-      navScreenOpts.headerBackImageSource = headerBackImageSource
     }
 
     return createElement(SafeAreaProvider,

package/src/platform/env/vuePlugin.js

@@ -126,5 +126,9 @@ export default function install (Vue) {
   Vue.prototype.createIntersectionObserver = function (options) {
     return createIntersectionObserver(this, options)
   }
+
+  Vue.prototype.getPageId = function () {
+    return this.__pageId
+  }
   hackEffectScope()
 }

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

@@ -286,11 +286,27 @@ function createInstance ({ propsRef, type, rawOptions, currentInject, validProps
     instance.route = props.route.name
     global.__mpxPagesMap = global.__mpxPagesMap || {}
     global.__mpxPagesMap[props.route.key] = [instance, props.navigation]
+    // App onLaunch 在 Page created 之前执行
+    if (!global.__mpxAppHotLaunched && global.__mpxAppOnLaunch) {
+      global.__mpxAppOnLaunch(props.navigation)
+    }
   }
 
   const proxy = instance.__mpxProxy = new MpxProxy(rawOptions, instance)
   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])
+  }
+
   Object.assign(proxy, {
     onStoreChange: null,
     stateVersion: Symbol(),
@@ -384,7 +400,9 @@ const pageStatusMap = global.__mpxPageStatusMap = reactive({})
 
 function usePageStatus (navigation, pageId) {
   navigation.pageId = pageId
-  set(pageStatusMap, pageId, '')
+  if (!hasOwn(pageStatusMap, pageId)) {
+    set(pageStatusMap, pageId, '')
+  }
   useEffect(() => {
     const focusSubscription = navigation.addListener('focus', () => {
       pageStatusMap[pageId] = 'show'
@@ -422,16 +440,6 @@ const checkRelation = (options) => {
   }
 }
 
-const provideRelation = (instance, relation) => {
-  const componentPath = instance.__componentPath
-  if (relation) {
-    return Object.assign({}, relation, { [componentPath]: instance })
-  } else {
-    return {
-      [componentPath]: instance
-    }
-  }
-}
 export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
   rawOptions = mergeOptions(rawOptions, type, false)
   const components = Object.assign({}, rawOptions.components, currentInject.getComponents())
@@ -501,19 +509,6 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
     usePageEffect(proxy, pageId)
 
     useEffect(() => {
-      if (type === 'page') {
-        if (!global.__mpxAppHotLaunched && global.__mpxAppOnLaunch) {
-          global.__mpxAppOnLaunch(props.navigation)
-        }
-        const loadParams = {}
-        // 此处拿到的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.mounted()
       return () => {
         proxy.unmounted()
@@ -551,14 +546,28 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
       root = createElement(ProviderContext.Provider, { value: provides }, root)
     }
 
-    return hasDescendantRelation
-      ? createElement(RelationsContext.Provider,
-          {
-            value: provideRelation(instance, relation)
-          },
-          root
-        )
-      : root
+    if (hasDescendantRelation) {
+      const relationProvide = useMemo(() => {
+        const componentPath = instance.__componentPath
+        if (relation) {
+          return Object.assign({}, relation, { [componentPath]: instance })
+        } else {
+          return {
+            [componentPath]: instance
+          }
+        }
+      }, [relation])
+
+      return createElement(
+        RelationsContext.Provider,
+        {
+          value: relationProvide
+        },
+        root
+      )
+    } else {
+      return root
+    }
   }))
 
   if (rawOptions.options?.isCustomText) {
@@ -571,6 +580,10 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
     const Page = ({ navigation, route }) => {
       const currentPageId = useMemo(() => ++pageId, [])
       const intersectionObservers = useRef({})
+      const routeContextValRef = useRef({
+        pageId: currentPageId,
+        navigation
+      })
       usePageStatus(navigation, currentPageId)
       useLayoutEffect(() => {
         const isCustom = pageConfig.navigationStyle === 'custom'
@@ -583,7 +596,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
           headerTintColor: pageConfig.navigationBarTextStyle || 'white'
         })
 
-        if (__mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {
+        if (__mpx_mode__ === 'android') {
           ReactNative.StatusBar.setBarStyle(pageConfig.barStyle || 'dark-content')
           ReactNative.StatusBar.setTranslucent(isCustom) // 控制statusbar是否占位
           const color = isCustom ? 'transparent' : pageConfig.statusBarColor
@@ -592,7 +605,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
       }, [])
 
       const rootRef = useRef(null)
-      const keyboardAvoidRef = useRef({ cursorSpacing: 0, ref: null })
+      const keyboardAvoidRef = useRef(null)
       useEffect(() => {
         setTimeout(() => {
           rootRef.current?.measureInWindow((x, y, width, height) => {
@@ -625,12 +638,12 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
         {
           // https://github.com/software-mansion/react-native-reanimated/issues/6639 因存在此问题，iOS在页面上进行定宽来暂时规避
           style: __mpx_mode__ === 'ios' && pageConfig.navigationStyle !== 'custom'
-          ? {
-            height: ReactNative.Dimensions.get('screen').height - useHeaderHeight()
-          }
-          : {
-            flex: 1
-          }
+            ? {
+              height: ReactNative.Dimensions.get('screen').height - useHeaderHeight()
+            }
+            : {
+              flex: 1
+            }
         },
         withKeyboardAvoidingView(
           createElement(ReactNative.View,
@@ -643,10 +656,7 @@ export function getDefaultOptions ({ type, rawOptions = {}, currentInject }) {
             },
             createElement(RouteContext.Provider,
               {
-                value: {
-                  pageId: currentPageId,
-                  navigation
-                }
+                value: routeContextValRef.current
               },
               createElement(IntersectionObserverContext.Provider,
                 {

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

@@ -60,7 +60,8 @@ export function getDefaultOptions ({ type, rawOptions = {} }) {
         selectComponent: instance.selectComponent.bind(instance),
         selectAllComponents: instance.selectAllComponents.bind(instance),
         createSelectorQuery: instance.createSelectorQuery.bind(instance),
-        createIntersectionObserver: instance.createIntersectionObserver.bind(instance)
+        createIntersectionObserver: instance.createIntersectionObserver.bind(instance),
+        getPageId: instance.getPageId.bind(instance)
       }
       const setupRes = rawSetup(props, newContext)
       unsetCurrentInstance(instance.__mpxProxy)