Merge branch 'v3' of https://github.com/dcloudio/uni-app into v3

src/core/view/components/button/index.vue

@@ -25,11 +25,11 @@ export default {
       default: false
     },
     hoverStartTime: {
-      type: Number,
+      type: [Number, String],
       default: 20
     },
     hoverStayTime: {
-      type: Number,
+      type: [Number, String],
       default: 70
     },
     formType: {

src/core/view/components/navigator/index.vue

@@ -47,11 +47,11 @@ export default {
       default: 1
     },
     hoverStartTime: {
-      type: Number,
+      type: [Number, String],
       default: 20
     },
     hoverStayTime: {
-      type: Number,
+      type: [Number, String],
       default: 600
     }
   },

src/platforms/app-plus-nvue/runtime/components/button.js

@@ -41,11 +41,11 @@ function getButton (weex) {
         default: false
       },
       hoverStartTime: {
-        type: Number,
+        type: [Number, String],
         default: 20
       },
       hoverStayTime: {
-        type: Number,
+        type: [Number, String],
         default: 70
       },
       formType: {

src/platforms/app-plus-nvue/runtime/components/navigator.js

@@ -42,11 +42,11 @@ function getNavigator (weex, uni) {
         default: false
       },
       hoverStartTime: {
-        type: Number,
+        type: [Number, String],
         default: 50
       },
       hoverStayTime: {
-        type: Number,
+        type: [Number, String],
         default: 600
       }
     },

src/platforms/app-plus/view/components/web-view/index.vue

@@ -17,7 +17,11 @@ const insertHTMLWebView = ({
   }
   const parentTitleNView = parentWebview.getTitleNView()
   if (parentTitleNView) {
-    styles.top = 44 + plus.navigator.getStatusbarHeight()
+    if (plus.navigator.isImmersedStatusbar()) {
+      styles.top = 44 + plus.navigator.getStatusbarHeight()
+    } else {
+      styles.top = 44
+    }
     styles.bottom = 0
   }
   webview = plus.webview.create('', htmlId, styles)