From 2aa0b4e521c1d76534fc476c9dabd80e6bc93ab2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 24 四月 2025 11:22:10 +0800
Subject: [PATCH] update vite.config.js
---
src/components/TopNav/index.vue | 118 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 74 insertions(+), 44 deletions(-)
diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index aa139d4..15dee7e 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -3,12 +3,15 @@
: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"
- ><svg-icon :icon-class="item.meta.icon" />
- {{ item.meta.title }}</el-menu-item
- >
+ <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber">
+ <svg-icon
+ v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+ :icon-class="item.meta.icon"/>
+ {{ item.meta.title }}
+ </el-menu-item>
</template>
<!-- 椤堕儴鑿滃崟瓒呭嚭鏁伴噺鎶樺彔 -->
@@ -18,10 +21,12 @@
<el-menu-item
:index="item.path"
:key="index"
- v-if="index >= visibleNumber"
- ><svg-icon :icon-class="item.meta.icon" />
- {{ item.meta.title }}</el-menu-item
- >
+ v-if="index >= visibleNumber">
+ <svg-icon
+ v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+ :icon-class="item.meta.icon"/>
+ {{ item.meta.title }}
+ </el-menu-item>
</template>
</el-sub-menu>
</el-menu>
@@ -30,21 +35,27 @@
<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);
-// 鏄惁涓洪娆″姞杞�
-const isFrist = ref(null);
// 褰撳墠婵�娲昏彍鍗曠殑 index
const currentIndex = ref(null);
+// 闅愯棌渚ц竟鏍忚矾鐢�
+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(() => {
@@ -52,7 +63,7 @@
routers.value.map((menu) => {
if (menu.hidden !== true) {
// 鍏煎椤堕儴鏍忎竴绾ц彍鍗曞唴閮ㄨ烦杞�
- if (menu.path === "/") {
+ if (menu.path === '/' && menu.children) {
topMenus.push(menu.children[0]);
} else {
topMenus.push(menu);
@@ -69,7 +80,7 @@
for (let item in router.children) {
if (router.children[item].parentPath === undefined) {
if(router.path === "/") {
- router.children[item].path = "/redirect/" + router.children[item].path;
+ router.children[item].path = "/" + router.children[item].path;
} else {
if(!isHttp(router.children[item].path)) {
router.children[item].path = router.path + "/" + router.children[item].path;
@@ -86,52 +97,49 @@
// 榛樿婵�娲荤殑鑿滃崟
const activeMenu = computed(() => {
const path = route.path;
- let activePath = defaultRouter.value;
- if (path !== undefined && path.lastIndexOf("/") > 0) {
+ let activePath = path;
+ if (path !== undefined && path.lastIndexOf("/") > 0 && hideList.indexOf(path) === -1) {
const tmpPath = path.substring(1, path.length);
- activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
- } else if ("/index" == path || "" == path) {
- if (!isFrist.value) {
- isFrist.value = true;
- } else {
- activePath = "index";
+ if (!route.meta.link) {
+ activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
+ appStore.toggleSideBarHide(false);
}
+ } else if(!route.children) {
+ activePath = path;
+ appStore.toggleSideBarHide(true);
}
- let routes = activeRoutes(activePath);
- if (routes.length === 0) {
- activePath = currentIndex.value || defaultRouter.value
- activeRoutes(activePath);
- }
+ activeRoutes(activePath);
return activePath;
})
-// 榛樿婵�娲荤殑璺敱
-const defaultRouter = computed(() => {
- let router;
- Object.keys(routers.value).some((key) => {
- if (!routers.value[key].hidden) {
- router = routers.value[key].path;
- return true;
- }
- });
- return router;
-})
+
function setVisibleNumber() {
const width = document.body.getBoundingClientRect().width / 3;
visibleNumber.value = parseInt(width / 85);
}
+
function handleSelect(key, keyPath) {
currentIndex.value = key;
+ const route = routers.value.find(item => item.path === key);
if (isHttp(key)) {
// http(s):// 璺緞鏂扮獥鍙ｆ墦寮�
window.open(key, "_blank");
- } else if (key.indexOf("/redirect") !== -1) {
- // /redirect 璺緞鍐呴儴鎵撳紑
- router.push({ path: key.replace("/redirect", "") });
+ } else if (!route || !route.children) {
+ // 娌℃湁瀛愯矾鐢辫矾寰勫唴閮ㄦ墦寮�
+ 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);
+ appStore.toggleSideBarHide(false);
}
}
+
function activeRoutes(key) {
let routes = [];
if (childrenMenus.value && childrenMenus.value.length > 0) {
@@ -142,7 +150,9 @@
});
}
if(routes.length > 0) {
- store.commit("SET_SIDEBAR_ROUTERS", routes);
+ permissionStore.setSidebarRouters(routes);
+ } else {
+ appStore.toggleSideBarHide(true);
}
return routes;
}
@@ -175,7 +185,7 @@
}
/* sub-menu item */
-.topmenu-container.el-menu--horizontal > .el-sub-menu .el-submenu__title {
+.topmenu-container.el-menu--horizontal > .el-sub-menu .el-sub-menu__title {
float: left;
height: 50px !important;
line-height: 50px !important;
@@ -183,4 +193,24 @@
padding: 0 5px !important;
margin: 0 10px !important;
}
+
+/* 鑳屾櫙鑹查殣钘� */
+.topmenu-container.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus, .topmenu-container.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover, .topmenu-container.el-menu--horizontal>.el-submenu .el-submenu__title:hover {
+ background-color: #ffffff;
+}
+
+/* 鍥炬爣鍙抽棿璺� */
+.topmenu-container .svg-icon {
+ margin-right: 4px;
+}
+
+/* topmenu more arrow */
+.topmenu-container .el-sub-menu .el-sub-menu__icon-arrow {
+ position: static;
+ vertical-align: middle;
+ margin-left: 8px;
+ margin-top: 0px;
+}
+
+
</style>
--
Gitblit v1.9.3