From 0f77ce9480c241a3d66480117ac2a503c0c4df10 Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Mon, 18 Aug 2025 17:09:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor(tabbar):=20=E6=B7=BB=E5=8A=A0=E4=B8=AD?=
 =?UTF-8?q?=E9=97=B4=E9=BC=93=E5=8C=85tabbarItem=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E5=A4=8D=E8=B7=AF=E5=BE=84=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重构tabbar配置逻辑，将鼓包功能开关和路径处理移至store模块
修复tabbar路径切换时的索引判断逻辑错误
---
 src/tabbar/index.vue | 16 ++--------------
 src/tabbar/store.ts  | 24 ++++++++++++++++++++----
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/tabbar/index.vue b/src/tabbar/index.vue
index 66ebad6..b0ede6f 100644
--- a/src/tabbar/index.vue
+++ b/src/tabbar/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 // 'i-carbon-code',
-import { tabbarList as _tabbarList, customTabbarEnable, needHideNativeTabbar, tabbarCacheEnable } from './config'
-import { tabbarStore } from './store'
+import { customTabbarEnable, needHideNativeTabbar, tabbarCacheEnable } from './config'
+import { tabbarList, tabbarStore } from './store'
 
 // #ifdef MP-WEIXIN
 // 将自定义节点设置成虚拟的（去掉自定义组件包裹层），更加接近Vue组件的表现，能更好的使用flex属性
@@ -10,8 +10,6 @@ defineOptions({
 })
 // #endif
 
-// TODO 1/2: 中间的鼓包tabbarItem的开关
-const BULGE_ENABLE = false
 /**
  * 中间的鼓包tabbarItem的点击事件
  */
@@ -22,16 +20,6 @@ function handleClickBulge() {
   })
 }
 
-/** tabbarList 里面的 path 从 pages.config.ts 得到 */
-const tabbarList = _tabbarList.map(item => ({ ...item, path: `/${item.pagePath}` }))
-if (BULGE_ENABLE) {
-  if (tabbarList.length % 2 === 1) {
-    console.error('tabbar 数量必须是偶数，否则样式很奇怪！！')
-  }
-  tabbarList.splice(tabbarList.length / 2, 0, {
-    isBulge: true,
-  } as any)
-}
 function handleClick(index: number) {
   // 点击原来的不做操作
   if (index === tabbarStore.curIdx) {
diff --git a/src/tabbar/store.ts b/src/tabbar/store.ts
index 897fb67..2feeea7 100644
--- a/src/tabbar/store.ts
+++ b/src/tabbar/store.ts
@@ -1,4 +1,20 @@
-import { tabbarList } from './config'
+import { tabbarList as _tabbarList } from './config'
+
+// TODO 1/2: 中间的鼓包tabbarItem的开关
+const BULGE_ENABLE = true
+
+/** tabbarList 里面的 path 从 pages.config.ts 得到 */
+const tabbarList = _tabbarList.map(item => ({ ...item, path: `/${item.pagePath}` }))
+if (BULGE_ENABLE) {
+  if (tabbarList.length % 2 === 1) {
+    console.error('tabbar 数量必须是偶数，否则样式很奇怪！！')
+  }
+  tabbarList.splice(tabbarList.length / 2, 0, {
+    isBulge: true,
+  } as any)
+}
+
+export { tabbarList }
 
 /**
  * 自定义 tabbar 的状态管理，原生 tabbar 无需关注本文件
@@ -16,11 +32,11 @@ export const tabbarStore = reactive({
     const index = tabbarList.findIndex(item => item.pagePath === path)
     // console.log('index:', index, path)
     // console.log('tabbarList:', tabbarList)
-    if (index !== -1) {
-      this.setCurIdx(index)
+    if (index === -1) {
+      this.setCurIdx(0)
     }
     else {
-      this.setCurIdx(0)
+      this.setCurIdx(index)
     }
   },
   restorePrevIdx() {