From fb520e86666ee8fa7d71c2e2e37a0574c5f48df7 Mon Sep 17 00:00:00 2001
From: hooray <304327508@qq.com>
Date: Wed, 8 Dec 2021 10:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=90=AF=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=90=8C=E6=97=B6=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BD=86=E5=AD=90=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=98=AF=E5=A4=96=E9=93=BE=E6=97=B6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Search/index.vue      | 13 +++++------
 src/layout/components/SidebarItem/index.vue | 25 +++++----------------
 src/layout/index.vue                        |  7 +++++-
 src/store/modules/menu.js                   | 10 ++++-----
 src/util/index.js                           | 15 +++++++++++++
 5 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/layout/components/Search/index.vue b/src/layout/components/Search/index.vue
index e36abd40..fc5020a6 100644
--- a/src/layout/components/Search/index.vue
+++ b/src/layout/components/Search/index.vue
@@ -25,14 +25,14 @@
             </div>
             <div ref="search" class="result" :class="{'mobile': $store.state.settings.mode === 'mobile'}">
                 <router-link v-for="(item, index) in resultList" :key="item.path" v-slot="{ href, navigate }" custom :to="isShow ? item.path : ''">
-                    <a :ref="`search-item-${index}`" :href="isExternal(item.path) ? item.path : href" class="item" :class="{'actived': index === actived}" :target="isExternal(item.path) ? '_blank' : '_self'" @click="navigate" @mouseover="actived = index">
+                    <a :ref="`search-item-${index}`" :href="isExternalLink(item.path) ? item.path : href" class="item" :class="{'actived': index === actived}" :target="isExternalLink(item.path) ? '_blank' : '_self'" @click="navigate" @mouseover="actived = index">
                         <div class="icon">
                             <svg-icon v-if="item.icon" :name="item.icon" />
                         </div>
                         <div class="info">
                             <div class="title">
                                 {{ item.title }}
-                                <svg-icon v-if="item.isExternal" name="external-link" />
+                                <svg-icon v-if="item.isExternalLink" name="external-link" />
                             </div>
                             <div class="breadcrumb">
                                 <span v-for="(bc, bcIndex) in item.breadcrumb" :key="bcIndex">
@@ -50,7 +50,7 @@
 </template>
 
 <script setup>
-import { deepClone } from '@/util'
+import { deepClone, isExternalLink } from '@/util'
 
 const { proxy } = getCurrentInstance()
 const store = useStore()
@@ -120,9 +120,6 @@ onMounted(() => {
     })
 })
 
-function isExternal(path) {
-    return /^(https?:|mailto:|tel:)/.test(path)
-}
 function hasChildren(item) {
     let flag = true
     if (item.children) {
@@ -154,7 +151,7 @@ function getSourceList(arr) {
                 }
                 breadcrumb.push(item.meta.title)
                 let path = ''
-                if (isExternal(item.path)) {
+                if (isExternalLink(item.path)) {
                     path = item.path
                 } else {
                     path = item.meta.basePath ? [item.meta.basePath, item.path].join('/') : item.path
@@ -165,7 +162,7 @@ function getSourceList(arr) {
                     i18n: item.meta.i18n,
                     breadcrumb: breadcrumb,
                     path: path,
-                    isExternal: isExternal(item.path)
+                    isExternalLink: isExternalLink(item.path)
                 })
             }
         }
diff --git a/src/layout/components/SidebarItem/index.vue b/src/layout/components/SidebarItem/index.vue
index 32cb38c4..2484bcde 100644
--- a/src/layout/components/SidebarItem/index.vue
+++ b/src/layout/components/SidebarItem/index.vue
@@ -7,27 +7,27 @@
             </template>
             <SidebarItem v-for="route in item.children" :key="route.path" :item="route" />
         </el-sub-menu>
-        <router-link v-else-if="!hasChildren" v-slot="{ href, navigate, isActive, isExactActive }" custom :to="resolvePath(item.path)">
-            <a :href="isExternal(resolvePath(item.path)) ? resolvePath(item.path) : href" :class="[isActive && 'router-link-active', isExactActive && 'router-link-exact-active']" :target="isExternal(resolvePath(item.path)) ? '_blank' : '_self'" @click="navigate">
-                <el-menu-item :title="item.meta.title" :index="resolvePath(item.path)">
+        <router-link v-else-if="!hasChildren" v-slot="{ href, navigate, isActive, isExactActive }" custom :to="resolveRoutePath(basePath, item.path)">
+            <a :href="isExternalLink(resolveRoutePath(basePath, item.path)) ? resolveRoutePath(basePath, item.path) : href" :class="[isActive && 'router-link-active', isExactActive && 'router-link-exact-active']" :target="isExternalLink(resolveRoutePath(basePath, item.path)) ? '_blank' : '_self'" @click="navigate">
+                <el-menu-item :title="item.meta.title" :index="resolveRoutePath(basePath, item.path)">
                     <svg-icon v-if="item.meta.icon" :name="item.meta.icon" class="icon" />
                     <span class="title">{{ item.meta.title }}</span>
                 </el-menu-item>
             </a>
         </router-link>
-        <el-sub-menu v-else :title="item.meta.title" :index="resolvePath(item.path)">
+        <el-sub-menu v-else :title="item.meta.title" :index="resolveRoutePath(basePath, item.path)">
             <template #title>
                 <svg-icon v-if="item.meta.icon" :name="item.meta.icon" class="icon" />
                 <span class="title">{{ item.meta.title }}</span>
             </template>
-            <SidebarItem v-for="route in item.children" :key="route.path" :item="route" :base-path="resolvePath(item.path)" />
+            <SidebarItem v-for="route in item.children" :key="route.path" :item="route" :base-path="resolveRoutePath(basePath, item.path)" />
         </el-sub-menu>
     </div>
 </template>
 
 <script setup>
 import SidebarItem from './index.vue'
-import path from 'path-browserify'
+import { isExternalLink, resolveRoutePath } from '@/util'
 
 const props = defineProps({
     item: {
@@ -51,19 +51,6 @@ const hasChildren = computed(() => {
     }
     return flag
 })
-
-function isExternal(path) {
-    return /^(https?:|mailto:|tel:)/.test(path)
-}
-function resolvePath(routePath) {
-    if (isExternal(routePath)) {
-        return routePath
-    }
-    if (isExternal(props.basePath)) {
-        return props.basePath
-    }
-    return props.basePath ? path.resolve(props.basePath, routePath) : routePath
-}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 6ed8b60b..4aa1937f 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -36,6 +36,7 @@ import SubSidebar from './components/SubSidebar/index.vue'
 import Topbar from './components/Topbar/index.vue'
 import Search from './components/Search/index.vue'
 import ThemeSetting from './components/ThemeSetting/index.vue'
+import { isExternalLink } from '@/util'
 
 const { proxy } = getCurrentInstance()
 const store = useStore()
@@ -82,7 +83,11 @@ provide('switchMenu', switchMenu)
 function switchMenu(index) {
     store.commit('menu/switchHeaderActived', index)
     if (store.state.settings.switchSidebarAndPageJump) {
-        router.push(store.getters['menu/sidebarRoutesFirstDeepestPath'])
+        if (isExternalLink(store.getters['menu/sidebarRoutesFirstDeepestPath'])) {
+            window.open(store.getters['menu/sidebarRoutesFirstDeepestPath'], '_blank')
+        } else {
+            router.push(store.getters['menu/sidebarRoutesFirstDeepestPath'])
+        }
     }
 }
 </script>
diff --git a/src/store/modules/menu.js b/src/store/modules/menu.js
index 669b4951..cc29098d 100644
--- a/src/store/modules/menu.js
+++ b/src/store/modules/menu.js
@@ -1,5 +1,5 @@
 import path from 'path-browserify'
-import { deepClone } from '@/util'
+import { deepClone, resolveRoutePath } from '@/util'
 import api from '@/api'
 
 function hasPermission(permissions, route) {
@@ -124,15 +124,15 @@ function getDeepestPath(routes, rootPath = '') {
         ) {
             for (let i = 0; i < routes.children.length; i++) {
                 if (routes.children[i].meta.sidebar != false) {
-                    retnPath = getDeepestPath(routes.children[i], path.resolve(rootPath, routes.path))
+                    retnPath = getDeepestPath(routes.children[i], resolveRoutePath(rootPath, routes.path))
                     break
                 }
             }
         } else {
-            retnPath = getDeepestPath(routes.children[0], path.resolve(rootPath, routes.path))
+            retnPath = getDeepestPath(routes.children[0], resolveRoutePath(rootPath, routes.path))
         }
     } else {
-        retnPath = path.resolve(rootPath, routes.path)
+        retnPath = resolveRoutePath(rootPath, routes.path)
     }
     return retnPath
 }
@@ -252,7 +252,7 @@ const mutations = {
         let defaultOpenedPaths = []
         routes.map(item => {
             item.meta.defaultOpened && defaultOpenedPaths.push(item.path)
-            item.children.map(child => {
+            item.children && item.children.map(child => {
                 child.meta.defaultOpened && defaultOpenedPaths.push(path.resolve(item.path, child.path))
             })
         })
diff --git a/src/util/index.js b/src/util/index.js
index b9557c88..c828444f 100644
--- a/src/util/index.js
+++ b/src/util/index.js
@@ -1,3 +1,4 @@
+import path from 'path-browserify'
 import store from '@/store'
 
 export function deepClone(target) {
@@ -61,3 +62,17 @@ export function authAll(value) {
     })
     return auth
 }
+
+export function isExternalLink(path) {
+    return /^(https?:|mailto:|tel:)/.test(path)
+}
+
+export function resolveRoutePath(basePath, routePath) {
+    if (isExternalLink(routePath)) {
+        return routePath
+    }
+    if (isExternalLink(basePath)) {
+        return basePath
+    }
+    return basePath ? path.resolve(basePath, routePath) : routePath
+}