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

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-mp-loader/lib/plugin/generate-app.js

@@ -21,8 +21,7 @@ module.exports = function generateApp (compilation) {
     process.env.NODE_ENV === 'production' &&
     process.env.UNI_PLATFORM !== 'app-plus'
   ) {
-    const entryPage = Object.keys(process.UNI_ENTRY)[1]
-    const targetCssName = entryPage ? (entryPage + ext) : `common/main${ext}`
+    const targetCssName = `common/main${ext}`
 
     if (!compilation.assets[targetCssName]) {
       compilation.assets[targetCssName] = {
@@ -63,7 +62,7 @@ module.exports = function generateApp (compilation) {
   ) {
     const source =
       `
-  !function(){try{var r=Function("return this")();r&&!r.Math&&Object.assign(r,{Array:Array,Date:Date,Error:Error,Function:Function,Math:Math,Object:Object,RegExp:RegExp,String:String,TypeError:TypeError,setTimeout:setTimeout,clearTimeout:clearTimeout,setInterval:setInterval,clearInterval:clearInterval})}catch(r){}}();
+  !function(){try{var a=Function("return this")();a&&!a.Math&&(Object.assign(a,{Array:Array,Date:Date,Error:Error,Function:Function,Math:Math,Object:Object,RegExp:RegExp,String:String,TypeError:TypeError,setTimeout:setTimeout,clearTimeout:clearTimeout,setInterval:setInterval,clearInterval:clearInterval}),"undefined"!=typeof Reflect&&(a.Reflect=Reflect))}catch(a){}}();
   ${compilation.assets[runtimeJsPath].source()}
   `
     compilation.assets[runtimeJsPath] = {

packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js

@@ -400,17 +400,18 @@ module.exports = function (pagesJson, userManifestJson) {
     } else if (isNVueEntryPage) {
       // 非纯 nvue 项目首页为 nvue 页面
       manifestJson.plus.launchwebview.id = '2'
+      manifestJson.plus.launchwebview.render = 'always'
     }
     // 带 tab
     if (pagesJson.tabBar && pagesJson.tabBar.list && pagesJson.tabBar.list.length) {
       const tabBar = manifestJson.plus.tabBar = Object.assign({}, pagesJson.tabBar)
       const borderStyles = {
-        black: 'rgba(0,0,0,0.8)',
-        white: 'rgba(255,255,255,0.8)'
+        black: 'rgba(0,0,0,0.4)',
+        white: 'rgba(255,255,255,0.4)'
       }
       let borderStyle = tabBar.borderStyle
       if (!borderStyle) {
-        borderStyle = borderStyles.black
+        borderStyle = 'black'
       }
       if (borderStyle in borderStyles) {
         tabBar.borderStyle = borderStyles[borderStyle]

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/app-plus/service/api/ui/tab-bar.js

@@ -43,12 +43,27 @@ export function setTabBarStyle ({
       errMsg: 'setTabBarStyle:fail not TabBar page'
     }
   }
-  tabBar.setTabBarStyle({
-    color,
-    selectedColor,
-    backgroundColor,
-    borderStyle: borderStyle === 'white' ? '#ffffff' : '#c6c6c6'
-  })
+  const style = {}
+  const borderStyles = {
+    black: 'rgba(0,0,0,0.4)',
+    white: 'rgba(255,255,255,0.4)'
+  }
+  if (color) {
+    style.color = color
+  }
+  if (selectedColor) {
+    style.selectedColor = selectedColor
+  }
+  if (backgroundColor) {
+    style.backgroundColor = backgroundColor
+  }
+  if (borderStyle in borderStyles) {
+    borderStyle = borderStyles[borderStyle]
+  }
+  if (borderStyle) {
+    style.borderStyle = borderStyle
+  }
+  tabBar.setTabBarStyle(style)
   return {
     errMsg: 'setTabBarStyle:ok'
   }

src/platforms/app-plus/service/framework/tab-bar.js

@@ -50,17 +50,19 @@ function setTabBarBadge (type, index, text) {
  * 动态设置 tabBar 某一项的内容
  */
 function setTabBarItem (index, text, iconPath, selectedIconPath) {
-  const item = {}
+  const item = {
+    index
+  }
+  if (text !== undefined) {
+    item.text = text
+  }
   if (iconPath) {
     item.iconPath = getRealPath(iconPath)
   }
   if (selectedIconPath) {
     item.selectedIconPath = getRealPath(selectedIconPath)
   }
-  tabBar && tabBar.setTabBarItem(Object.assign({
-    index,
-    text
-  }, item))
+  tabBar && tabBar.setTabBarItem(item)
 }
 /**
  * 动态设置 tabBar 的整体样式

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