From 7abc3166d27899367ee9f92bcee26214662f271c Mon Sep 17 00:00:00 2001
From: yuntian001 <yuntian001z@qq.com>
Date: Wed, 21 Jun 2023 15:39:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B6=85=E8=BF=87?=
 =?UTF-8?q?=E4=B8=89=E7=BA=A7=E7=9A=84=E8=8F=9C=E5=8D=95=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=AD=90=E5=85=83=E7=B4=A0=E6=97=B6=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8D=E6=8F=90=E5=8D=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/menu/components/menuItem.vue   | 59 +++++++++----------
 src/router/routes/1-dashboard.ts              | 18 ++++--
 types/auto-imports.d.ts                       |  1 -
 3 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/layout/components/menu/components/menuItem.vue b/src/layout/components/menu/components/menuItem.vue
index cd82ea92..7e748c2d 100644
--- a/src/layout/components/menu/components/menuItem.vue
+++ b/src/layout/components/menu/components/menuItem.vue
@@ -1,49 +1,46 @@
 <template>
-  <template v-if="!item.meta?.hideMenu">
-    <template
-      v-if="
-        onlyOneChild && (!onlyOneChild.children?.length || onlyOneChild.noShowingChildren) && !item.meta?.alwaysShow
-      "
-    >
+  <template v-if="menu">
+    <el-sub-menu v-if="menu.children?.length" :index="menu.path">
+      <template v-if="menu.meta" #title>
+        <component :is="menu.meta!.icon" v-if="menu.meta!.icon" />
+        <span class="menu">{{ $t(menu.meta!.title!) }}</span>
+      </template>
+      <layout-menu-item v-for="child in menu.children" :key="child.path" :item="child"></layout-menu-item>
+    </el-sub-menu>
+    <template v-else>
       <component
-        :is="onlyOneChild.meta?.isLink ? 'a' : 'routerLink'"
-        v-if="onlyOneChild.meta && onlyOneChild.meta.title"
-        :href="onlyOneChild.path"
-        :to="onlyOneChild.path"
+        :is="menu.meta?.isLink ? 'a' : 'routerLink'"
+        v-if="menu.meta && menu.meta.title"
+        :href="menu.path"
+        :to="menu.path"
       >
-        <el-menu-item :index="onlyOneChild.path" :title="$t(onlyOneChild.meta.title)">
-          <component :is="onlyOneChild.meta.icon" v-if="onlyOneChild.meta.icon" />
+        <el-menu-item :index="menu.path" :title="$t(menu.meta.title)">
+          <component :is="menu.meta.icon" v-if="menu.meta.icon" />
           <template #title>
-            <span class="menu">{{ $t(onlyOneChild.meta.title) }}</span>
+            <span class="menu">{{ $t(menu.meta.title) }}</span>
           </template>
         </el-menu-item>
       </component>
     </template>
-    <el-sub-menu v-else :index="item.path">
-      <template v-if="item.meta" #title>
-        <component :is="item.meta!.icon" v-if="item.meta!.icon" />
-        <span class="menu">{{ $t(item.meta!.title!) }}</span>
-      </template>
-      <layout-menu-item v-for="child in item.children" :key="child.path" :item="child"></layout-menu-item>
-    </el-sub-menu>
   </template>
 </template>
 
 <script setup lang="ts" name="MenuItem">
 import { RouteRecordRaw } from 'vue-router';
 const props = defineProps<{ item: RouteRecordRaw }>();
-let onlyOneChild = ref<RouteRecordRaw>();
-const hasOneShowingChild = (children = [] as RouteRecordRaw[], parent: RouteRecordRaw) => {
-  const showingChildren = children.filter((item) => item.meta && !item.meta.hideMenu);
-  if (showingChildren.length === 1) {
-    onlyOneChild.value = showingChildren[0];
-    return true;
+const menu = ref<RouteRecordRaw>();
+const getMenu = (item: RouteRecordRaw): RouteRecordRaw => {
+  if (!item.children?.length) {
+    return item;
   }
-  if (showingChildren.length === 0) {
-    onlyOneChild.value = { ...parent, noShowingChildren: true };
-    return true;
+  const children = item.children.filter((v) => v.meta && !v.meta.hideMenu);
+  const res = { ...item, children: children };
+  if (!item.meta?.alwaysShow && children.length === 1) {
+    return getMenu(children[0]);
   }
-  return false;
+  return res;
 };
-hasOneShowingChild(props.item.children, props.item);
+if (!props.item.meta?.hideMenu) {
+  menu.value = getMenu(props.item);
+}
 </script>
diff --git a/src/router/routes/1-dashboard.ts b/src/router/routes/1-dashboard.ts
index b82babef..815ffd31 100644
--- a/src/router/routes/1-dashboard.ts
+++ b/src/router/routes/1-dashboard.ts
@@ -5,11 +5,19 @@ import { concatObjectValue } from '@/utils/helper';
 export const routes: RouteRecordRaw[] = [
   {
     path: PageEnum.HOME,
-    redirect: PageEnum.HOME + '/index',
+    redirect: PageEnum.HOME + '/index1',
     component: Layout,
-    children: concatObjectValue<RouteRecordRaw>(
-      import.meta.glob('./dashboard/*.ts', { eager: true, import: 'routes' }),
-    ),
-    meta: { title: '' },
+    children: [
+      {
+        path: 'index1',
+        redirect: PageEnum.HOME + '/index1/index',
+        component: Layout,
+        children: concatObjectValue<RouteRecordRaw>(
+          import.meta.glob('./dashboard/*.ts', { eager: true, import: 'routes' }),
+        ),
+        meta: { title: '首页2' },
+      },
+    ],
+    meta: { title: '首页1' },
   },
 ];
diff --git a/types/auto-imports.d.ts b/types/auto-imports.d.ts
index 1d06c04e..1071a503 100644
--- a/types/auto-imports.d.ts
+++ b/types/auto-imports.d.ts
@@ -3,7 +3,6 @@ export {}
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
   const ElLoading: typeof import('element-plus/es')['ElLoading']
-  const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
   const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
   const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
   const autoResetRef: typeof import('@vueuse/core')['autoResetRef']