@mpxjs/core 2.8.23-alpha.2 → 2.8.23-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.23-alpha.2",
+  "version": "2.8.23-alpha.4",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -49,5 +49,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "556f754c8b43cb825a8d5d5040b1cdf7a6fdd613"
+  "gitHead": "eaa049a8efe495bc5294b4a8c81acff13440d166"
 }

package/src/convertor/wxToTenon.js

@@ -1,8 +1,7 @@
 import * as wxLifecycle from '../platform/patch/wx/lifecycle'
 import * as tenonLifecycle from '../platform/patch/tenon/lifecycle'
 import { mergeLifecycle } from './mergeLifecycle'
-import { error } from '../helper/log'
-import { isObject, diffAndCloneA, hasOwn } from '@mpxjs/utils'
+import { error, isObject, diffAndCloneA, hasOwn } from '@mpxjs/utils'
 import { implemented } from '../core/implement'
 import { CREATED, UNMOUNTED } from '../core/innerLifecycle'
 

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

@@ -1,4 +1,4 @@
-import { CREATED } from '../../core/innerLifecycle'
+import { CREATED, ONSHOW, ONHIDE } from '../../core/innerLifecycle'
 
 export default function pageStatusMixin (mixinType) {
   if (mixinType === 'page') {
@@ -8,11 +8,11 @@ export default function pageStatusMixin (mixinType) {
       },
       onShow () {
         this.mpxPageStatus = 'show'
-        this.onShow && this.onShow()
+        this.__mpxProxy.callHook(ONSHOW)
       },
       onHide () {
         this.mpxPageStatus = 'hide'
-        this.onHide && this.onHide()
+        this.__mpxProxy.callHook(ONHIDE)
       },
       onBack () {
         this.onBack && this.onBack()

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

@@ -2,7 +2,7 @@ import builtInKeysMap from '../builtInKeysMap'
 import mergeOptions from '../../../core/mergeOptions'
 import MPXProxy from '../../../core/proxy'
 import { diffAndCloneA } from '@mpxjs/utils'
-import { UPDATED } from '../../../core/innerLifecycle'
+import { UPDATED, CREATED, MOUNTED, UNMOUNTED } from '../../../core/innerLifecycle'
 
 function filterOptions (options) {
   const newOptions = {}
@@ -29,7 +29,7 @@ function initProxy (context, rawOptions) {
   context.$rawOptions = rawOptions
   // 创建proxy对象
   context.__mpxProxy = new MPXProxy(rawOptions, context)
-  context.__mpxProxy.created(Hummer.pageInfo && Hummer.pageInfo.params && [Hummer.pageInfo.params])
+  context.__mpxProxy.callHook(CREATED, Hummer.pageInfo && Hummer.pageInfo.params && [Hummer.pageInfo.params])
 }
 
 export function getDefaultOptions (type, { rawOptions = {}, currentInject }) {
@@ -41,13 +41,13 @@ export function getDefaultOptions (type, { rawOptions = {}, currentInject }) {
       }
     },
     [hookNames[1]] () {
-      this.__mpxProxy && this.__mpxProxy.mounted(Hummer.pageInfo && Hummer.pageInfo.params && [Hummer.pageInfo.params])
+      this.__mpxProxy && this.__mpxProxy.callHook(MOUNTED, Hummer.pageInfo && Hummer.pageInfo.params && [Hummer.pageInfo.params])
     },
     updated () {
       this.__mpxProxy && this.__mpxProxy.callHook(UPDATED)
     },
     [hookNames[2]] () {
-      this.__mpxProxy && this.__mpxProxy.unmounted()
+      this.__mpxProxy && this.__mpxProxy.callHook(UNMOUNTED)
     }
   }]
   // 为了在builtMixin中可以使用某些rootMixin实现的特性（如数据响应等），此处builtInMixin在rootMixin之后执行，但是当builtInMixin使用存在对应内建生命周期的目标平台声明周期写法时，可能会出现用户生命周期比builtInMixin中的生命周期先执行的情况，为了避免这种情况发生，builtInMixin应该尽可能使用内建生命周期来编写