Merge pull request #191 from hwaphon/feature/tab-bar-enhanced

feat(plugin-compiler-web & runtime-web): 转 web 时兼容 tabbar 的微信使用场景
eleme · Apr 26, 2024 · 7f7c4cc · 7f7c4cc
2 parents be0cd31 + fa15499
commit 7f7c4cc
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 16 deletions.
diff --git a/packages/plugin-compiler-web/src/plugins/generateJSXEntryPlugin.ts b/packages/plugin-compiler-web/src/plugins/generateJSXEntryPlugin.ts
@@ -15,6 +15,7 @@ import {
   WebCompilerUserConfig,
   WEB_RUNTIMES
 } from '../constants'
+import { getValueByOrder } from '../utils'
 
 // Web 的运行时配置，主要用于指定路由和 tabBar 等
 interface WebRuntimeConfig {
@@ -290,26 +291,53 @@ export class GenerateJSXEntryPlugin implements Plugin {
 
       // 设置底部导航栏
       if (appJson.tabBar) {
-        // 修复 items 中的路径问题
-        if (appJson.tabBar.items) {
-          ;(appJson.tabBar as WebRuntimeConfig['tabBar']).items.map((item) => {
-            if (item.activeIcon || item.selectedIconPath) {
-              item.activeIcon = addLeadingSlash(
-                item.activeIcon || item.selectedIconPath
-              )
-            }
-            if (item.icon || item.iconPath) {
-              item.icon = addLeadingSlash(item.icon || item.iconPath)
+        const initializeTabItem = (list) => {
+          return list.map((item) => {
+            const resItem = {}
+
+            const withLeadingSlashItem = {
+              activeIcon: getValueByOrder(item, [
+                'activeIcon',
+                'selectedIconPath'
+              ]),
+              icon: getValueByOrder(item, ['icon', 'iconPath']),
+              pagePath: getValueByOrder(item, ['pagePath'])
             }
-            if (item.pagePath) {
-              item.pagePath = addLeadingSlash(item.pagePath)
-            }
-            if (item.name || item.text) {
-              item.name = item.name || item.text
+            const commonItem = {
+              name: getValueByOrder(item, ['name', 'text'])
             }
+
+            Object.keys(withLeadingSlashItem).map((key) => {
+              const value = withLeadingSlashItem[key]
+              if (value) resItem[key] = addLeadingSlash(value)
+            })
+
+            Object.keys(commonItem).map((key) => {
+              const value = commonItem[key]
+              if (value) resItem[key] = value
+            })
+
+            return resItem
           })
         }
 
+        // 默认文字颜色
+        const textColor = getValueByOrder(appJson.tabBar, [
+          'textColor',
+          'color'
+        ])
+        if (textColor) appJson.tabBar.textColor = textColor
+
+        // 修复 items 中的路径问题
+        if (appJson.tabBar.items) {
+          appJson.tabBar.items = initializeTabItem(appJson.tabBar.items)
+        } else if (appJson.tabBar.list) {
+          // 兼容微信转 web 使用场景
+          const items = appJson.tabBar.list
+          delete appJson.tabBar.list
+          appJson.tabBar.items = initializeTabItem(items)
+        }
+
         webRuntimeConfig.tabBar = appJson.tabBar
       }
 

diff --git a/packages/plugin-compiler-web/src/utils/index.ts b/packages/plugin-compiler-web/src/utils/index.ts
@@ -13,3 +13,19 @@ export function getRelativePath(path) {
 export const isObject = (param) => {
   return Object.prototype.toString.call(param) === '[object Object]'
 }
+
+export const getValueByOrder = (obj, props) => {
+  if (!isObject(obj)) return
+  const { length } = props
+  let result
+
+  for (let i = 0; i < length; i++) {
+    const prop = props[i]
+    if (obj[prop]) {
+      result = obj[prop]
+      break
+    }
+  }
+
+  return result
+}
diff --git a/packages/runtime-web/src/components/src/base/tabbar-item.ts b/packages/runtime-web/src/components/src/base/tabbar-item.ts
@@ -126,7 +126,9 @@ export default class TabbarItem extends BaseElement {
         <div
           style=${styleMap({ display: 'inline-block', position: 'relative' })}
         >
-          <img src="${this.icon}" alt="" class="tiga-tabbar__icon" />
+          ${this.icon
+            ? html`<img src="${this.icon}" alt="" class="tiga-tabbar__icon" />`
+            : ''}
           ${this.badgeText
             ? html` <span class="tiga-badge" style=${styleMap(this.badgeStyle)}>
                 ${this.badgeText}