Merge branches 'alpha' and 'dev' of https://github.com/dcloudio/uni-app…

… into alpha
tfgzs · Oct 19, 2019 · b5aa4c8 · b5aa4c8
2 parents cc63209 + 82a32e1
commit b5aa4c8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js b/packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js
@@ -229,7 +229,9 @@ module.exports = function () {
     },
     resolveLoader: {
       alias: {
-        'babel-loader': require.resolve('babel-loader')
+        'babel-loader': require.resolve('babel-loader', {
+          paths: [require.resolve('@vue/cli-plugin-babel')]
+        })
       }
     },
     module: {

diff --git a/packages/webpack-uni-mp-loader/lib/plugin/generate-app.js b/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] = {

diff --git a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
@@ -394,7 +394,20 @@ module.exports = function (pagesJson, userManifestJson) {
     // 带 tab
     if (pagesJson.tabBar && pagesJson.tabBar.list && pagesJson.tabBar.list.length) {
       const tabBar = manifestJson.plus.tabBar = Object.assign({}, pagesJson.tabBar)
-      tabBar.borderStyle = tabBar.borderStyle === 'white' ? '#ffffff' : '#c6c6c6'
+      const borderStyles = {
+        black: 'rgba(0,0,0,0.8)',
+        white: 'rgba(255,255,255,0.8)'
+      }
+      let borderStyle = tabBar.borderStyle
+      if (!borderStyle) {
+        borderStyle = borderStyles.black
+      }
+      if (borderStyle in borderStyles) {
+        tabBar.borderStyle = borderStyles[borderStyle]
+      }
+      if (!tabBar.selectedColor) {
+        tabBar.selectedColor = '#0062cc'
+      }
       tabBar.height = `${parseFloat(tabBar.height) || TABBAR_HEIGHT}px`
       // 非纯 nvue 项目首页为 nvue 页面
       if (!process.env.UNI_USING_NATIVE && isNVueEntryPage) {

diff --git a/src/platforms/app-plus/service/framework/tab-bar.js b/src/platforms/app-plus/service/framework/tab-bar.js
@@ -7,7 +7,7 @@ import {
   requireNativePlugin
 } from '../bridge'
 
-const TABBAR_HEIGHT = 56
+const TABBAR_HEIGHT = 50
 
 let config
 
@@ -91,6 +91,7 @@ function showTabBar (animation) {
 }
 
 export default {
+  id: '0',
   init (options, clickCallback) {
     if (options && options.list.length) {
       config = options
@@ -101,7 +102,7 @@ export default {
       console.log(`uni.requireNativePlugin("uni-tabview") error ${error}`)
     }
     tabBar && tabBar.onClick(({ index }) => {
-      clickCallback(config.list[index], index, true)
+      clickCallback(config.list[index], index)
     })
     tabBar && tabBar.onMidButtonClick(() => {
       publish('onTabBarMidButtonTap', {})
@@ -146,5 +147,13 @@ export default {
   },
   get height () {
     return config && config.height ? parseFloat(config.height) : TABBAR_HEIGHT
+  },
+  setStyle ({ mask }) {
+    tabBar.setMask({
+      color: mask
+    })
+  },
+  addEventListener (name, callback) {
+    tabBar.onMaskClick(callback)
   }
 }