@mpxjs/core 2.10.6-beta.5 → 2.10.7-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.10.6-beta.5",
+  "version": "2.10.7-beta.1",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -19,7 +19,7 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@mpxjs/utils": "^2.10.6 | ^2.10.6-beta.1",
+    "@mpxjs/utils": "^2.10.7 | ^2.10.7-beta.1",
     "lodash": "^4.1.1",
     "miniprogram-api-typings": "^3.10.0"
   },

package/src/platform/builtInMixins/index.js

@@ -25,7 +25,8 @@ export default function getBuiltInMixins ({ type, rawOptions = {} }) {
       styleHelperMixin(),
       refsMixin(),
       i18nMixin(),
-      relationsMixin(type)
+      relationsMixin(type),
+      pageRouteMixin(type)
     ]
   } else if (isWeb) {
     bulitInMixins = [

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

@@ -0,0 +1,27 @@
+import { BEFORECREATE } from '../../core/innerLifecycle'
+import { EventChannel } from '@mpxjs/api-proxy/src/platform/api/event-channel/index'
+export default function pageRouteMixin (mixinType) {
+  if (mixinType === 'page') {
+    return {
+      [BEFORECREATE] () {
+        const mpxEventChannel = global.__mpxEventChannel
+        if (mpxEventChannel.route === this.route) {
+          this._eventChannel = mpxEventChannel.eventChannel
+        } else {
+          this._eventChannel = new EventChannel()
+        }
+      },
+      methods: {
+        getOpenerEventChannel () {
+          return this._eventChannel
+        }
+      }
+    }
+  }
+  return {
+    methods: {
+      getOpenerEventChannel () {
+      }
+    }
+  }
+}

package/src/platform/builtInMixins/pageRouteMixin.js

@@ -1,15 +1,20 @@
+import { EventChannel } from '@mpxjs/api-proxy/src/platform/api/event-channel/index'
 // web专用mixin，在web页面上挂载route属性
 export default function pageRouteMixin (mixinType) {
   if (mixinType === 'page') {
     return {
       beforeCreate () {
         this.route = this.$options.__mpxPageRoute || ''
+        const mpxEventChannel = global.__mpxEventChannel || {}
+        if (mpxEventChannel.route === this.route) {
+          this._eventChannel = mpxEventChannel.eventChannel
+        } else {
+          this._eventChannel = new EventChannel()
+        }
       },
       methods: {
         getOpenerEventChannel () {
-          const router = global.__mpxRouter
-          const eventChannel = router && router.eventChannelMap[this.route]
-          return eventChannel || {}
+          return this._eventChannel
         }
       }
     }

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

@@ -422,7 +422,7 @@ function usePageStatus (navigation, pageId) {
 function usePagePreload (route) {
   const name = route.name
   useEffect(() => {
-    const timer = setTimeout(() => {
+    setTimeout(() => {
       const preloadRule = global.__preloadRule || {}
       const { packages } = preloadRule[name] || {}
       if (packages?.length > 0) {
@@ -432,10 +432,6 @@ function usePagePreload (route) {
         }
       }
     }, 800)
-
-    return () => {
-      clearTimeout(timer)
-    }
   }, [])
 }