From 9586a55808e8a9699b021c3792cf61410cf827c5 Mon Sep 17 00:00:00 2001 From: lyt-Top <1105290566@qq.com> Date: Thu, 4 Feb 2021 08:37:20 +0800 Subject: [PATCH] =?UTF-8?q?'admin-21.02.04:=E5=A4=84=E7=90=86=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=9D=83=E9=99=90=E3=80=81=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E5=88=86=E7=95=8C=E9=9D=A2=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?= =?UTF-8?q?=E7=AD=89'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue-admin-wonderful-next/package.json | 2 +- vue-admin-wonderful-next/src/router/index.ts | 17 +---- vue-admin-wonderful-next/src/store/index.ts | 30 +++++--- .../src/theme/common/var.scss | 2 +- .../src/utils/themeConfig.ts | 2 +- .../src/views/layout/component/aside.vue | 5 ++ .../layout/navBars/breadcrumb/setings.vue | 16 ++--- .../views/layout/navBars/breadcrumb/user.vue | 22 ++---- .../layout/navBars/tagsView/tagsView.vue | 38 ++++++---- .../src/views/layout/routerView/parent.vue | 12 +--- .../src/views/limits/backEnd/btn/index.vue | 21 ------ .../src/views/limits/frontEnd/page/index.vue | 70 ++++++++++++++++++- .../src/views/login/component/account.vue | 18 +++-- .../src/views/menu/menu1/menu11/index.vue | 3 +- .../views/menu/menu1/menu12/menu121/index.vue | 3 +- .../views/menu/menu1/menu12/menu122/index.vue | 3 +- .../src/views/menu/menu1/menu13/index.vue | 3 +- .../src/views/menu/menu2/index.vue | 3 +- 18 files changed, 157 insertions(+), 113 deletions(-) delete mode 100644 vue-admin-wonderful-next/src/views/limits/backEnd/btn/index.vue diff --git a/vue-admin-wonderful-next/package.json b/vue-admin-wonderful-next/package.json index c235394..809d464 100644 --- a/vue-admin-wonderful-next/package.json +++ b/vue-admin-wonderful-next/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "clipboard": "^2.0.6", - "element-plus": "^1.0.2-beta.30", + "element-plus": "^1.0.2-beta.31", "mitt": "^2.1.0", "nprogress": "^0.2.0", "screenfull": "^5.1.0", diff --git a/vue-admin-wonderful-next/src/router/index.ts b/vue-admin-wonderful-next/src/router/index.ts index 0b659af..15bdfe0 100644 --- a/vue-admin-wonderful-next/src/router/index.ts +++ b/vue-admin-wonderful-next/src/router/index.ts @@ -165,20 +165,6 @@ export const dynamicRoutes = [ isIframe: false, auth: ['admin', 'test'] } - }, - { - path: '/limits/backEnd/btn', - name: 'limitsBackEndEndBtn', - component: () => import('/@/views/limits/backEnd/btn/index.vue'), - meta: { - title: '按钮权限', - isLink: '', - isHide: false, - isKeepAlive: true, - isAffix: false, - isIframe: false, - auth: ['admin', 'test'] - } } ] } @@ -190,7 +176,7 @@ export const dynamicRoutes = [ component: () => import('/@/views/layout/routerView/parent.vue'), redirect: '/menu/menu1', meta: { - title: '路由嵌套', + title: '菜单嵌套', isLink: '', isHide: false, isKeepAlive: true, @@ -600,6 +586,7 @@ export function initAllFun() { const token = getSession('token') if (!token) return false store.dispatch('setAuths') + store.dispatch('setUserInfos') setAddRoute() // 添加动态路由 setFilterMenu() // 过滤权限菜单 setCacheTagsViewRoutes() // 添加 keepAlive 缓存 diff --git a/vue-admin-wonderful-next/src/store/index.ts b/vue-admin-wonderful-next/src/store/index.ts index 551e651..e387cc5 100644 --- a/vue-admin-wonderful-next/src/store/index.ts +++ b/vue-admin-wonderful-next/src/store/index.ts @@ -47,7 +47,8 @@ export interface RootStateTypes { routes: Array, caches: Array, tagsViewRoutes: Array, - auths: Array + auths: Array, + userInfos: object } export const key: InjectionKey> = Symbol() @@ -58,7 +59,8 @@ export const store = createStore({ routes: [], caches: [], tagsViewRoutes: [], - auths: [] + auths: [], + userInfos: {} }, mutations: { // 设置布局配置 @@ -80,7 +82,11 @@ export const store = createStore({ // 设置权限 getAuths(state: any, data: Array) { state.auths = data - } + }, + // 设置用户信息 + getUserInfos(state: any, data: object) { + state.userInfos = data + }, }, actions: { // 设置布局配置 @@ -102,15 +108,19 @@ export const store = createStore({ // 设置权限 async setAuths({ commit }, data: Array) { // 模拟权限，实际项目中，请通过直接走接口获取权限标识 - let authList: Array = [] - if (getSession('defaultAuthList')) { - authList = getSession('defaultAuthList') + if (data && data.length > 0) { + commit('getAuths', data) } else { - let defaultAuthList: Array = ['admin', 'btn.add', 'btn.del', 'btn.edit'] - if (data && data.length > 0) authList = data - else authList = defaultAuthList + if (getSession('userInfo')) commit('getAuths', getSession('userInfo').authList) + } + }, + // 设置用户信息 + async setUserInfos({ commit }, data: object) { + if (data) { + commit('getUserInfos', data) + } else { + if (getSession('userInfo')) commit('getUserInfos', getSession('userInfo')) } - commit('getAuths', authList) }, } }) diff --git a/vue-admin-wonderful-next/src/theme/common/var.scss b/vue-admin-wonderful-next/src/theme/common/var.scss index 8ca3774..252aa79 100644 --- a/vue-admin-wonderful-next/src/theme/common/var.scss +++ b/vue-admin-wonderful-next/src/theme/common/var.scss @@ -60,7 +60,7 @@ $--color-danger-light-8: mix($--color-whites, $--color-danger, 80%) !default; $--color-danger-light-9: mix($--color-whites, $--color-danger, 90%) !default; $--bg-topBar: #ffffff; $--bg-menuBar: #545c64; -$--bg-columnsMenuBar: #4276ab; +$--bg-columnsMenuBar: #545c64; $--bg-topBarColor: #606266; $--bg-menuBarColor: #eaeaea; $--bg-columnsMenuBarColor: #e6e6e6; diff --git a/vue-admin-wonderful-next/src/utils/themeConfig.ts b/vue-admin-wonderful-next/src/utils/themeConfig.ts index 9ac748e..96a9fdb 100644 --- a/vue-admin-wonderful-next/src/utils/themeConfig.ts +++ b/vue-admin-wonderful-next/src/utils/themeConfig.ts @@ -8,7 +8,7 @@ export default { danger: "#f56c6c", topBar: "#ffffff", menuBar: "#545c64", - columnsMenuBar: '#4276ab', + columnsMenuBar: '#545c64', topBarColor: "#606266", menuBarColor: "#eaeaea", columnsMenuBarColor: '#e6e6e6', diff --git a/vue-admin-wonderful-next/src/views/layout/component/aside.vue b/vue-admin-wonderful-next/src/views/layout/component/aside.vue index ce84bf1..6fdaa6f 100644 --- a/vue-admin-wonderful-next/src/views/layout/component/aside.vue +++ b/vue-admin-wonderful-next/src/views/layout/component/aside.vue @@ -105,6 +105,11 @@ export default { proxy.$refs.layoutAsideScrollbarRef.update(); } }); + // 监听路由的变化，动态赋值给菜单中 + watch(store.state, (val) => { + if (val.routes.length === state.menuList.length) return false; + setFilterRoutes(); + }); // 页面加载前 onBeforeMount(() => { initMenuFixed(document.body.clientWidth); diff --git a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue index bf3e77b..3574469 100644 --- a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue +++ b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue @@ -162,24 +162,24 @@
-
面包屑 Breadcrumb
+
开启 Breadcrumb
-
-
开启 Tagsview
-
- -
-
开启 Breadcrumb 图标
+
+
开启 Tagsview
+
+ +
+
开启 Tagsview 图标
@@ -573,7 +573,7 @@ export default defineComponent({ } else { getThemeConfig.value.isShowLogo = false; getThemeConfig.value.isBreadcrumb = true; - getThemeConfig.value.isCollapse = true; + getThemeConfig.value.isCollapse = false; getThemeConfig.value.isTagsview = true; getThemeConfig.value.isClassicSplitMenu = false; getThemeConfig.value.menuBar = "#545c64"; diff --git a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/user.vue b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/user.vue index 3503a29..0cf41e0 100644 --- a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/user.vue +++ b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/user.vue @@ -20,9 +20,8 @@ :title="isScreenfull ? '开全屏' : '关全屏'" :class="!isScreenfull?'icon-fullscreen':'icon-tuichuquanping'">
- - {{userInfo.userName === '' ? 'test' : userInfo.userName}} + + {{getUserInfos.userName === '' ? 'test' : getUserInfos.userName}}