From cce8921b52ba88070e78ee58ef0c1cb35e130574 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 28 七月 2023 11:09:34 +0800
Subject: [PATCH] 添加新群号：143961921
---
src/components/TopNav/index.vue | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index e3e5c97..58b2000 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -3,6 +3,7 @@
:default-active="activeMenu"
mode="horizontal"
@select="handleSelect"
+ :ellipsis="false"
>
<template v-for="(item, index) in topMenus">
<el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
@@ -30,6 +31,9 @@
<script setup>
import { constantRoutes } from "@/router"
import { isHttp } from '@/utils/validate'
+import useAppStore from '@/store/modules/app'
+import useSettingsStore from '@/store/modules/settings'
+import usePermissionStore from '@/store/modules/permission'
// 椤堕儴鏍忓垵濮嬫暟
const visibleNumber = ref(null);
@@ -38,14 +42,16 @@
// 闅愯棌渚ц竟鏍忚矾鐢�
const hideList = ['/index', '/user/profile'];
-const store = useStore();
+const appStore = useAppStore()
+const settingsStore = useSettingsStore()
+const permissionStore = usePermissionStore()
const route = useRoute();
const router = useRouter();
// 涓婚棰滆壊
-const theme = computed(() => store.state.settings.theme);
+const theme = computed(() => settingsStore.theme);
// 鎵�鏈夌殑璺敱淇℃伅
-const routers = computed(() => store.state.permission.topbarRouters);
+const routers = computed(() => permissionStore.topbarRouters);
// 椤堕儴鏄剧ず鑿滃崟
const topMenus = computed(() => {
@@ -91,10 +97,12 @@
if (path !== undefined && path.lastIndexOf("/") > 0 && hideList.indexOf(path) === -1) {
const tmpPath = path.substring(1, path.length);
activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
- store.dispatch('app/toggleSideBarHide', false);
+ if (!route.meta.link) {
+ appStore.toggleSideBarHide(false);
+ }
} else if(!route.children) {
activePath = path;
- store.dispatch('app/toggleSideBarHide', true);
+ appStore.toggleSideBarHide(true);
}
activeRoutes(activePath);
return activePath;
@@ -113,12 +121,18 @@
window.open(key, "_blank");
} else if (!route || !route.children) {
// 娌℃湁瀛愯矾鐢辫矾寰勫唴閮ㄦ墦寮�
- router.push({ path: key });
- store.dispatch('app/toggleSideBarHide', true);
+ const routeMenu = childrenMenus.value.find(item => item.path === key);
+ if (routeMenu && routeMenu.query) {
+ let query = JSON.parse(routeMenu.query);
+ router.push({ path: key, query: query });
+ } else {
+ router.push({ path: key });
+ }
+ appStore.toggleSideBarHide(true);
} else {
// 鏄剧ず宸︿晶鑱斿姩鑿滃崟
activeRoutes(key);
- store.dispatch('app/toggleSideBarHide', false);
+ appStore.toggleSideBarHide(false);
}
}
@@ -132,7 +146,9 @@
});
}
if(routes.length > 0) {
- store.commit("SET_SIDEBAR_ROUTERS", routes);
+ permissionStore.setSidebarRouters(routes);
+ } else {
+ appStore.toggleSideBarHide(true);
}
return routes;
}
--
Gitblit v1.9.3