Merge branch 'alpha'

lerna.json

@@ -12,5 +12,5 @@
       "message": "chore(release): publish %s"
     }
   },
-  "version": "2.0.0-alpha-31920210707001"
+  "version": "2.0.0-31920210709003"
 }

packages/uni-app-plus-nvue/package.json

 {
   "name": "@dcloudio/uni-app-plus-nvue",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app app-plus-nvue",
   "main": "dist/index.js",
   "repository": {

packages/uni-app-plus/package.json

 {
   "name": "@dcloudio/uni-app-plus",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app app-plus",
   "main": "dist/index.js",
   "repository": {

packages/uni-automator/package.json

 {
   "name": "@dcloudio/uni-automator",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app automator",
   "main": "dist/index.js",
   "repository": {

packages/uni-cli-shared/package.json

 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-cli-shared",
   "main": "lib/index.js",
   "repository": {

packages/uni-h5-ui/package.json

 {
   "name": "@dcloudio/uni-h5-ui",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app h5 ui",
   "main": "dist/index.umd.min.js",
   "repository": {

packages/uni-h5/package.json

 {
   "name": "@dcloudio/uni-h5",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app h5",
   "main": "dist/index.umd.min.js",
   "repository": {

packages/uni-i18n/package.json

 {
   "name": "@dcloudio/uni-i18n",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "@dcloudio/uni-i18n",
   "main": "dist/uni-i18n.cjs.js",
   "module": "dist/uni-i18n.esm.js",

packages/uni-migration/package.json

 {
   "name": "@dcloudio/uni-migration",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app migration",
   "main": "lib/index.js",
   "repository": {

packages/uni-mp-alipay/package.json

 {
   "name": "@dcloudio/uni-mp-alipay",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app mp-alipay",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-baidu/package.json

 {
   "name": "@dcloudio/uni-mp-baidu",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app mp-baidu",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-kuaishou/package.json

 {
   "name": "@dcloudio/uni-mp-kuaishou",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app mp-kuaishou",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-qq/package.json

 {
   "name": "@dcloudio/uni-mp-qq",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app mp-qq",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-toutiao/package.json

 {
   "name": "@dcloudio/uni-mp-toutiao",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app mp-toutiao",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-vue/package.json

 {
   "name": "@dcloudio/uni-mp-vue",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "@dcloudio/uni-mp-vue",
   "main": "dist/vue.runtime.esm.js",
   "module": "dist/vue.runtime.esm.js",

packages/uni-mp-weixin/package.json

 {
   "name": "@dcloudio/uni-mp-weixin",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app mp-weixin",
   "main": "dist/index.js",
   "repository": {

packages/uni-quickapp-native/package.json

 {
   "name": "@dcloudio/uni-quickapp-native",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app quickapp-native",
   "main": "dist/vue.prod.js",
   "repository": {

packages/uni-quickapp-webview/package.json

 {
   "name": "@dcloudio/uni-quickapp-webview",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app quickapp-webview",
   "main": "dist/index.js",
   "repository": {

packages/uni-stat/package.json

 {
   "name": "@dcloudio/uni-stat",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "",
   "main": "dist/index.js",
   "repository": {

packages/uni-template-compiler/package.json

 {
   "name": "@dcloudio/uni-template-compiler",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-template-compiler",
   "main": "lib/index.js",
   "repository": {

packages/vue-cli-plugin-hbuilderx/package.json

 {
   "name": "@dcloudio/vue-cli-plugin-hbuilderx",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {

packages/vue-cli-plugin-uni-optimize/package.json

 {
   "name": "@dcloudio/vue-cli-plugin-uni-optimize",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app optimize plugin for vue-cli 3",
   "main": "index.js",
   "repository": {

packages/vue-cli-plugin-uni/lib/error-reporting.js

@@ -40,6 +40,12 @@ class ErrorReport {
     if (!this._shouldReport(err)) {
       return
     }
+
+    if (typeof err === 'object') {
+      try {
+        err = err.toString()
+      } catch (e) {}
+    }
 
     err = normalizePath(err) || ''
     err = err.replace(this._UNI_INPUT_DIR_REG, 'UNI_INPUT_DIR')
@@ -151,5 +157,5 @@ process
     global.__error_reporting__ && global.__error_reporting__('unhandledRejection', reason)
   })
   .on('uncaughtException', err => {
-    global.__error_reporting__ && global.__error_reporting__('uncaughtException', err)
+    global.__error_reporting__ && global.__error_reporting__('uncaughtException', err.stack)
   })

packages/vue-cli-plugin-uni/package.json

 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -17,7 +17,7 @@
   "author": "fxy060608",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dcloudio/uni-stat": "^2.0.0-alpha-31920210707001",
+    "@dcloudio/uni-stat": "^2.0.0-31920210709003",
     "buffer-json": "^2.0.0",
     "copy-webpack-plugin": "^5.1.1",
     "cross-env": "^5.2.0",

packages/webpack-uni-mp-loader/package.json

 {
   "name": "@dcloudio/webpack-uni-mp-loader",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "webpack-uni-mp-loader",
   "main": "index.js",
   "repository": {

packages/webpack-uni-pages-loader/package.json

 {
   "name": "@dcloudio/webpack-uni-pages-loader",
-  "version": "2.0.0-alpha-31920210707001",
+  "version": "2.0.0-31920210709003",
   "description": "uni-app pages.json loader",
   "main": "lib/index.js",
   "repository": {

src/core/view/mixins/keyboard.js

@@ -13,11 +13,6 @@ if (__PLATFORM__ === 'app-plus') {
   plusReady(() => {
     isAndroid = plus.os.name.toLowerCase() === 'android'
     osVersion = plus.os.version
-    // iOS 14.6 调用同步方法导致键盘弹卡顿
-    if (!isAndroid && parseFloat(osVersion) >= 14.6) {
-      const currentWebview = plus.webview.currentWebview()
-      webviewStyle = currentWebview.getStyle() || {}
-    }
   })
   document.addEventListener('keyboardchange', function (event) {
     keyboardHeight = event.height
@@ -160,13 +155,22 @@ export default {
             }
           })
         }
-        if (!isAndroid && parseInt(osVersion) < 12) {
+        if (!isAndroid) {
           // iOS12 以下系统 focus 事件设置较迟，改在 touchstart 设置
-          el.addEventListener('touchstart', () => {
-            if (!this.disabled && !focus) {
-              setSoftinputTemporary(this)
-            }
-          })
+          if (parseInt(osVersion) < 12) {
+            el.addEventListener('touchstart', () => {
+              if (!this.disabled && !focus) {
+                setSoftinputTemporary(this)
+              }
+            })
+          }
+          // iOS 14.6 调用同步方法导致键盘弹卡顿
+          if (parseFloat(osVersion) >= 14.6 && !webviewStyle) {
+            plusReady(() => {
+              const currentWebview = plus.webview.currentWebview()
+              webviewStyle = currentWebview.getStyle() || {}
+            })
+          }
         }
       }