fix(runtime): 支持 vue-class-component

packages/uni-mp-weixin/dist/index.js

@@ -279,14 +279,10 @@ function initMocks (vm) {
   });
 }
 
-function initHooks (mpOptions, hooks, delay = false) {
+function initHooks (mpOptions, hooks) {
   hooks.forEach(hook => {
     mpOptions[hook] = function (args) {
-      if (delay) {
-        setTimeout(() => this.$vm.__call_hook(hook, args));
-      } else {
-        this.$vm.__call_hook(hook, args);
-      }
+      this.$vm.__call_hook(hook, args);
     };
   });
 }
@@ -476,8 +472,7 @@ const hooks = [
   'onPageNotFound'
 ];
 
-function createApp (vueOptions) {
-  vueOptions = vueOptions.default || vueOptions;
+function createApp (vm) {
   // 外部初始化时 Vue 还未初始化，放到 createApp 内部初始化 mixin
   Vue.mixin({
     beforeCreate () {
@@ -505,21 +500,20 @@ function createApp (vueOptions) {
 
   const appOptions = {
     onLaunch (args) {
-      this.$vm = new Vue(Object.assign(vueOptions, {
-        mpType: 'app',
-        mpInstance: this
-      }));
+      this.$vm = vm;
 
-      this.$vm.$mount();
-      setTimeout(() => this.$vm.__call_hook('onLaunch', args));
+      this.$vm._isMounted = true;
+      this.$vm.__call_hook('mounted');
+
+      this.$vm.__call_hook('onLaunch', args);
     }
   };
 
-  initHooks(appOptions, hooks, true); // 延迟执行，因为 App 的注册在 main.js 之前，可能导致生命周期内 Vue 原型上开发者注册的属性无法访问
+  initHooks(appOptions, hooks); // 延迟执行，因为 App 的注册在 main.js 之前，可能导致生命周期内 Vue 原型上开发者注册的属性无法访问
 
   App(appOptions);
 
-  return vueOptions
+  return vm
 }
 
 function triggerLink (mpInstance, vueOptions) {
@@ -562,14 +556,21 @@ const hooks$1 = [
 
 function createPage (vueOptions) {
   vueOptions = vueOptions.default || vueOptions;
+  let VueComponent;
+  if (isFn(vueOptions)) {
+    VueComponent = vueOptions;
+    vueOptions = VueComponent.extendOptions;
+  } else {
+    VueComponent = Vue.extend(vueOptions);
+  }
   const pageOptions = {
     data: getData(vueOptions, Vue.prototype),
     onLoad (args) {
 
-      this.$vm = new Vue(Object.assign(vueOptions, {
+      this.$vm = new VueComponent({
         mpType: 'page',
         mpInstance: this
-      }));
+      });
 
       this.$vm.__call_hook('created');
       this.$vm.__call_hook('onLoad', args); // 开发者可能会在 onLoad 时赋值，提前到 mount 之前

packages/uni-mp-weixin/package.json

 {
 	"name": "@dcloudio/uni-mp-weixin",
-	"version": "0.0.915",
+	"version": "0.0.916",
 	"description": "uni-app mp-weixin",
 	"main": "dist/index.js",
 	"scripts": {

src/core/runtime/wrapper/create-app.js

@@ -13,8 +13,7 @@ const hooks = [
   'onPageNotFound'
 ]
 
-export function createApp (vueOptions) {
-  vueOptions = vueOptions.default || vueOptions
+export function createApp (vm) {
   // 外部初始化时 Vue 还未初始化，放到 createApp 内部初始化 mixin
   Vue.mixin({
     beforeCreate () {
@@ -42,19 +41,18 @@ export function createApp (vueOptions) {
 
   const appOptions = {
     onLaunch (args) {
-      this.$vm = new Vue(Object.assign(vueOptions, {
-        mpType: 'app',
-        mpInstance: this
-      }))
+      this.$vm = vm
 
-      this.$vm.$mount()
-      setTimeout(() => this.$vm.__call_hook('onLaunch', args))
+      this.$vm._isMounted = true
+      this.$vm.__call_hook('mounted')
+
+      this.$vm.__call_hook('onLaunch', args)
     }
   }
 
-  initHooks(appOptions, hooks, true) // 延迟执行，因为 App 的注册在 main.js 之前，可能导致生命周期内 Vue 原型上开发者注册的属性无法访问
+  initHooks(appOptions, hooks) // 延迟执行，因为 App 的注册在 main.js 之前，可能导致生命周期内 Vue 原型上开发者注册的属性无法访问
 
   App(appOptions)
 
-  return vueOptions
+  return vm
 }

src/core/runtime/wrapper/create-page.js

 import Vue from 'vue'
 
+import {
+  isFn
+} from 'uni-shared'
+
 import {
   handleLink
 } from 'uni-platform/runtime/wrapper/index'
@@ -29,6 +33,13 @@ const hooks = [
 
 export function createPage (vueOptions) {
   vueOptions = vueOptions.default || vueOptions
+  let VueComponent
+  if (isFn(vueOptions)) {
+    VueComponent = vueOptions
+    vueOptions = VueComponent.extendOptions
+  } else {
+    VueComponent = Vue.extend(vueOptions)
+  }
   const pageOptions = {
     data: getData(vueOptions, Vue.prototype),
     onLoad (args) {
@@ -36,10 +47,10 @@ export function createPage (vueOptions) {
         this.$baiduComponentInstances = Object.create(null)
       }
 
-      this.$vm = new Vue(Object.assign(vueOptions, {
+      this.$vm = new VueComponent({
         mpType: 'page',
         mpInstance: this
-      }))
+      })
 
       this.$vm.__call_hook('created')
       this.$vm.__call_hook('onLoad', args) // 开发者可能会在 onLoad 时赋值，提前到 mount 之前

src/core/runtime/wrapper/util.js

@@ -16,14 +16,10 @@ export function initMocks (vm) {
   })
 }
 
-export function initHooks (mpOptions, hooks, delay = false) {
+export function initHooks (mpOptions, hooks) {
   hooks.forEach(hook => {
     mpOptions[hook] = function (args) {
-      if (delay) {
-        setTimeout(() => this.$vm.__call_hook(hook, args))
-      } else {
-        this.$vm.__call_hook(hook, args)
-      }
+      this.$vm.__call_hook(hook, args)
     }
   })
 }