From 03ea4759af04aebe0ca45480627e6c8f2f4c46b8 Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Sun, 28 May 2023 14:22:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=96=E9=93=BE=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/admin/layout/components/Menu/item.vue  | 15 ++++++++++++---
 resources/admin/layout/components/Menu/menus.vue |  9 +--------
 resources/admin/router/guard/index.ts            |  1 +
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/resources/admin/layout/components/Menu/item.vue b/resources/admin/layout/components/Menu/item.vue
index 6b47aa3..d4f3c2e 100644
--- a/resources/admin/layout/components/Menu/item.vue
+++ b/resources/admin/layout/components/Menu/item.vue
@@ -13,13 +13,16 @@
     <el-icon>
       <Icon :name="menu?.meta?.icon" v-if="menu?.meta?.icon" class="text-sm" />
     </el-icon>
-    <span>{{ menu?.meta?.title }}</span>
+    <span v-if="menu?.path.indexOf('https://') !== -1 || menu?.path.indexOf('http://') !== -1">
+      <span @click="openUrl(menu?.path as string)">{{ menu?.meta?.title }}</span>
+    </span>
+    <span v-else>{{ menu?.meta?.title }}</span>
   </el-menu-item>
 </template>
 
-<script lang="ts" name="MenuItem" setup>
+<script lang="ts" setup>
 import { Menu } from '/admin/types/Menu'
-import { onMounted, PropType, ref } from 'vue'
+import { PropType } from 'vue'
 import { useAppStore } from '/admin/stores/modules/app'
 import { isMiniScreen } from '/admin/support/helper'
 
@@ -37,6 +40,12 @@ defineProps({
     require: true,
   },
 })
+
+const openUrl = (path: string) => {
+  const start = path.indexOf('https://') || path.indexOf('http://')
+  window.open(path.substring(start))
+  return false
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/resources/admin/layout/components/Menu/menus.vue b/resources/admin/layout/components/Menu/menus.vue
index b8482bd..eb511f7 100644
--- a/resources/admin/layout/components/Menu/menus.vue
+++ b/resources/admin/layout/components/Menu/menus.vue
@@ -7,22 +7,15 @@
     :collapse="!appStore.isExpand"
     :collapse-transition="false"
     :router="true"
-    @select="selectMenu"
     :unique-opened="true"
   >
     <slot />
   </el-menu>
 </template>
-<script lang="ts" setup name="menus">
+<script lang="ts" setup>
 import { useAppStore } from '/admin/stores/modules/app'
 
 const appStore = useAppStore()
-
-const selectMenu = (index: string) => {
-  if (index.startsWith('http') || index.startsWith('https')) {
-    window.open(index)
-  }
-}
 </script>
 
 <style scoped lang="scss">
diff --git a/resources/admin/router/guard/index.ts b/resources/admin/router/guard/index.ts
index 47f022c..dff2b68 100644
--- a/resources/admin/router/guard/index.ts
+++ b/resources/admin/router/guard/index.ts
@@ -49,6 +49,7 @@ const guard = (router: Router) => {
             }
             next({ ...to, replace: true })
           } catch (e) {
+            alert(e)
             removeAuthToken()
             next({ path: `${WhiteListPage.LOGIN_PATH}?redirect=/${to.path}` })
           }