@mpxjs/core 2.8.6 → 2.8.8

package/@types/index.d.ts

@@ -193,6 +193,10 @@ export interface MpxComponentIns {
   $watch (expr: string | (() => any), handler: WatchHandler | WatchOptWithHandler, options?: WatchOpt): () => void
   $forceUpdate (params?: object, callback?: () => void): void
   $nextTick (fn: () => void): void
+  $i18n: {
+    locale: string
+    fallbackLocale: string
+  }
   $t: typeof t
   $tc: typeof tc
   $te: typeof te
@@ -300,6 +304,12 @@ export interface Mpx {
   i18n: {
     readonly global: UseI18n
     dispose (): void
+    locale: string
+    fallbackLocale: string
+    t: typeof t
+    tc: typeof tc
+    te: typeof te
+    tm: typeof tm
   }
 }
 
@@ -452,13 +462,11 @@ interface UseI18n {
   inheritLocale: boolean
   fallbackRoot: boolean
 
-  t (key: string, values?: I18nValues): string
-
-  t (key: string, choice: number, values?: I18nValues): string
+  t: typeof t | typeof tc
 
-  te (key: string): boolean
+  te: typeof te
 
-  tm (key: string): any
+  tm: typeof tm
 
   getLocaleMessage (locale: string): StringObj
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.6",
+  "version": "2.8.8",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "c4261c7ea5a16ee3ceaac78afad09e5e0b35d39a"
+  "gitHead": "23a729d198962e2b1d7a5d5672066d39e7271949"
 }

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

@@ -48,30 +48,31 @@ if (isBrowser) {
 }
 
 export default function pageStatusMixin (mixinType) {
+  const mixin = {}
+
   if (mixinType === 'page') {
-    return {
+    Object.assign(mixin, {
       data: {
-        mpxPageStatus: 'show'
+        mpxPageStatus: null
       },
       activated () {
         this.mpxPageStatus = 'show'
-        this.__mpxProxy.callHook(ONSHOW)
       },
       deactivated () {
         this.mpxPageStatus = 'hide'
-        this.__mpxProxy.callHook(ONHIDE)
       },
       created () {
         // onLoad应该在用户声明周期CREATED后再执行，故此处使用原生created声明周期来触发onLoad
         const query = (global.__mpxRouter && global.__mpxRouter.currentRoute && global.__mpxRouter.currentRoute.query) || {}
         this.__mpxProxy.callHook(ONLOAD, [query])
       }
-    }
+    })
   }
-  return {
+
+  Object.assign(mixin, {
     [CREATED] () {
-      const pageInstance = getCurrentPageInstance()
-      if (!pageInstance) {
+      const pageInstance = mixinType === 'page' ? this : getCurrentPageInstance()
+      if (pageInstance) {
         this.$watch(() => pageInstance.mpxPageStatus, status => {
           if (!status) return
           if (status === 'show') this.__mpxProxy.callHook(ONSHOW)
@@ -91,5 +92,7 @@ export default function pageStatusMixin (mixinType) {
         })
       }
     }
-  }
+  })
+
+  return mixin
 }

package/src/platform/export/api.js

@@ -7,7 +7,6 @@ const APIs = {
   mixin: injectMixins,
   observable: reactive,
   watch,
-  // use,
   set,
   delete: del
 }

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

@@ -1,25 +1,23 @@
 import Vue from '../../vue'
 import { injectMixins } from '../../core/injectMixins'
 
-function initApi () {
-  const vm = new Vue()
-  const observable = Vue.observable.bind(Vue)
-  const watch = vm.$watch.bind(vm)
-  const set = Vue.set.bind(Vue)
-  const del = Vue.delete.bind(Vue)
-  APIs = {
-    injectMixins,
-    mixin: injectMixins,
-    observable,
-    watch,
-    // use,
-    set,
-    delete: del
-  }
-  return APIs
+const vm = new Vue()
+const observable = Vue.observable.bind(Vue)
+const watch = vm.$watch.bind(vm)
+const set = Vue.set.bind(Vue)
+const del = Vue.delete.bind(Vue)
+
+const APIs = {
+  injectMixins,
+  mixin: injectMixins,
+  observable,
+  watch,
+  set,
+  delete: del
 }
-let APIs = initApi()
+
 const InstanceAPIs = {}
+
 export {
   APIs,
   InstanceAPIs

package/src/platform/patch/index.js

@@ -7,7 +7,7 @@ import { getDefaultOptions as getWebDefaultOptions } from './web/getDefaultOptio
 import { error } from '@mpxjs/utils'
 
 export default function createFactory (type) {
-  return (options, { isNative, customCtor, customCtorType } = {}) => {
+  return (options = {}, { isNative, customCtor, customCtorType } = {}) => {
     options.__nativeRender__ = !!isNative
     options.__type__ = type
     let ctor