From 7d4b0c6c1e2c94f7254e51844d2bbc89d891cea4 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 18 三月 2022 15:11:49 +0800
Subject: [PATCH] update vite.config.js
---
src/components/TopNav/index.vue | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index aa139d4..853e48f 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -40,6 +40,7 @@
const store = useStore();
const route = useRoute();
+const router = useRouter();
// 涓婚棰滆壊
const theme = computed(() => store.state.settings.theme);
@@ -69,7 +70,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 +87,48 @@
// 榛樿婵�娲荤殑鑿滃崟
const activeMenu = computed(() => {
const path = route.path;
- let activePath = defaultRouter.value;
+ let activePath = path;
if (path !== undefined && path.lastIndexOf("/") > 0) {
const tmpPath = path.substring(1, path.length);
activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
+ store.dispatch('app/toggleSideBarHide', false);
} else if ("/index" == path || "" == path) {
if (!isFrist.value) {
isFrist.value = true;
} else {
activePath = "index";
}
+ store.dispatch('app/toggleSideBarHide', true);
+ } else if(!route.children) {
+ activePath = path;
+ store.dispatch('app/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) {
+ // 娌℃湁瀛愯矾鐢辫矾寰勫唴閮ㄦ墦寮�
+ router.push({ path: key });
+ store.dispatch('app/toggleSideBarHide', true);
} else {
// 鏄剧ず宸︿晶鑱斿姩鑿滃崟
activeRoutes(key);
+ store.dispatch('app/toggleSideBarHide', false);
}
}
+
function activeRoutes(key) {
let routes = [];
if (childrenMenus.value && childrenMenus.value.length > 0) {
@@ -175,7 +172,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;
--
Gitblit v1.9.3