From 666dbce88a6ae0cdcc28e24db93246f3473cc5e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Tue, 15 Mar 2022 15:23:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96tabmenu=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/TabPage/index.vue | 31 +++++++++++--------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue
index a0f4414b6..ecaf79e13 100644
--- a/src/layout/components/TabPage/index.vue
+++ b/src/layout/components/TabPage/index.vue
@@ -9,15 +9,14 @@
 
     <div>
       <el-tabs
-        v-if="submenu.length > 0"
+        v-if="tabIndices.length > 0"
         slot="submenu"
         v-model="iActiveMenu"
         class="page-submenu"
         @tab-click="handleTabClick"
       >
-        <template v-for="item in submenu">
+        <template v-for="item in tabIndices">
           <el-tab-pane
-            v-if="checkShow(item)"
             :key="item.name"
             :label-content="item.labelContent"
             :name="item.name"
@@ -69,9 +68,12 @@ export default {
       }
     },
     tabIndices() {
-      const map = {}
-      this.submenu.forEach((v, i) => {
-        map[v.name] = i
+      const map = []
+      this.submenu.forEach((v) => {
+        const hidden = typeof v.hidden === 'function' ? v.hidden() : v.hidden
+        if (!hidden) {
+          map.push(v)
+        }
       })
       return map
     }
@@ -80,13 +82,6 @@ export default {
     this.iActiveMenu = this.getPropActiveTab()
   },
   methods: {
-    checkShow(item) {
-      let hidden = item.hidden
-      if (typeof hidden === 'function') {
-        hidden = hidden()
-      }
-      return !hidden
-    },
     handleTabClick(tab) {
       this.$emit('tab-click', tab)
       this.$emit('update:activeMenu', tab.name)
@@ -108,14 +103,16 @@ export default {
       ]
 
       for (const preTab of preActiveTabs) {
-        for (const tabName in this.tabIndices) {
-          if (preTab && tabName && preTab.toLowerCase() === tabName.toLowerCase()) {
-            return tabName
+        const currentTab = typeof preTab === 'object' ? preTab.name : preTab
+        for (const tabName of this.tabIndices) {
+          const currentTabName = tabName?.name || ''
+          if (currentTab && currentTabName && currentTab.toLowerCase() === currentTabName.toLowerCase()) {
+            return currentTabName
           }
         }
       }
 
-      activeTab = this.submenu[0].name
+      activeTab = this.tabIndices[0].name
       return activeTab
     }
   }