@mpxjs/core 2.8.5 → 2.8.7

package/@types/index.d.ts

@@ -7,8 +7,10 @@
 /// <reference path="./global.d.ts" />
 /// <reference path="./node.d.ts" />
 
+// @ts-ignore
 import type { GetComputedType } from '@mpxjs/store'
 
+// @ts-ignore
 export * from '@mpxjs/store'
 
 // utils
@@ -571,27 +573,29 @@ export function onBeforeUnmount (callback: () => void): void
 
 export function onUnmounted (callback: () => void): void
 
-export function onLoad<T extends object> (callback: (query: T) => void): void
+export function onLoad<T extends Record<string, string | undefined>> (callback: (query: T) => void): void
+// wechat dose not have generics
+// export function onLoad (callback: WechatMiniprogram.Page.ILifetime['onLoad']): void
 
-export function onShow (callback: () => void): void
+export function onShow (callback: WechatMiniprogram.Page.ILifetime['onShow']): void
 
-export function onHide (callback: () => void): void
+export function onHide (callback: WechatMiniprogram.Page.ILifetime['onHide']): void
 
-export function onResize (callback: () => void): void
+export function onResize (callback: WechatMiniprogram.Page.ILifetime['onResize']): void
 
-export function onPullDownRefresh (callback: () => void): void
+export function onPullDownRefresh (callback: WechatMiniprogram.Page.ILifetime['onPullDownRefresh']): void
 
-export function onReachBottom (callback: () => void): void
+export function onReachBottom (callback: WechatMiniprogram.Page.ILifetime['onReachBottom']): void
 
-export function onShareAppMessage (callback: () => void): void
+export function onShareAppMessage (callback: WechatMiniprogram.Page.ILifetime['onShareAppMessage']): void
 
-export function onShareTimeline (callback: () => void): void
+export function onShareTimeline (callback: WechatMiniprogram.Page.ILifetime['onShareTimeline']): void
 
-export function onAddToFavorites (callback: () => void): void
+export function onAddToFavorites (callback: WechatMiniprogram.Page.ILifetime['onAddToFavorites']): void
 
-export function onPageScroll (callback: () => void): void
+export function onPageScroll (callback: WechatMiniprogram.Page.ILifetime['onPageScroll']): void
 
-export function onTabItemTap (callback: () => void): void
+export function onTabItemTap (callback: WechatMiniprogram.Page.ILifetime['onTabItemTap']): void
 
 export function onSaveExitState (callback: () => void): void
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.5",
+  "version": "2.8.7",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -47,5 +47,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "c4cb7f7244d13a59535891acf02c347960c52343"
+  "gitHead": "d064d3caf12023c955f79cecdb92b90d479a6a05"
 }

package/src/convertor/wxToTt.js

@@ -1,5 +1,21 @@
+import { error } from '@mpxjs/utils'
+
+const BEHAVIORS_MAP = [
+  'wx://form-field',
+  'wx://form-field-group',
+  'wx://form-field-button',
+  'wx://component-export'
+]
+
 export default {
   convert (options) {
-    // 暂时无需转换
+    if (options.behaviors) {
+      options.behaviors.forEach((behavior, idx) => {
+        if (BEHAVIORS_MAP.includes(behavior)) {
+          error(`Built-in behavior "${behavior}" is not supported in tt environment!`, global.currentResource)
+          options.behaviors.splice(idx, 1)
+        }
+      })
+    }
   }
 }

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