Merge branch 'dev' into alpha

# Conflicts:
#	packages/uni-app-plus/dist/view.umd.min.js

packages/vue-cli-plugin-uni/commands/serve.js

@@ -195,7 +195,10 @@ module.exports = (api, options) => {
       })
     }
 
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
+      const {
+        runByHBuilderX
+      } = require('@dcloudio/uni-cli-shared')
       // log instructions & open browser on first compilation complete
       let isFirstCompile = true
       compiler.hooks.done.tap('vue-cli-service uni-serve', stats => {
@@ -212,14 +215,17 @@ module.exports = (api, options) => {
         const networkUrl = publicUrl
           ? publicUrl.replace(/([^/])$/, '$1/')
           : urls.lanUrlForTerminal
-
-        console.log()
-        console.log(`  App running at:`)
-        console.log(
+        const printRunningAt = !runByHBuilderX || (runByHBuilderX && isFirstCompile)
+        printRunningAt && console.log()
+        printRunningAt && console.log(`  App running at:`)
+        printRunningAt && console.log(
           `  - Local:   ${chalk.cyan(urls.localUrlForTerminal)} ${copied}`
-        )
+        )
+        if (!printRunningAt) {
+          console.log(`Build complete. Watching for changes...`)
+        }
         if (!isInContainer) {
-          console.log(`  - Network: ${chalk.cyan(networkUrl)}`)
+          printRunningAt && console.log(`  - Network: ${chalk.cyan(networkUrl)}`)
         } else {
           console.log()
           console.log(chalk.yellow(

src/platforms/app-plus/view/framework/plugins/event.js

@@ -33,7 +33,7 @@ export function initEvent (Vue) {
 
     const currentTarget = $vueEvent.$origCurrentTarget || $vueEvent.currentTarget
     // 当自定义组件根节点触发事件时，nid 补充前缀，避免与组件内部 nid 冲突(根组件page不需要)
-    const nid = ((currentTarget === this.$el && this.mpType !== 'page') ? 'r-' : '') + $event.options.nid
+    const nid = ((currentTarget === this.$el && this.$options.mpType !== 'page') ? 'r-' : '') + $event.options.nid
     if (typeof nid === 'undefined') {
       return console.error(`[${cid}] nid not found`)
     }