@mpxjs/core 2.6.114-alpha.0 → 2.6.114-alpha.3

package/README.md

@@ -1,4 +1,3 @@
 # 小程序框架 [**MPX** 介绍文档](https://didi.github.io/mpx)
 
 ## 跨平台代码编写指南
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.6.114-alpha.0",
+  "version": "2.6.114-alpha.3",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -43,5 +43,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "7f944d9d7fe0dd3bd0a798c6268c6d08f90d62c0"
+  "gitHead": "951dd877934ec6233bfb67452b790dc982317ccd"
 }

package/src/convertor/wxToTenon.js

@@ -4,7 +4,7 @@ import { mergeLifecycle } from './mergeLifecycle'
 import { error } from '../helper/log'
 import { isObject, diffAndCloneA, hasOwn } from '../helper/utils'
 import { implemented } from '../core/implement'
-import { CREATED } from '../core/innerLifecycle'
+import { CREATED, DESTROYED } from '../core/innerLifecycle'
 
 // 暂不支持的wx选项，后期需要各种花式支持
 const unsupported = [
@@ -49,7 +49,8 @@ export default {
   support: true,
   // wx输出tenon时额外将onLoad代理到CREATED
   lifecycleProxyMap: Object.assign({}, wxLifecycle.lifecycleProxyMap, {
-    [CREATED]: ['created', 'attached', 'onLoad']
+    [CREATED]: ['created', 'attached', 'onLoad'],
+    [DESTROYED]: ['destroyed', 'detached', 'onUnload', 'unmounted']
   }),
   convert (options) {
     const props = Object.assign({}, options.properties, options.props)

package/src/core/createStore.js

@@ -208,7 +208,7 @@ class Store {
         const getter = this.__wrappedGetters[k]
         computedObj[k] = () => getter(this.state)
         Object.defineProperty(this.getters, k, {
-          get: () => Vue.computed(() => computedObj[k]()).value,
+          get: () => computedObj[k](),
           enumerable: true // for local getters
         })
       })

package/src/platform/builtInMixins/pageStatusMixin.tenon.js

@@ -8,9 +8,14 @@ export default function pageStatusMixin (mixinType) {
       },
       onShow () {
         this.mpxPageStatus = 'show'
+        this.onShow && this.onShow()
       },
       onHide () {
         this.mpxPageStatus = 'hide'
+        this.onHide && this.onHide()
+      },
+      onBack () {
+        this.onBack && this.onBack()
       }
     }
   }

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

@@ -26,12 +26,21 @@ export default function proxyEventMixin () {
   return {
     beforeCreate () {
       const modelEvent = this.$attrs.mpxModelEvent
-      if (modelEvent) {
-        this.$on(modelEvent, (e) => {
+      const modelEventId = this.$attrs.mpxModelEventId
+      if (modelEvent && modelEventId) {
+        Hummer.notifyCenter.addEventListener(modelEventId, (e) => {
           this.$emit('mpxModel', e)
         })
       }
     },
+    beforeDestroy () {
+      const modelEvent = this.$attrs.mpxModelEvent
+      const modelEventId = this.$attrs.mpxModelEventId
+      if (modelEvent && modelEventId) {
+        Hummer.notifyCenter.removeEventListener(modelEventId)
+      }
+    },
+
     methods
   }
 }

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

@@ -30,23 +30,24 @@ function initProxy (context, rawOptions) {
   // 创建proxy对象
   const mpxProxy = new MPXProxy(rawOptions, context)
   context.__mpxProxy = mpxProxy
-  context.__mpxProxy.created()
+  context.__mpxProxy.created(Hummer.pageInfo && Hummer.pageInfo.params && [Hummer.pageInfo.params])
 }
 
-export function getDefaultOptions (type, { rawOptions = {} }) {
+export function getDefaultOptions (type, { rawOptions = {}, currentInject }) {
+  const hookNames = type === 'page' ? ['onLoad', 'onReady', 'onUnload'] : ['created', 'mounted', 'unmounted']
   const rootMixins = [{
-    created () {
+    [hookNames[0]] (...params) {
       if (!this.__mpxProxy) {
-        initProxy(this, rawOptions)
+        initProxy(this, rawOptions, currentInject, params)
       }
     },
-    mounted () {
-      this.__mpxProxy && this.__mpxProxy.mounted()
+    [hookNames[1]] () {
+      this.__mpxProxy && this.__mpxProxy.mounted(Hummer.pageInfo && Hummer.pageInfo.params && [Hummer.pageInfo.params])
     },
     updated () {
       this.__mpxProxy && this.__mpxProxy.updated()
     },
-    destroyed () {
+    [hookNames[2]] () {
       this.__mpxProxy && this.__mpxProxy.destroyed()
     }
   }]

package/src/platform/patch/tenon/lifecycle.js

@@ -9,7 +9,9 @@ const COMPONENT_HOOKS = [
   // 'deactivated',
   'beforeDestroy',
   'destroyed',
-  'errorCaptured'
+  'errorCaptured',
+  'beforeUnmount',
+  'unmounted'
   // 'onPageNotFound'
 ]
 
@@ -20,6 +22,7 @@ const PAGE_HOOKS = [
   'onShow',
   'onHide',
   'onUnload'
+  // 'onBack',
   // 'onPullDownRefresh',
   // 'onReachBottom',
   // 'onPageScroll',