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

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/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 = {

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()