Merge pull request #386 from Meituan-Dianping/develop

1.0.10

Author: aOrz

src/platforms/mp/compiler/codegen/convert/attrs.js

@@ -51,7 +51,7 @@ export default {
         })
       } else if (key === 'v-html') {
         ast.tag = 'rich-text'
-        attrs['nodes'] = '{{' + val + '}}'
+        attrs['nodes'] = `{{${val}}}`
       } else if (key === 'v-show') {
         attrs['hidden'] = `{{!(${val})}}`
       } else if (/^v\-on\:/i.test(key)) {

src/platforms/mp/runtime/events.js

@@ -99,11 +99,16 @@ export function handleProxyWithVue (e) {
   // https://developer.mozilla.org/zh-CN/docs/Web/API/Event
   if (handles.length) {
     const event = getWebEventByMP(e)
+    if (handles.length === 1) {
+      const result = handles[0](event)
+      return result
+    }
     handles.forEach(h => h(event))
   } else {
+    // TODO, 在初始化时进行判断或直接使用 vue 本身的错误提示
     const { route } = rootVueVM.$mp.page
     console.group(new Date() + ' 事件警告')
-    console.warn(`Do not have handler in current page: ${route}. Please make sure that handler has been defined in ${route}, or ${route} has been added into app.json`)
+    console.warn(`Do not have handler in current page: ${route}. Please make sure that handler has been defined in ${route}, or not use handler with 'v-if'`)
     console.groupEnd()
   }
 }

src/platforms/mp/runtime/lifecycle.js

@@ -2,7 +2,7 @@ import { handleError } from '../../../core/util/index'
 
 export function callHook (vm, hook, params) {
   let handlers = vm.$options[hook]
-  if (hook === 'onError') {
+  if (hook === 'onError' && handlers) {
     handlers = [handlers]
   }
 
@@ -70,7 +70,7 @@ export function initMP (mpType, next) {
       },
 
       handleProxy (e) {
-        rootVueVM.$handleProxyWithVue(e)
+        return rootVueVM.$handleProxyWithVue(e)
       },
 
       // Do something initial when launch.
@@ -107,7 +107,7 @@ export function initMP (mpType, next) {
       },
       methods: {
         handleProxy (e) {
-          rootVueVM.$handleProxyWithVue(e)
+          return rootVueVM.$handleProxyWithVue(e)
         }
       },
       // mp lifecycle for vue
@@ -152,7 +152,7 @@ export function initMP (mpType, next) {
       },
 
       handleProxy (e) {
-        rootVueVM.$handleProxyWithVue(e)
+        return rootVueVM.$handleProxyWithVue(e)
       },
 
       // mp lifecycle for vue