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

lerna.json

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

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

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

packages/uni-app-plus/dist/index.v3.js

@@ -5171,35 +5171,10 @@ var serviceContext = (function () {
     let result;
     const page = showPage({
       url: '__uniappchooselocation',
-      data: {
-        keyword: options.keyword
-      },
+      data: options,
       style: {
         animationType: options.animationType || 'slide-in-bottom',
-        titleNView: {
-          autoBackButton: false,
-          titleText: options.titleText || '选择位置',
-          titleColor: '#ffffff',
-          backgroundColor: 'rgba(0,0,0,1)',
-          buttons: [{
-            // text: options.cancelText || "取消",
-            // fontSize: "17px",
-            type: 'close',
-            float: 'left',
-            onclick: () => {
-              page.close();
-            }
-          }, {
-            text: options.doneText || '完成',
-            fontSize: '17px',
-            width: '60px',
-            onclick: () => {
-              page.sendMessage({
-                type: 'done'
-              });
-            }
-          }]
-        },
+        titleNView: false,
         popGesture: 'close',
         scrollIndicator: 'none'
       },
@@ -12242,7 +12217,9 @@ var serviceContext = (function () {
       disableScroll,
       onPageScroll,
       onPageReachBottom,
-      onReachBottomDistance
+      onReachBottomDistance,
+      windowTop: 0, // TODO
+      windowBottom: 0 // TODO
     }
   }
 

packages/uni-app-plus/package.json

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

packages/uni-cli-shared/package.json

 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "2.0.0-alpha-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "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-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "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-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "description": "uni-app h5",
   "main": "dist/index.umd.min.js",
   "repository": {

packages/uni-migration/package.json

 {
   "name": "@dcloudio/uni-migration",
-  "version": "2.0.0-alpha-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "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-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "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-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "description": "uni-app mp-baidu",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-qq/package.json

 {
   "name": "@dcloudio/uni-mp-qq",
-  "version": "2.0.0-alpha-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "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-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "description": "uni-app mp-toutiao",
   "main": "dist/index.js",
   "repository": {

packages/uni-mp-weixin/package.json

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

packages/uni-stat/package.json

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

packages/uni-template-compiler/package.json

 {
   "name": "@dcloudio/uni-template-compiler",
-  "version": "2.0.0-alpha-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "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-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "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-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "description": "uni-app optimize plugin for vue-cli 3",
   "main": "index.js",
   "repository": {

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

 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.0-alpha-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "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-24320191125001",
+    "@dcloudio/uni-stat": "^2.0.0-alpha-24320191125002",
     "buffer-json": "^2.0.0",
     "copy-webpack-plugin": "^4.6.0",
     "cross-env": "^5.2.0",

packages/vue-cli-plugin-uni/packages/app-vue-style-loader/lib/addStylesClient.js

@@ -226,13 +226,17 @@ var UPX_RE = /([+-]?\d+(\.\d+)?)[r|u]px/g
 var VAR_STATUS_BAR_HEIGHT = /var\(--status-bar-height\)/gi
 var VAR_WINDOW_TOP = /var\(--window-top\)/gi
 var VAR_WINDOW_BOTTOM = /var\(--window-bottom\)/gi
-
+
+var statusBarHeight = false
 function processCss(css) {
-	if (!uni.canIUse('css.var')) { //不支持 css 变量
+	if (!uni.canIUse('css.var')) { //不支持 css 变量
+    if (statusBarHeight === false) {
+      statusBarHeight = plus.navigator.getStatusbarHeight()
+    }
 		var offset = {
-            statusBarHeight: plus.navigator.getStatusbarHeight(),
-            top:0,
-            bottom:0
+            statusBarHeight: statusBarHeight,
+            top: window.__WINDOW_TOP || 0,
+            bottom: window.__WINDOW_BOTTOM || 0
         }
 		css = css.replace(VAR_STATUS_BAR_HEIGHT, offset.statusBarHeight + 'px')
 			.replace(VAR_WINDOW_TOP, offset.top + 'px')
@@ -242,4 +246,4 @@ function processCss(css) {
 		.replace(UPX_RE, function(a, b) {
 			return uni.upx2px(b) + 'px'
 		})
-}
\ No newline at end of file
+}

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

 {
   "name": "@dcloudio/webpack-uni-mp-loader",
-  "version": "2.0.0-alpha-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "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-24320191125001",
+  "version": "2.0.0-alpha-24320191125002",
   "description": "uni-app pages.json loader",
   "main": "lib/index.js",
   "repository": {

src/platforms/app-plus/service/framework/plugins/lifecycle.js

@@ -37,7 +37,9 @@ function parsePageCreateOptions (vm, route) {
     disableScroll,
     onPageScroll,
     onPageReachBottom,
-    onReachBottomDistance
+    onReachBottomDistance,
+    windowTop: 0, // TODO
+    windowBottom: 0 // TODO
   }
 }
 

src/platforms/app-plus/view/bridge/subscribe/index.js

@@ -19,12 +19,37 @@ const passiveOptions = supportsPassive ? {
   passive: false
 } : false
 
+function onCssVar ({
+  windowTop,
+  windowBottom
+}) {
+  global.__WINDOW_TOP = windowTop
+  global.__WINDOW_BOTTOM = windowBottom
+  if (uni.canIUse('css.var')) {
+    const style = document.documentElement.style
+    style.setProperty('--window-top', windowTop + 'px')
+    style.setProperty('--window-bottom', windowBottom + 'px')
+    style.setProperty('--status-bar-height', plus.navigator.getStatusbarHeight() + 'px')
+    if (process.env.NODE_ENV !== 'production') {
+      console.log(`--window-top=${windowTop}`)
+      console.log(`--window-bottom=${windowBottom}`)
+    }
+  }
+}
+
 function onPageCreate ({
+  windowTop,
+  windowBottom,
   disableScroll,
   onPageScroll,
   onPageReachBottom,
   onReachBottomDistance
 }, pageId) {
+  onCssVar({
+    windowTop,
+    windowBottom
+  })
+
   if (disableScroll) {
     document.addEventListener('touchmove', disableScrollListener, passiveOptions)
   } else if (onPageScroll || onPageReachBottom) {