From 6725b1649ca2b7f3fab5f2a90a9f4d08b4661eeb Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Mon, 4 Aug 2025 10:53:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor(tabbar):=20=E9=87=8D=E6=9E=84tabbar?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=80=BB=E8=BE=91=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将cacheTabbarEnable重命名为tabbarCacheEnable以提高可读性
新增customTabbarEnable和nativeTabbarNeedHide变量以明确功能
简化index.vue中的条件判断逻辑
---
 src/tabbar/config.ts | 11 +++++++++--
 src/tabbar/index.vue | 11 +++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/tabbar/config.ts b/src/tabbar/config.ts
index 91ad836..3ef1e10 100644
--- a/src/tabbar/config.ts
+++ b/src/tabbar/config.ts
@@ -63,9 +63,16 @@ export const tabbarList: FgTabBarItem[] = [
 ]
 
 // NATIVE_TABBAR(1) 和 CUSTOM_TABBAR_WITH_CACHE(2) 时，需要tabbar缓存
-export const cacheTabbarEnable = selectedTabbarStrategy === TABBAR_MAP.NATIVE_TABBAR
+export const tabbarCacheEnable = selectedTabbarStrategy === TABBAR_MAP.NATIVE_TABBAR
   || selectedTabbarStrategy === TABBAR_MAP.CUSTOM_TABBAR_WITH_CACHE
 
+// CUSTOM_TABBAR_WITH_CACHE(2) 和 CUSTOM_TABBAR_WITHOUT_CACHE(3) 时，启用自定义tabbar
+export const customTabbarEnable = selectedTabbarStrategy === TABBAR_MAP.CUSTOM_TABBAR_WITH_CACHE
+  || selectedTabbarStrategy === TABBAR_MAP.CUSTOM_TABBAR_WITHOUT_CACHE
+
+// CUSTOM_TABBAR_WITH_CACHE(2)时，需要隐藏原生tabbar
+export const nativeTabbarNeedHide = selectedTabbarStrategy === TABBAR_MAP.CUSTOM_TABBAR_WITH_CACHE
+
 const _tabbar: TabBar = {
   // 只有微信小程序支持 custom。App 和 H5 不生效
   custom: selectedTabbarStrategy === TABBAR_MAP.CUSTOM_TABBAR_WITH_CACHE,
@@ -81,4 +88,4 @@ const _tabbar: TabBar = {
 }
 
 // 0和1 需要显示底部的tabbar的各种配置，以利用缓存
-export const tabBar = cacheTabbarEnable ? _tabbar : undefined
+export const tabBar = tabbarCacheEnable ? _tabbar : undefined
diff --git a/src/tabbar/index.vue b/src/tabbar/index.vue
index a785595..ff96e7e 100644
--- a/src/tabbar/index.vue
+++ b/src/tabbar/index.vue
@@ -1,18 +1,14 @@
 <script setup lang="ts">
 // 'i-carbon-code',
-import { tabbarList as _tabBarList, cacheTabbarEnable, selectedTabbarStrategy, TABBAR_MAP } from './config'
+import { tabbarList as _tabBarList, customTabbarEnable, nativeTabbarNeedHide, tabbarCacheEnable } from './config'
 import { tabbarStore } from './store'
 
-const customTabbarEnable
-= selectedTabbarStrategy === TABBAR_MAP.CUSTOM_TABBAR_WITH_CACHE
-  || selectedTabbarStrategy === TABBAR_MAP.CUSTOM_TABBAR_WITHOUT_CACHE
-
 /** tabbarList 里面的 path 从 pages.config.ts 得到 */
 const tabbarList = _tabBarList.map(item => ({ ...item, path: `/${item.pagePath}` }))
 function selectTabBar({ value: index }: { value: number }) {
   const url = tabbarList[index].path
   tabbarStore.setCurIdx(index)
-  if (cacheTabbarEnable) {
+  if (tabbarCacheEnable) {
     uni.switchTab({ url })
   }
   else {
@@ -21,8 +17,7 @@ function selectTabBar({ value: index }: { value: number }) {
 }
 onLoad(() => {
   // 解决原生 tabBar 未隐藏导致有2个 tabBar 的问题
-  const hideRedundantTabbarEnable = selectedTabbarStrategy === TABBAR_MAP.CUSTOM_TABBAR_WITH_CACHE
-  hideRedundantTabbarEnable
+  nativeTabbarNeedHide
   && uni.hideTabBar({
     fail(err) {
       console.log('hideTabBar fail: ', err)