Merge commit 'a725c04e'

lerna.json

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

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

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

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

@@ -1166,7 +1166,9 @@ function parseBaseApp (vm, {
         app: this
       };
 
-      this.$vm.$scope = this;
+      this.$vm.$scope = this;
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData;
 
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted', args);

packages/uni-app-plus/package.json

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

packages/uni-mp-alipay/dist/index.js

@@ -1558,7 +1558,9 @@ function parseBaseApp (vm, {
         app: this
       };
 
-      this.$vm.$scope = this;
+      this.$vm.$scope = this;
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData;
 
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted', args);

packages/uni-mp-alipay/package.json

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

packages/uni-mp-baidu/dist/index.js

@@ -1303,7 +1303,9 @@ function parseBaseApp (vm, {
         app: this
       };
 
-      this.$vm.$scope = this;
+      this.$vm.$scope = this;
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData;
 
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted', args);

packages/uni-mp-baidu/package.json

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

packages/uni-mp-qq/dist/index.js

@@ -1221,7 +1221,9 @@ function parseBaseApp (vm, {
         app: this
       };
 
-      this.$vm.$scope = this;
+      this.$vm.$scope = this;
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData;
 
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted', args);

packages/uni-mp-qq/package.json

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

packages/uni-mp-toutiao/dist/index.js

@@ -1313,7 +1313,9 @@ function parseBaseApp (vm, {
         app: this
       };
 
-      this.$vm.$scope = this;
+      this.$vm.$scope = this;
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData;
 
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted', args);

packages/uni-mp-toutiao/package.json

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

packages/uni-mp-weixin/dist/index.js

@@ -1166,7 +1166,9 @@ function parseBaseApp (vm, {
         app: this
       };
 
-      this.$vm.$scope = this;
+      this.$vm.$scope = this;
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData;
 
       this.$vm._isMounted = true;
       this.$vm.__call_hook('mounted', args);

packages/uni-mp-weixin/package.json

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

packages/uni-stat/package.json

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

packages/uni-template-compiler/package.json

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

packages/vue-cli-plugin-uni-optimize/packages/webpack-optimize-plugin/component.js

@@ -20,12 +20,12 @@ module.exports = function updateComponents(tags) {
   autoloadTags.root.forEach(tagName => {
     tags.add(tagName)
   })
-  tags = [...tags]
   Object.keys(autoloadTags.other).forEach(tagName => {
-    if (tags.includes(tagName)) {
-      tags.push(...autoloadTags.other[tagName])
+    if (tags.has(tagName)) {
+      autoloadTags.other[tagName].forEach(tag => tags.add(tag))
     }
   })
+  tags = [...tags]
   const importsStr = tags.map(tagName => {
     if (platformTags.indexOf(tagName) !== -1) {
       return `import ${capitalize(camelize(tagName))} from 'uni-platform/view/components/${tagName}'`

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

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

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

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

packages/webpack-uni-pages-loader/lib/util.js

@@ -16,7 +16,9 @@ const alipayWindowMap = {
   'backgroundColor': 'backgroundColor',
   'usingComponents': 'usingComponents',
   'navigationBarShadow': 'navigationBarShadow',
-  'titleImage': 'titleImage'
+  'titleImage': 'titleImage',
+  'transparentTitle': 'transparentTitle',
+  'titlePenetrate': 'titlePenetrate'
 }
 
 const alipayTabBarMap = {

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

 {
   "name": "@dcloudio/webpack-uni-pages-loader",
-  "version": "2.0.0-alpha-23620191020004",
+  "version": "2.0.0-23720191024001",
   "description": "uni-app pages.json loader",
   "main": "lib/index.js",
   "repository": {
@@ -21,7 +21,7 @@
     "strip-json-comments": "^2.0.1"
   },
   "uni-app": {
-    "compilerVersion": "2.3.6"
+    "compilerVersion": "2.3.7"
   },
   "gitHead": "5064652ab5aa907aedf637f163815660ecb8cfd9"
 }

src/platforms/h5/view/components/picker/index.vue

@@ -229,17 +229,6 @@ export default {
         this.valueSync = val
       }
     },
-    valueSync (value) {
-      if (this.valueChangeSource) {
-        this.$trigger(
-          'change',
-          {},
-          {
-            value
-          }
-        )
-      }
-    },
     valueArray (val) {
       if (this.mode === mode.TIME || this.mode === mode.DATE) {
         let getValue =
@@ -375,8 +364,19 @@ export default {
           valueArray = [...val]
           break
         case mode.TIME:
+          var timeValTestFail = false
+          if (typeof this.value !== 'string') {
+            timeValTestFail = true
+          } else {
+            val.split(':').map((val, i) => {
+              var valIndex = this.timeArray[i].indexOf(val)
+              if (valIndex === -1) {
+                timeValTestFail = true
+              }
+            })
+          }
           // 处理默认值为当前时间
-          if (this.value === 0) {
+          if (timeValTestFail) {
             val = formatDateTime({
               mode: mode.TIME
             })
@@ -386,8 +386,19 @@ export default {
             .map((val, i) => this.timeArray[i].indexOf(val))
           break
         case mode.DATE:
+          var dateValTestFail = false
+          if (typeof this.value !== 'string') {
+            dateValTestFail = true
+          } else {
+            val.split('-').map((val, i) => {
+              var valIndex = this.dateArray[i].indexOf(val)
+              if (valIndex === -1) {
+                dateValTestFail = true
+              }
+            })
+          }
           // 处理默认值为当前日期
-          if (this.value === 0) {
+          if (dateValTestFail) {
             val = formatDateTime({
               mode: mode.DATE
             })
@@ -422,6 +433,9 @@ export default {
       this.valueChangeSource = 'click'
       let value = this._getValue()
       this.valueSync = Array.isArray(value) ? value.map(val => val) : value
+      this.$trigger('change', {}, {
+        value
+      })
     },
     _cancel () {
       this._close()

src/platforms/mp-weixin/runtime/wrapper/app-base-parser.js

@@ -64,7 +64,9 @@ export default function parseBaseApp (vm, {
         app: this
       }
 
-      this.$vm.$scope = this
+      this.$vm.$scope = this
+      // vm 上也挂载 globalData
+      this.$vm.globalData = this.globalData
 
       this.$vm._isMounted = true
       this.$vm.__call_hook('mounted', args)