@mpxjs/core 2.8.25-alpha → 2.8.25-alpha.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.25-alpha",
+  "version": "2.8.25-alpha.16",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -24,9 +24,9 @@
     "miniprogram-api-typings": "^3.0.2"
   },
   "peerDependencies": {
-    "@hummer/tenon-store": "^1.4.0",
+    "@hummer/tenon-store": "^1.7.0",
     "@hummer/tenon-vue": "^1.5.1",
-    "@mpxjs/api-proxy": "^2.7.44",
+    "@mpxjs/api-proxy": "^2.8.25-alpha.9",
     "@mpxjs/store": "^2.8.0",
     "vue": "^2.7.10",
     "vue-demi": "^0.13.11",
@@ -49,5 +49,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "345dc10820535a06d9aee8d2a1e6cc735ba08882"
+  "gitHead": "789c7a66f35f64ba4a631d3ead693f6a302d96bb"
 }

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

@@ -15,7 +15,7 @@ export default function pageStatusMixin (mixinType) {
         this.__mpxProxy.callHook(ONHIDE)
       },
       onBack () {
-        this.onBack && this.onBack()
+        return this.onBack && this.onBack()
       }
     }
   }

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

@@ -0,0 +1,75 @@
+import {
+  effectScope as vueEffectScope,
+  getCurrentScope as getCurrentVueScope,
+  onScopeDispose
+} from '@hummer/tenon-vue'
+
+import {
+  hasOwn,
+  isValidArrayIndex
+} from '@mpxjs/utils'
+
+export {
+  // watch
+  watchEffect,
+  watchSyncEffect,
+  watchPostEffect,
+  watch,
+  // reactive
+  reactive,
+  isReactive,
+  shallowReactive,
+  markRaw,
+  // ref
+  ref,
+  unref,
+  toRef,
+  toRefs,
+  isRef,
+  customRef,
+  shallowRef,
+  triggerRef,
+  // computed
+  computed,
+  // instance
+  getCurrentInstance
+} from '@hummer/tenon-vue'
+
+export function set (target, key, val) {
+  if (Array.isArray(target) && isValidArrayIndex(key)) {
+    target.length = Math.max(target.length, key)
+    target.splice(key, 1, val)
+    return val
+  }
+  target[key] = val
+  return val
+}
+
+export function del (target, key) {
+  if (Array.isArray(target) && isValidArrayIndex(key)) {
+    target.splice(key, 1)
+    return
+  }
+  if (!hasOwn(target, key)) {
+    return
+  }
+  delete target[key]
+}
+
+const noop = () => {
+}
+
+const fixEffectScope = (scope) => {
+  scope.pause = noop
+  scope.resume = noop
+}
+
+const effectScope = (detached) => fixEffectScope(vueEffectScope(detached))
+const getCurrentScope = () => fixEffectScope(getCurrentVueScope())
+
+export {
+  // effectScope
+  effectScope,
+  getCurrentScope,
+  onScopeDispose
+}

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

@@ -1,7 +1,8 @@
 import builtInKeysMap from '../builtInKeysMap'
 import mergeOptions from '../../../core/mergeOptions'
-import MPXProxy from '../../../core/proxy'
-import { diffAndCloneA } from '@mpxjs/utils'
+import { getCurrentInstance as getCurrentVueInstance } from '../../export/index'
+import MpxProxy, { setCurrentInstance, unsetCurrentInstance } from '../../../core/proxy'
+import { diffAndCloneA, warn } from '@mpxjs/utils'
 import { UPDATED, CREATED, MOUNTED, UNMOUNTED } from '../../../core/innerLifecycle'
 
 function filterOptions (options) {
@@ -25,20 +26,59 @@ function filterOptions (options) {
 }
 
 function initProxy (context, rawOptions) {
-  // 缓存options
-  context.$rawOptions = rawOptions
-  // 创建proxy对象
-  context.__mpxProxy = new MPXProxy(rawOptions, context)
-  context.__mpxProxy.callHook(CREATED, Hummer.pageInfo && Hummer.pageInfo.params && [Hummer.pageInfo.params])
+  if (!context.__mpxProxy) {
+    // 缓存options
+    context.$rawOptions = rawOptions
+    // 创建proxy对象
+    context.__mpxProxy = new MpxProxy(rawOptions, context)
+    // todo 待问题修复后需要还原
+    // context.__mpxProxy.callHook(CREATED, Hummer.pageInfo && Hummer.pageInfo.params && [Hummer.pageInfo.params])
+  }
 }
 
 export function getDefaultOptions (type, { rawOptions = {}, currentInject }) {
+  const rawSetup = rawOptions.setup
+  if (rawSetup) {
+    rawOptions.setup = (props) => {
+      const { proxy: instance } = getCurrentVueInstance()
+      initProxy(instance, rawOptions)
+      setCurrentInstance(instance.__mpxProxy)
+      const newContext = {
+        triggerEvent: (eventName, eventDetail) => {
+          return instance.$emit(eventName, {
+            type: eventName,
+            detail: eventDetail
+          })
+        },
+        get refs () { return instance.$refs },
+        forceUpdate: instance.$forceUpdate.bind(instance),
+        selectComponent: () => {
+          warn('selectComponent is not supported in Tenon')
+        },
+        selectAllComponents: () => {
+          warn('selectAllComponents is not supported in Tenon')
+        },
+        createSelectorQuery: () => {
+          warn('createSelectorQuery is not supported in Tenon')
+        },
+        createIntersectionObserver: () => {
+          warn('createIntersectionObserver is not supported in Tenon')
+        }
+      }
+      const setupRes = rawSetup(props, newContext)
+      unsetCurrentInstance(instance.__mpxProxy)
+      return setupRes
+    }
+  }
+
   const hookNames = type === 'page' ? ['onLoad', 'onReady', 'onUnload'] : ['created', 'mounted', 'unmounted']
   const rootMixins = [{
     [hookNames[0]] (...params) {
       if (!this.__mpxProxy) {
         initProxy(this, rawOptions, currentInject, params)
       }
+      // todo 待问题修复后需要移除，目前逻辑是已经创建实例的情况下依旧会重复执行
+      this.__mpxProxy.callHook(CREATED, Hummer.pageInfo && Hummer.pageInfo.params && [Hummer.pageInfo.params])
     },
     [hookNames[1]] () {
       this.__mpxProxy && this.__mpxProxy.callHook(MOUNTED, Hummer.pageInfo && Hummer.pageInfo.params && [Hummer.pageInfo.params])