@mpxjs/core 2.7.52 → 2.8.0-beta.2

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

@@ -0,0 +1,26 @@
+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
+}
+let APIs = initApi()
+const InstanceAPIs = {}
+export {
+  APIs,
+  InstanceAPIs
+}

package/src/platform/export/index.js

@@ -0,0 +1,45 @@
+
+export {
+  watchEffect,
+  watchSyncEffect,
+  watchPostEffect,
+  watch
+} from '../../observer/watch'
+
+export {
+  reactive,
+  isReactive,
+  shallowReactive,
+  set,
+  del,
+  markRaw
+} from '../../observer/reactive'
+
+export {
+  ref,
+  unref,
+  toRef,
+  toRefs,
+  isRef,
+  customRef,
+  shallowRef,
+  triggerRef
+} from '../../observer/ref'
+
+export {
+  computed
+} from '../../observer/computed'
+
+export {
+  effectScope,
+  getCurrentScope,
+  onScopeDispose
+} from '../../observer/effectScope'
+
+export {
+  getCurrentInstance
+} from '../../core/proxy'
+
+export {
+  useI18n
+} from '../../platform/builtInMixins/i18nMixin'

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

@@ -0,0 +1,36 @@
+export {
+  // watch
+  watchEffect,
+  watchSyncEffect,
+  watchPostEffect,
+  watch,
+  // reactive
+  reactive,
+  isReactive,
+  shallowReactive,
+  set,
+  del,
+  markRaw,
+  // ref
+  ref,
+  unref,
+  toRef,
+  toRefs,
+  isRef,
+  customRef,
+  shallowRef,
+  triggerRef,
+  // computed
+  computed,
+  // effectScope
+  effectScope,
+  getCurrentScope,
+  onScopeDispose,
+  // instance
+  getCurrentInstance
+} from 'vue'
+
+export {
+  // i18n
+  useI18n
+} from 'vue-i18n-bridge'

package/src/platform/index.js

@@ -2,8 +2,4 @@ import createApp from './createApp'
 import createPage from './createPage'
 import createComponent from './createComponent'
 
-export {
-  createApp,
-  createPage,
-  createComponent
-}
+export { createApp, createPage, createComponent }

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

@@ -1,8 +1,7 @@
-import MPXProxy from '../../../core/proxy'
+import MpxProxy from '../../../core/proxy'
 import builtInKeysMap from '../builtInKeysMap'
 import mergeOptions from '../../../core/mergeOptions'
-import { error } from '../../../helper/log'
-import { diffAndCloneA, hasOwn } from '../../../helper/utils'
+import { isFunction, error, diffAndCloneA, hasOwn } from '@mpxjs/utils'
 
 function transformApiForProxy (context, currentInject) {
   const rawSetData = context.setData.bind(context)
@@ -17,20 +16,23 @@ function transformApiForProxy (context, currentInject) {
     })
   }
   Object.defineProperties(context, {
-    __getInitialData: {
+    __getProps: {
       get () {
         return (options) => {
+          const props = {}
+          const validProps = Object.assign({}, options.properties, options.props)
           if (context.props) {
-            const newData = context.$rawOptions.__nativeRender__ ? context.data : Object.assign({}, context.data)
-            const validProps = Object.assign({}, options.props, options.properties)
             Object.keys(context.props).forEach((key) => {
-              if (hasOwn(validProps, key) && typeof context.props[key] !== 'function') {
-                newData[key] = context.props[key]
+              if (hasOwn(validProps, key) && !isFunction(context.props[key])) {
+                props[key] = context.props[key]
               }
             })
-            return newData
           }
-          return context.data
+          if (options.__nativeRender__) {
+            // 微信原生转支付宝时，首次将非函数props数据合入data中
+            Object.assign(context.data, props)
+          }
+          return props
         }
       },
       configurable: false
@@ -83,30 +85,37 @@ function filterOptions (options, type) {
   return newOptions
 }
 
-function initProxy (context, rawOptions, currentInject, params) {
+function initProxy (context, rawOptions, currentInject) {
   if (!context.__mpxProxy) {
     // 提供代理对象需要的api
     transformApiForProxy(context, currentInject)
-    // 缓存options
-    context.$rawOptions = rawOptions
     // 创建proxy对象
-    context.__mpxProxy = new MPXProxy(rawOptions, context)
-    context.__mpxProxy.created(params)
-  } else if (context.__mpxProxy.isDestroyed()) {
-    context.__mpxProxy.reCreated(params)
+    context.__mpxProxy = new MpxProxy(rawOptions, context)
+    context.__mpxProxy.created()
+  } else if (context.__mpxProxy.isUnmounted()) {
+    context.__mpxProxy = new MpxProxy(rawOptions, context, true)
+    context.__mpxProxy.created()
   }
 }
 
 export function getDefaultOptions (type, { rawOptions = {}, currentInject }) {
   const hookNames = type === 'component' ? ['onInit', 'didMount', 'didUnmount'] : ['onLoad', 'onReady', 'onUnload']
   const rootMixins = [{
-    [hookNames[0]] (...params) {
-      initProxy(this, rawOptions, currentInject, params)
+    [hookNames[0]] () {
+      if (rawOptions.__nativeRender__ && this.props) {
+        const validProps = Object.assign({}, rawOptions.props, rawOptions.properties)
+        Object.keys(this.props).forEach((key) => {
+          if (hasOwn(validProps, key) && typeof this.props[key] !== 'function') {
+            this.data[key] = this.props[key]
+          }
+        })
+      }
+      initProxy(this, rawOptions, currentInject)
     },
     deriveDataFromProps (nextProps) {
       if (this.__mpxProxy && this.__mpxProxy.isMounted() && nextProps && nextProps !== this.props) {
-        const validProps = Object.assign({}, this.$rawOptions.props, this.$rawOptions.properties)
-        if (this.$rawOptions.__nativeRender__) {
+        const validProps = Object.assign({}, rawOptions.props, rawOptions.properties)
+        if (rawOptions.__nativeRender__) {
           const newData = {}
           // 微信原生转换支付宝时，每次props更新将其设置进data模拟微信表现
           Object.keys(nextProps).forEach((key) => {
@@ -122,21 +131,14 @@ export function getDefaultOptions (type, { rawOptions = {}, currentInject }) {
           Object.keys(nextProps).forEach(key => {
             if (hasOwn(validProps, key) && typeof nextProps[key] !== 'function') {
               const { diff, clone } = diffAndCloneA(nextProps[key], this.props[key])
-              // 由于支付宝中透传父级setData的值，此处进行深copy后赋值避免父级存储的miniRenderData部分数据在此处被响应化，在子组件对props赋值时触发父组件的render
+              // 由于支付宝中透传父级setData的值，此处进行深clone后赋值避免父级存储的miniRenderData部分数据在此处被响应化，在子组件对props赋值时触发父组件的render
               if (diff) this[key] = clone
             }
           })
+          this.__mpxProxy.propsUpdated()
         }
       }
     },
-    didUpdate () {
-      if (this.__mpxProxy) {
-        // todo: lockTask必要性待验证，属性更新触发自身setData时，updated执行与wx对齐，updated触发机制也考虑与wx对齐（props update && setData callback）
-        this.__mpxProxy.lockTask(() => {
-          this.__mpxProxy.updated()
-        })
-      }
-    },
     [hookNames[1]] () {
       if (this.__mpxProxy) {
         this.__mpxProxy.mounted()
@@ -145,7 +147,7 @@ export function getDefaultOptions (type, { rawOptions = {}, currentInject }) {
       }
     },
     [hookNames[2]] () {
-      if (this.__mpxProxy) this.__mpxProxy.destroyed()
+      if (this.__mpxProxy) this.__mpxProxy.unmounted()
     }
   }]
   rawOptions.mixins = rawOptions.mixins ? rootMixins.concat(rawOptions.mixins) : rootMixins

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

@@ -1,4 +1,12 @@
-import { BEFORECREATE, BEFOREMOUNT, CREATED, DESTROYED, MOUNTED, UPDATED } from '../../../core/innerLifecycle'
+import {
+  CREATED,
+  UNMOUNTED,
+  MOUNTED,
+  ONHIDE,
+  ONSHOW,
+  ONLOAD,
+  UPDATED
+} from '../../../core/innerLifecycle'
 
 const APP_HOOKS = [
   'onLaunch',
@@ -6,7 +14,8 @@ const APP_HOOKS = [
   'onHide',
   'onError',
   'onShareAppMessage',
-  'onUnhandledRejection'
+  'onUnhandledRejection',
+  'onPageNotFound'
 ]
 
 const PAGE_HOOKS = [
@@ -15,14 +24,13 @@ const PAGE_HOOKS = [
   'onShow',
   'onHide',
   'onUnload',
-  'onPullDownRefresh',
-  'onReachBottom',
   'onShareAppMessage',
-  'onPageScroll',
   'onTitleClick',
   'onOptionMenuClick',
-  'onUpdated',
-  'onBeforeCreate'
+  'onPullDownRefresh',
+  'onTabItemTap',
+  'onPageScroll',
+  'onReachBottom'
 ]
 
 const COMPONENT_HOOKS = [
@@ -31,19 +39,19 @@ const COMPONENT_HOOKS = [
   'didMount',
   'didUpdate',
   'didUnmount',
-  'updated',
-  'beforeCreate',
+  'onError',
   'pageShow',
   'pageHide'
 ]
 
 export const lifecycleProxyMap = {
-  [BEFORECREATE]: ['beforeCreate'],
   [CREATED]: ['onInit'],
-  [UPDATED]: ['didUpdate', 'updated'],
-  [BEFOREMOUNT]: ['beforeMount'],
+  [UPDATED]: ['didUpdate'],
   [MOUNTED]: ['didMount', 'onReady'],
-  [DESTROYED]: ['didUnmount', 'onUnload']
+  [UNMOUNTED]: ['didUnmount', 'onUnload'],
+  [ONSHOW]: ['pageShow', 'onShow'],
+  [ONHIDE]: ['pageHide', 'onHide'],
+  [ONLOAD]: ['onLoad']
 }
 
 export const LIFECYCLE = {

package/src/platform/patch/builtInKeysMap.js

@@ -1,5 +1,5 @@
 import { INNER_LIFECYCLES } from '../../core/innerLifecycle'
-import { makeMap } from '../../helper/utils'
+import { makeMap } from '@mpxjs/utils'
 
 let bulitInKeys
 
@@ -16,6 +16,7 @@ if (__mpx_mode__ === 'web') {
   ]
 } else {
   bulitInKeys = [
+    'setup',
     'dataFn',
     'proto',
     'mixins',

package/src/platform/patch/index.js

@@ -4,7 +4,7 @@ import { getDefaultOptions as getWxDefaultOptions } from './wx/getDefaultOptions
 import { getDefaultOptions as getAliDefaultOptions } from './ali/getDefaultOptions'
 import { getDefaultOptions as getSwanDefaultOptions } from './swan/getDefaultOptions'
 import { getDefaultOptions as getWebDefaultOptions } from './web/getDefaultOptions'
-import { error } from '../../helper/log'
+import { error } from '@mpxjs/utils'
 
 export default function createFactory (type) {
   return (options, { isNative, customCtor, customCtorType } = {}) => {
@@ -49,7 +49,10 @@ export default function createFactory (type) {
       getDefaultOptions = getWxDefaultOptions
     }
 
+    const { setup } = options
     const { rawOptions, currentInject } = transferOptions(options, type)
+    rawOptions.setup = setup
+    // 不接受mixin中的setup配置
     // 注入内建的mixins, 内建mixin是按原始平台编写的，所以合并规则和rootMixins保持一致
     // 将合并后的用户定义的rawOptions传入获取当前应该注入的内建mixins
     rawOptions.mixins = getBuiltInMixins(rawOptions, type)
@@ -62,11 +65,3 @@ export default function createFactory (type) {
     }
   }
 }
-
-export function getRenderCallBack (context) {
-  return () => {
-    if (__mpx_mode__ !== 'ali' || context.options.__type__ === 'page') {
-      context.updated()
-    }
-  }
-}

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

@@ -9,14 +9,14 @@ export function getDefaultOptions (type, { rawOptions = {}, currentInject }) {
   }
 
   const rootMixin = {
-    [hookNames[0]] (...params) {
-      initProxy(this, rawOptions, currentInject, params)
+    [hookNames[0]] () {
+      initProxy(this, rawOptions, currentInject)
     },
     [hookNames[1]] () {
       if (this.__mpxProxy) this.__mpxProxy.mounted()
     },
     [hookNames[2]] () {
-      if (this.__mpxProxy) this.__mpxProxy.destroyed()
+      if (this.__mpxProxy) this.__mpxProxy.unmounted()
     }
   }
 

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

@@ -1,13 +1,19 @@
-import { BEFORECREATE, CREATED, DESTROYED, MOUNTED, UPDATED, BEFOREMOUNT } from '../../../core/innerLifecycle'
+import {
+  CREATED,
+  UNMOUNTED,
+  MOUNTED,
+  ONSHOW,
+  ONHIDE,
+  ONLOAD
+} from '../../../core/innerLifecycle'
 
 const APP_HOOKS = [
+  'onLogin',
   'onLaunch',
   'onShow',
   'onHide',
   'onError',
-  'onPageNotFound',
-  'onUnhandledRejection',
-  'onThemeChange'
+  'onPageNotFound'
 ]
 
 const PAGE_HOOKS = [
@@ -19,32 +25,29 @@ const PAGE_HOOKS = [
   'onUnload',
   'onPullDownRefresh',
   'onReachBottom',
-  'onShareAppMessage',
   'onPageScroll',
+  'onShareAppMessage',
   'onTabItemTap',
+  'onURLQueryChange',
   'onResize'
 ]
 
 const COMPONENT_HOOKS = [
-  'beforeCreate',
   'created',
   'attached',
   'ready',
-  'moved',
   'detached',
-  'updated',
   'pageShow',
-  'pageHide',
-  'definitionFilter'
+  'pageHide'
 ]
 
 export const lifecycleProxyMap = {
-  [BEFORECREATE]: ['beforeCreate'],
   [CREATED]: ['onInit', 'created', 'attached'],
-  [UPDATED]: ['updated'],
-  [BEFOREMOUNT]: ['beforeMount'],
   [MOUNTED]: ['ready', 'onReady'],
-  [DESTROYED]: ['detached', 'onUnload']
+  [UNMOUNTED]: ['detached', 'onUnload'],
+  [ONSHOW]: ['pageShow', 'onShow'],
+  [ONHIDE]: ['pageHide', 'onHide'],
+  [ONLOAD]: ['onLoad']
 }
 
 export const LIFECYCLE = {

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

@@ -1,7 +1,9 @@
 import builtInKeysMap from '../builtInKeysMap'
 import mergeOptions from '../../../core/mergeOptions'
-import MPXProxy from '../../../core/proxy'
-import { diffAndCloneA } from '../../../helper/utils'
+import { diffAndCloneA } from '@mpxjs/utils'
+import { getCurrentInstance as getVueCurrentInstance } from '../../export/index'
+import MpxProxy, { setCurrentInstance, unsetCurrentInstance } from '../../../core/proxy'
+import { BEFOREUPDATE, UPDATED, BEFOREUNMOUNT, UNMOUNTED } from '../../../core/innerLifecycle'
 
 function filterOptions (options) {
   const newOptions = {}
@@ -23,34 +25,56 @@ function filterOptions (options) {
   return newOptions
 }
 
-function initProxy (context, rawOptions, params) {
+function initProxy (context, rawOptions) {
   if (!context.__mpxProxy) {
-    // 缓存options
-    context.$rawOptions = rawOptions
-    // 创建proxy对象
-    context.__mpxProxy = new MPXProxy(rawOptions, context)
-    context.__mpxProxy.created(params)
-  } else if (context.__mpxProxy.isDestroyed()) {
-    context.__mpxProxy.reCreated(params)
+    context.__mpxProxy = new MpxProxy(rawOptions, context)
+  } else if (context.__mpxProxy.isUnmounted()) {
+    context.__mpxProxy = new MpxProxy(rawOptions, context, true)
   }
 }
 
 export function getDefaultOptions (type, { rawOptions = {} }) {
+  const rawSetup = rawOptions.setup
+  if (rawSetup) {
+    rawOptions.setup = (props) => {
+      const instance = getVueCurrentInstance().proxy
+      initProxy(instance, rawOptions)
+      setCurrentInstance(instance.__mpxProxy)
+      const newContext = {
+        triggerEvent: instance.triggerEvent.bind(instance),
+        refs: instance.$refs,
+        forceUpdate: instance.$forceUpdate.bind(instance),
+        selectComponent: instance.selectComponent.bind(instance),
+        selectAllComponents: instance.selectAllComponents.bind(instance),
+        createSelectorQuery: instance.createSelectorQuery.bind(instance),
+        createIntersectionObserver: instance.createIntersectionObserver.bind(instance)
+      }
+      const setupRes = rawSetup(props, newContext)
+      unsetCurrentInstance(instance.__mpxProxy)
+      return setupRes
+    }
+  }
   const rootMixins = [{
+    beforeCreate () {
+      initProxy(this, rawOptions)
+    },
     created () {
-      const query = (global.__mpxRouter && global.__mpxRouter.currentRoute && global.__mpxRouter.currentRoute.query) || {}
-      initProxy(this, rawOptions, [query])
-      // web中单独触发onLoad
-      this.onLoad && this.onLoad(query)
+      if (this.__mpxProxy) this.__mpxProxy.created()
     },
     mounted () {
       if (this.__mpxProxy) this.__mpxProxy.mounted()
     },
+    beforeUpdate () {
+      if (this.__mpxProxy) this.__mpxProxy.callHook(BEFOREUPDATE)
+    },
     updated () {
-      if (this.__mpxProxy) this.__mpxProxy.updated()
+      if (this.__mpxProxy) this.__mpxProxy.callHook(UPDATED)
+    },
+    beforeDestroy () {
+      if (this.__mpxProxy) this.__mpxProxy.callHook(BEFOREUNMOUNT)
     },
     destroyed () {
-      if (this.__mpxProxy) this.__mpxProxy.destroyed()
+      if (this.__mpxProxy) this.__mpxProxy.callHook(UNMOUNTED)
     }
   }]
   // 为了在builtMixin中可以使用某些rootMixin实现的特性（如数据响应等），此处builtInMixin在rootMixin之后执行，但是当builtInMixin使用存在对应内建生命周期的目标平台声明周期写法时，可能会出现用户生命周期比builtInMixin中的生命周期先执行的情况，为了避免这种情况发生，builtInMixin应该尽可能使用内建生命周期来编写

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

@@ -9,8 +9,7 @@ const COMPONENT_HOOKS = [
   'deactivated',
   'beforeDestroy',
   'destroyed',
-  'errorCaptured',
-  'onPageNotFound'
+  'errorCaptured'
 ]
 
 const PAGE_HOOKS = [
@@ -23,8 +22,12 @@ const PAGE_HOOKS = [
   'onPullDownRefresh',
   'onReachBottom',
   'onPageScroll',
+  'onAddToFavorites',
+  'onShareAppMessage',
+  'onShareTimeline',
+  'onResize',
   'onTabItemTap',
-  'onResize'
+  'onSaveExitState'
 ]
 
 const APP_HOOKS = [