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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.8.25-alpha",
+  "version": "2.8.25-alpha.3",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -49,5 +49,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "345dc10820535a06d9aee8d2a1e6cc735ba08882"
+  "gitHead": "a4acf4b86fc634513b77614453d28027f2b37762"
 }

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

@@ -0,0 +1,51 @@
+import {
+  effectScope as vueEffectScope,
+  getCurrentScope as getCurrentVueScope,
+  onScopeDispose
+} from 'vue'
+
+export {
+  // watch
+  watchEffect,
+  watchSyncEffect,
+  watchPostEffect,
+  watch,
+  // reactive
+  reactive,
+  isReactive,
+  shallowReactive,
+  set,
+  del,
+  markRaw,
+  // ref
+  ref,
+  unref,
+  toRef,
+  toRefs,
+  isRef,
+  customRef,
+  shallowRef,
+  triggerRef,
+  // computed
+  computed,
+  // instance
+  getCurrentInstance
+} from 'vue'
+
+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,6 +1,7 @@
 import builtInKeysMap from '../builtInKeysMap'
 import mergeOptions from '../../../core/mergeOptions'
-import MPXProxy from '../../../core/proxy'
+import { getCurrentInstance as getCurrentVueInstance } from '../../export/index'
+import MpxProxy, { setCurrentInstance, unsetCurrentInstance } from '../../../core/proxy'
 import { diffAndCloneA } from '@mpxjs/utils'
 import { UPDATED, CREATED, MOUNTED, UNMOUNTED } from '../../../core/innerLifecycle'
 
@@ -28,11 +29,32 @@ function initProxy (context, rawOptions) {
   // 缓存options
   context.$rawOptions = rawOptions
   // 创建proxy对象
-  context.__mpxProxy = new MPXProxy(rawOptions, context)
+  context.__mpxProxy = new MpxProxy(rawOptions, context)
   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 instance = getCurrentVueInstance().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 hookNames = type === 'page' ? ['onLoad', 'onReady', 'onUnload'] : ['created', 'mounted', 'unmounted']
   const rootMixins = [{
     [hookNames[0]] (...params) {