Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

好了

Browse Source
This commit is contained in:
LILU 2022-01-12 15:57:42 +08:00
parent 1edc4868ad
commit 574db97681
5 changed files with 66 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-ui/src/components/TopNav/index.vue
View File

@ -92,15 +92,13 @@ export default {
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.isFrist = true;
}
var routes = this.activeRoutes(activePath);
if (routes.length === 0) {
this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
this.$store.commit("SET_SIDEBAR_MENU_HIDE", true);
}else {
this.$store.commit("SET_SIDEBAR_MENU_HIDE", false);
}
return activePath;
},
@ -159,9 +157,7 @@ export default {
//TODO 第一个默认选中
this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
if(isTop){
this.$store.commit("SET_SIDEBAR_ACTIVE_MENU", routes[0].path);
let that = this;
that.$router.push({path:routes[0].path});
this.$router.push({path:routes[0].path});
}
}
return routes;

114
ruoyi-ui/src/layout/components/Sidebar/index.vue
View File

@ -1,57 +1,57 @@
<template>
<div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
<logo v-if="showLogo" :collapse="isCollapse" />
<el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
<el-menu
:default-active="activeMenu"
:collapse="isCollapse"
:background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
:text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
:unique-opened="true"
:active-text-color="settings.theme"
:collapse-transition="false"
mode="vertical"
>
<sidebar-item
v-for="(route, index) in sidebarRouters"
:key="route.path + index"
:item="route"
:base-path="route.path"
/>
</el-menu>
</el-scrollbar>
</div>
</template>
<script>
import { mapGetters, mapState } from "vuex";
import Logo from "./Logo";
import SidebarItem from "./SidebarItem";
import variables from "@/assets/styles/variables.scss";
export default {
components: { SidebarItem, Logo },
computed: {
...mapState(["settings"]),
...mapGetters(["sidebarRouters", "sidebar"]),
activeMenu() {
const route = this.$route;
const { meta, path } = route;
// if set path, the sidebar will highlight the path you set
if (meta.activeMenu) {
return meta.activeMenu;
}
return path;
},
showLogo() {
return this.$store.state.settings.sidebarLogo;
},
variables() {
return variables;
},
isCollapse() {
return !this.sidebar.opened;
}
}
};
</script>
<template>
<div v-show="!sidebarMenuHide" :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
<logo v-if="showLogo" :collapse="isCollapse" />
<el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
<el-menu
:default-active="activeMenu"
:collapse="isCollapse"
:background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
:text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
:unique-opened="true"
:active-text-color="settings.theme"
:collapse-transition="false"
mode="vertical"
>
<sidebar-item
v-for="(route, index) in sidebarRouters"
:key="route.path + index"
:item="route"
:base-path="route.path"
/>
</el-menu>
</el-scrollbar>
</div>
</template>
<script>
import { mapGetters, mapState } from "vuex";
import Logo from "./Logo";
import SidebarItem from "./SidebarItem";
import variables from "@/assets/styles/variables.scss";
export default {
components: { SidebarItem, Logo },
computed: {
...mapState(["settings"]),
...mapGetters(["sidebarRouters", "sidebar","sidebarMenuHide"]),
activeMenu() {
const route = this.$route;
const { meta, path } = route;
// if set path, the sidebar will highlight the path you set
if (meta.activeMenu) {
return meta.activeMenu;
}
return path;
},
showLogo() {
return this.$store.state.settings.sidebarLogo;
},
variables() {
return variables;
},
isCollapse() {
return !this.sidebar.opened;
}
}
};
</script>

3
ruoyi-ui/src/layout/components/TagsView/index.vue
View File

@ -132,7 +132,6 @@ export default {
addTags() {
const { name } = this.$route
if (name) {
this.$store.commit("SET_SIDEBAR_ACTIVE_MENU", this.$route.path);
this.$store.dispatch('tagsView/addView', this.$route)
}
return false
@ -191,7 +190,6 @@ export default {
})
},
toLastView(visitedViews, view) {
console.log("打开了2")
const latestView = visitedViews.slice(-1)[0]
if (latestView) {
this.$router.push(latestView.fullPath)
@ -207,7 +205,6 @@ export default {
}
},
openMenu(tag, e) {
console.log("打开了3",tag,e)
const menuMinWidth = 105
const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
const offsetWidth = this.$el.offsetWidth // container width

2
ruoyi-ui/src/store/getters.js
View File

@ -14,6 +14,6 @@ const getters = {
topbarRouters:state => state.permission.topbarRouters,
defaultRoutes:state => state.permission.defaultRoutes,
sidebarRouters:state => state.permission.sidebarRouters,
sidebarActiveMenu:state => state.permission.sidebarActiveMenu,
sidebarMenuHide:state => state.permission.sidebarMenuHide,
}
export default getters

6
ruoyi-ui/src/store/modules/permission.js
View File

@ -12,7 +12,7 @@ const permission = {
defaultRoutes: [],
topbarRouters: [],
sidebarRouters: [],
sidebarActiveMenu: null
sidebarMenuHide: false
},
mutations: {
SET_ROUTES: (state, routes) => {
@ -28,8 +28,8 @@ const permission = {
SET_SIDEBAR_ROUTERS: (state, routes) => {
state.sidebarRouters = routes
}
,SET_SIDEBAR_ACTIVE_MENU: (state, sidebarActiveMenu) => {
state.sidebarActiveMenu = sidebarActiveMenu
,SET_SIDEBAR_MENU_HIDE: (state, sidebarMenuHide) => {
state.sidebarMenuHide = sidebarMenuHide
},
},
actions: {