diff --git a/src/core/view/components/button/index.vue b/src/core/view/components/button/index.vue index 63bf0f12019294f709a80a71200bf0ed205dcd3c..610e3e47d82791348a6f7a717aab5e95a638c136 100644 --- a/src/core/view/components/button/index.vue +++ b/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: { diff --git a/src/core/view/components/navigator/index.vue b/src/core/view/components/navigator/index.vue index 164daae39e3aec5a994afcdb932e1f0de47c99d9..c586df8969757a69a54b6250a43af5dab7d89c50 100644 --- a/src/core/view/components/navigator/index.vue +++ b/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 } }, diff --git a/src/platforms/app-plus-nvue/runtime/components/button.js b/src/platforms/app-plus-nvue/runtime/components/button.js index bf1860fe986c285d88d2b653036034e0560cc38a..98c5d811d95e7a4261cef4dc7123ab612ae14101 100644 --- a/src/platforms/app-plus-nvue/runtime/components/button.js +++ b/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: { diff --git a/src/platforms/app-plus-nvue/runtime/components/navigator.js b/src/platforms/app-plus-nvue/runtime/components/navigator.js index b65ddcf3b62dd4af9ffdd23397d003fa25c08b50..0cfaeb69c7cffa9ae4f1101973c89facb15e7743 100644 --- a/src/platforms/app-plus-nvue/runtime/components/navigator.js +++ b/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 } }, diff --git a/src/platforms/app-plus/view/components/web-view/index.vue b/src/platforms/app-plus/view/components/web-view/index.vue index 64277c8d3e0ac472de1b584beebb6c17f3119582..42accb630b92b6fa77bd3227486730f774a1c19e 100644 --- a/src/platforms/app-plus/view/components/web-view/index.vue +++ b/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)