From 675db63496e67df3220a15382e4cf962630cbd24 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Fri, 26 Aug 2022 17:58:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E6=9B=B4=E6=8D=A2=20=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/icons/svg/all-msg.svg | 4 +- frontend/src/icons/svg/dashboard.svg | 4 +- frontend/src/icons/svg/dept.svg | 4 +- frontend/src/icons/svg/log.svg | 4 +- frontend/src/icons/svg/password.svg | 4 +- frontend/src/icons/svg/peoples.svg | 4 +- frontend/src/icons/svg/plugins-new.svg | 4 +- frontend/src/icons/svg/role.svg | 4 +- frontend/src/icons/svg/sys-setting.svg | 4 +- frontend/src/icons/svg/task.svg | 5 ++- .../src/layout/components/Sidebar/Item.vue | 2 + .../layout/components/Sidebar/SidebarItem.vue | 22 ++++++++++- .../src/layout/components/Sidebar/index.vue | 38 +------------------ .../src/views/system/task/DatasetTaskList.vue | 2 +- frontend/src/views/system/task/TaskRecord.vue | 2 +- 15 files changed, 56 insertions(+), 51 deletions(-) diff --git a/frontend/src/icons/svg/all-msg.svg b/frontend/src/icons/svg/all-msg.svg index 0c51fea531..104bbacee3 100644 --- a/frontend/src/icons/svg/all-msg.svg +++ b/frontend/src/icons/svg/all-msg.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/src/icons/svg/dashboard.svg b/frontend/src/icons/svg/dashboard.svg index 5317d37029..20de439dca 100644 --- a/frontend/src/icons/svg/dashboard.svg +++ b/frontend/src/icons/svg/dashboard.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/src/icons/svg/dept.svg b/frontend/src/icons/svg/dept.svg index dc9f9f0b5c..128dcfe2b5 100644 --- a/frontend/src/icons/svg/dept.svg +++ b/frontend/src/icons/svg/dept.svg @@ -1 +1,3 @@ - + + + diff --git a/frontend/src/icons/svg/log.svg b/frontend/src/icons/svg/log.svg index 6a43ef5010..c5b12c57aa 100644 --- a/frontend/src/icons/svg/log.svg +++ b/frontend/src/icons/svg/log.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/src/icons/svg/password.svg b/frontend/src/icons/svg/password.svg index e291d85df2..b0f6b44866 100644 --- a/frontend/src/icons/svg/password.svg +++ b/frontend/src/icons/svg/password.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/src/icons/svg/peoples.svg b/frontend/src/icons/svg/peoples.svg index 2c911615dc..13cecdc128 100644 --- a/frontend/src/icons/svg/peoples.svg +++ b/frontend/src/icons/svg/peoples.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/src/icons/svg/plugins-new.svg b/frontend/src/icons/svg/plugins-new.svg index 8dcbb26a29..7390a6252d 100644 --- a/frontend/src/icons/svg/plugins-new.svg +++ b/frontend/src/icons/svg/plugins-new.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/src/icons/svg/role.svg b/frontend/src/icons/svg/role.svg index 76cb18ff3a..76524133b0 100644 --- a/frontend/src/icons/svg/role.svg +++ b/frontend/src/icons/svg/role.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/src/icons/svg/sys-setting.svg b/frontend/src/icons/svg/sys-setting.svg index 171c06129c..3e6fb729e5 100644 --- a/frontend/src/icons/svg/sys-setting.svg +++ b/frontend/src/icons/svg/sys-setting.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/src/icons/svg/task.svg b/frontend/src/icons/svg/task.svg index e5847ca8fc..7c5cf181ec 100644 --- a/frontend/src/icons/svg/task.svg +++ b/frontend/src/icons/svg/task.svg @@ -1 +1,4 @@ - + + + + diff --git a/frontend/src/layout/components/Sidebar/Item.vue b/frontend/src/layout/components/Sidebar/Item.vue index b515f6159a..9f65316c1b 100644 --- a/frontend/src/layout/components/Sidebar/Item.vue +++ b/frontend/src/layout/components/Sidebar/Item.vue @@ -18,6 +18,8 @@ export default { if (icon) { vnodes.push() + } else { + vnodes.push(   ) } if (title) { diff --git a/frontend/src/layout/components/Sidebar/SidebarItem.vue b/frontend/src/layout/components/Sidebar/SidebarItem.vue index f7c7826c35..1b3959d1d0 100644 --- a/frontend/src/layout/components/Sidebar/SidebarItem.vue +++ b/frontend/src/layout/components/Sidebar/SidebarItem.vue @@ -3,12 +3,12 @@ - + @@ -45,6 +45,10 @@ export default { type: Boolean, default: false }, + isCollapse: { + type: Boolean, + default: false + }, basePath: { type: String, default: '' @@ -94,3 +98,17 @@ export default { } } + diff --git a/frontend/src/layout/components/Sidebar/index.vue b/frontend/src/layout/components/Sidebar/index.vue index 6ae6d1942f..fa60246509 100644 --- a/frontend/src/layout/components/Sidebar/index.vue +++ b/frontend/src/layout/components/Sidebar/index.vue @@ -12,6 +12,7 @@ > state.isCollapse, }), routes() { - // return this.$router.options.routes - if (this.isCollapse) { - return this.flatterRouter( - JSON.parse(JSON.stringify(this.$store.state.permission.currentRoutes.children)) - ); - } return this.$store.state.permission.currentRoutes.children; }, activeMenu() { @@ -75,37 +70,6 @@ export default { this.$store.commit('setIsCollapse', !this.isCollapse); this.$emit("changeSideWidth", this.isCollapse ? "70px" : ""); }, - resolvePath(routePath) { - if (isExternal(routePath)) { - return routePath; - } - if (isExternal(this.basePath)) { - return this.basePath; - } - const currentRoutes = this.$store.state.permission.currentRoutes; - if (currentRoutes && currentRoutes.path) { - return path.resolve(currentRoutes.path, this.basePath, routePath); - } - }, - flatterRouter(arr = [], route = [], path = "") { - arr.forEach((ele) => { - this.formaterRoutePath(ele, path, route); - }); - return route; - }, - pathEndwith(path = "") { - return path.endsWith("/") || !path ? path : path + "/"; - }, - formaterRoutePath(ele, routePath = "", route) { - if (!ele.hidden) { - if (!ele.children?.length) { - ele.path = routePath + ele.path; - route.push(ele); - } else { - this.flatterRouter(ele.children, route, this.pathEndwith(ele.path)); - } - } - }, }, }; diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue index 4592eb0953..09ddc2380e 100644 --- a/frontend/src/views/system/task/DatasetTaskList.vue +++ b/frontend/src/views/system/task/DatasetTaskList.vue @@ -870,7 +870,7 @@ span { .de-Completed { &::before { - background: var(--primary, #3370ff); + background: var(--deSuccess, #3370ff); } } diff --git a/frontend/src/views/system/task/TaskRecord.vue b/frontend/src/views/system/task/TaskRecord.vue index 8be6001491..a9da44989e 100644 --- a/frontend/src/views/system/task/TaskRecord.vue +++ b/frontend/src/views/system/task/TaskRecord.vue @@ -614,7 +614,7 @@ span { .de-Completed { &::before { - background: var(--primary, #3370ff); + background: var(--deSuccess, #3370ff); } }