fix(h5): App.vue onError

wjb12 · Jul 13, 2019 · 74b6eb5 · 74b6eb5
1 parent 55d307b
commit 74b6eb5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/core/service/plugins/index.js b/src/core/service/plugins/index.js
@@ -1,9 +1,5 @@
 import VueRouter from 'vue-router'
 
-import {
-  isFn
-} from 'uni-shared'
-
 import {
   isPage
 } from 'uni-helpers'
@@ -59,7 +55,7 @@ function getLocation (base = '/') {
 export default {
   install (Vue, {
     routes
-  } = {}) {
+  } = {}) {
     lifecycleMixin(Vue)
 
     const minId = getMinId(routes)
@@ -106,11 +102,11 @@ export default {
     /* eslint-disable no-undef */
     if (__PLATFORM__ === 'h5') {
       if (entryRoute.meta && entryRoute.meta.name) {
-        document.body.className = 'uni-body ' + entryRoute.meta.name
-        if (entryRoute.meta.isNVue) {
-          const nvueDirKey = 'nvue-dir-' + __uniConfig.nvue['flex-direction']
-          document.body.setAttribute('nvue', '')
-          document.body.setAttribute(nvueDirKey, '')
+        document.body.className = 'uni-body ' + entryRoute.meta.name
+        if (entryRoute.meta.isNVue) {
+          const nvueDirKey = 'nvue-dir-' + __uniConfig.nvue['flex-direction']
+          document.body.setAttribute('nvue', '')
+          document.body.setAttribute(nvueDirKey, '')
         }
       }
     }
@@ -136,10 +132,10 @@ export default {
           options.router = router
 
           // onError
-          if (!isFn(options.onError)) {
-            options.onError = function (err) {
+          if (!Array.isArray(options.onError) || options.onError.length === 0) {
+            options.onError = [function (err) {
               console.error(err)
-            }
+            }]
           }
         } else if (isPage(this)) {
           const pageMixin = createPageMixin()

diff --git a/src/core/vue.js b/src/core/vue.js
@@ -23,5 +23,5 @@ Vue.config.getTagNamespace = function (tag) {
 }
 
 Vue.config.errorHandler = function (err, vm, info) {
-  console.error('errorHandler', err, vm, info)
+  UniServiceJSBridge.emit('onError', err)
 }