From 71a28c225212db4f9039f1a74fd05b7ba15e9f92 Mon Sep 17 00:00:00 2001 From: lyt-Top <1105290566@qq.com> Date: Sun, 31 Jan 2021 15:47:43 +0800 Subject: [PATCH] =?UTF-8?q?'admin-21.01.31:=E5=88=A0=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81logo=E3=80=81=E5=A4=84=E7=90=86tagsView?= =?UTF-8?q?=E6=97=A0=E6=9D=83=E9=99=90=E4=B9=9F=E6=98=BE=E7=A4=BA=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E3=80=81=E4=BC=98=E5=8C=96=E5=B8=83=E5=B1=80=E7=AD=89?= =?UTF-8?q?'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue-admin-wonderful-next/package.json | 2 ++ .../src/assets/logo-web-element.svg | 6 ---- .../src/assets/logo-web-vue.svg | 6 ---- .../src/assets/logo-web-white.svg | 6 ---- vue-admin-wonderful-next/src/router/index.ts | 8 +++-- .../layout/navBars/breadcrumb/search.vue | 16 ++++----- .../layout/navBars/breadcrumb/setings.vue | 34 ++++++++++++++++--- .../views/layout/navBars/breadcrumb/user.vue | 19 +++++++++-- .../layout/navBars/breadcrumb/userNews.vue | 5 ++- .../src/views/login/index.vue | 9 +++-- 10 files changed, 70 insertions(+), 41 deletions(-) delete mode 100644 vue-admin-wonderful-next/src/assets/logo-web-element.svg delete mode 100644 vue-admin-wonderful-next/src/assets/logo-web-vue.svg delete mode 100644 vue-admin-wonderful-next/src/assets/logo-web-white.svg diff --git a/vue-admin-wonderful-next/package.json b/vue-admin-wonderful-next/package.json index bb0b570..c235394 100644 --- a/vue-admin-wonderful-next/package.json +++ b/vue-admin-wonderful-next/package.json @@ -6,6 +6,7 @@ "build": "vite build" }, "dependencies": { + "clipboard": "^2.0.6", "element-plus": "^1.0.2-beta.30", "mitt": "^2.1.0", "nprogress": "^0.2.0", @@ -16,6 +17,7 @@ "vuex": "^4.0.0-rc.2" }, "devDependencies": { + "@types/clipboard": "^2.0.1", "@types/node": "^14.14.22", "@types/nprogress": "^0.2.0", "@types/sortablejs": "^1.10.6", diff --git a/vue-admin-wonderful-next/src/assets/logo-web-element.svg b/vue-admin-wonderful-next/src/assets/logo-web-element.svg deleted file mode 100644 index 6e08cae..0000000 --- a/vue-admin-wonderful-next/src/assets/logo-web-element.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/assets/logo-web-vue.svg b/vue-admin-wonderful-next/src/assets/logo-web-vue.svg deleted file mode 100644 index 331a341..0000000 --- a/vue-admin-wonderful-next/src/assets/logo-web-vue.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/assets/logo-web-white.svg b/vue-admin-wonderful-next/src/assets/logo-web-white.svg deleted file mode 100644 index 1a4d3ac..0000000 --- a/vue-admin-wonderful-next/src/assets/logo-web-white.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/router/index.ts b/vue-admin-wonderful-next/src/router/index.ts index 3dd06a1..0b659af 100644 --- a/vue-admin-wonderful-next/src/router/index.ts +++ b/vue-admin-wonderful-next/src/router/index.ts @@ -528,9 +528,12 @@ export function formatTwoStageRoutes(arr: any) { return newArr } -// 缓存多级嵌套数组处理后的一维数组(tagsView、菜单过滤中使用:未过滤隐藏的(isHide)) +// 缓存多级嵌套数组处理后的一维数组(tagsView、菜单搜索中使用:未过滤隐藏的(isHide)) export function setCacheTagsViewRoutes() { - store.dispatch('setTagsViewRoutes', formatTwoStageRoutes(formatFlatteningRoutes(dynamicRoutes))[0].children) + // 先处理有权限的路由,否则 tagsView、菜单搜索中无权限的路由也将显示 + let authsRoutes = setFilterMenuFun(dynamicRoutes, store.state.auths) + // 添加到 vuex setTagsViewRoutes 中 + store.dispatch('setTagsViewRoutes', formatTwoStageRoutes(formatFlatteningRoutes(authsRoutes))[0].children) } // 获取当前用户的权限去比对路由表,用于左侧菜单/横向菜单的显示 @@ -634,4 +637,5 @@ router.afterEach(() => { NProgress.done() }) +// 导出路由 export default router \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/search.vue b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/search.vue index 88af58c..e40b5e7 100644 --- a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/search.vue +++ b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/search.vue @@ -1,8 +1,8 @@