From 750a09d5b702f8e857f09ccc124565796f601d3f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 17 十一月 2022 13:50:35 +0800
Subject: [PATCH] 升级组件依赖到最新版本
---
src/components/TopNav/index.vue | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index 344f658..f7e2654 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,22 +31,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(() => {
@@ -88,20 +94,15 @@
const activeMenu = computed(() => {
const path = route.path;
let activePath = path;
- if (path !== undefined && path.lastIndexOf("/") > 0) {
+ 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);
- } else if ("/index" == path || "" == path) {
- if (!isFrist.value) {
- isFrist.value = true;
- } else {
- activePath = "index";
+ if (!route.meta.link) {
+ appStore.toggleSideBarHide(false);
}
- store.dispatch('app/toggleSideBarHide', true);
} else if(!route.children) {
activePath = path;
- store.dispatch('app/toggleSideBarHide', true);
+ appStore.toggleSideBarHide(true);
}
activeRoutes(activePath);
return activePath;
@@ -121,11 +122,11 @@
} else if (!route || !route.children) {
// 娌℃湁瀛愯矾鐢辫矾寰勫唴閮ㄦ墦寮�
router.push({ path: key });
- store.dispatch('app/toggleSideBarHide', true);
+ appStore.toggleSideBarHide(true);
} else {
// 鏄剧ず宸︿晶鑱斿姩鑿滃崟
activeRoutes(key);
- store.dispatch('app/toggleSideBarHide', false);
+ appStore.toggleSideBarHide(false);
}
}
@@ -139,7 +140,7 @@
});
}
if(routes.length > 0) {
- store.commit("SET_SIDEBAR_ROUTERS", routes);
+ permissionStore.setSidebarRouters(routes);
}
return routes;
}
@@ -172,7 +173,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