From c3c49a05c2aa34748f7bfc0011a68ddf9239c4e4 Mon Sep 17 00:00:00 2001
From: XCSDN <gitee@xcsdn.net>
Date: 星期六, 16 四月 2022 14:02:07 +0800
Subject: [PATCH] 新增一个取文件名而不带后缀的整合方法,干净又卫生啊兄弟们
---
ruoyi-ui/src/components/TopNav/index.vue | 80 +++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 46 deletions(-)
diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue
index edb9c53..0cc24db 100644
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -12,7 +12,7 @@
</template>
<!-- 椤堕儴鑿滃崟瓒呭嚭鏁伴噺鎶樺彔 -->
- <el-submenu index="more" v-if="topMenus.length > visibleNumber">
+ <el-submenu :style="{'--theme': theme}" index="more" v-if="topMenus.length > visibleNumber">
<template slot="title">鏇村鑿滃崟</template>
<template v-for="(item, index) in topMenus">
<el-menu-item
@@ -30,13 +30,14 @@
<script>
import { constantRoutes } from "@/router";
+// 闅愯棌渚ц竟鏍忚矾鐢�
+const hideList = ['/index', '/user/profile'];
+
export default {
data() {
return {
// 椤堕儴鏍忓垵濮嬫暟
visibleNumber: 5,
- // 鏄惁涓洪娆″姞杞�
- isFrist: false,
// 褰撳墠婵�娲昏彍鍗曠殑 index
currentIndex: undefined
};
@@ -71,7 +72,7 @@
for (var 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(!this.ishttp(router.children[item].path)) {
router.children[item].path = router.path + "/" + router.children[item].path;
@@ -87,22 +88,16 @@
// 榛樿婵�娲荤殑鑿滃崟
activeMenu() {
const path = this.$route.path;
- let activePath = this.defaultRouter();
- if (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 (!this.isFrist) {
- this.isFrist = true;
- } else {
- activePath = "index";
- }
+ this.$store.dispatch('app/toggleSideBarHide', false);
+ } else if(!this.$route.children) {
+ activePath = path;
+ this.$store.dispatch('app/toggleSideBarHide', true);
}
- var routes = this.activeRoutes(activePath);
- if (routes.length === 0) {
- activePath = this.currentIndex || this.defaultRouter()
- this.activeRoutes(activePath);
- }
+ this.activeRoutes(activePath);
return activePath;
},
},
@@ -121,29 +116,21 @@
const width = document.body.getBoundingClientRect().width / 3;
this.visibleNumber = parseInt(width / 85);
},
- // 榛樿婵�娲荤殑璺敱
- defaultRouter() {
- let router;
- Object.keys(this.routers).some((key) => {
- if (!this.routers[key].hidden) {
- router = this.routers[key].path;
- return true;
- }
- });
- return router;
- },
// 鑿滃崟閫夋嫨浜嬩欢
handleSelect(key, keyPath) {
this.currentIndex = key;
+ const route = this.routers.find(item => item.path === key);
if (this.ishttp(key)) {
// http(s):// 璺緞鏂扮獥鍙ｆ墦寮�
window.open(key, "_blank");
- } else if (key.indexOf("/redirect") !== -1) {
- // /redirect 璺緞鍐呴儴鎵撳紑
- this.$router.push({ path: key.replace("/redirect", "") });
+ } else if (!route || !route.children) {
+ // 娌℃湁瀛愯矾鐢辫矾寰勫唴閮ㄦ墦寮�
+ this.$router.push({ path: key });
+ this.$store.dispatch('app/toggleSideBarHide', true);
} else {
// 鏄剧ず宸︿晶鑱斿姩鑿滃崟
this.activeRoutes(key);
+ this.$store.dispatch('app/toggleSideBarHide', false);
}
},
// 褰撳墠婵�娲荤殑璺敱
@@ -159,9 +146,8 @@
if(routes.length > 0) {
this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
}
- return routes;
},
- ishttp(url) {
+ ishttp(url) {
return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
}
},
@@ -169,25 +155,27 @@
</script>
<style lang="scss">
-.el-menu--horizontal > .el-menu-item {
+.topmenu-container.el-menu--horizontal > .el-menu-item {
float: left;
- height: 50px;
- line-height: 50px;
- margin: 0;
- border-bottom: 3px solid transparent;
- color: #999093;
- padding: 0 5px;
- margin: 0 10px;
+ height: 50px !important;
+ line-height: 50px !important;
+ color: #999093 !important;
+ padding: 0 5px !important;
+ margin: 0 10px !important;
}
-.el-menu--horizontal > .el-menu-item.is-active {
- border-bottom: 3px solid #{'var(--theme)'};
+.topmenu-container.el-menu--horizontal > .el-menu-item.is-active, .el-menu--horizontal > .el-submenu.is-active .el-submenu__title {
+ border-bottom: 2px solid #{'var(--theme)'} !important;
color: #303133;
}
/* submenu item */
-.el-menu--horizontal > .el-submenu .el-submenu__title {
- height: 50px !important;
- line-height: 50px !important;
+.topmenu-container.el-menu--horizontal > .el-submenu .el-submenu__title {
+ float: left;
+ height: 50px !important;
+ line-height: 50px !important;
+ color: #999093 !important;
+ padding: 0 5px !important;
+ margin: 0 10px !important;
}
</style>
--
Gitblit v1.9.3