From 4207e137387693e91d3fa6248e966a9220adbae4 Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 17 Jun 2021 11:02:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(fix):=E5=8F=B3=E4=B8=8A=E8=A7=92UI?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8Cicon=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/icons/svg/docs.svg | 1 + frontend/src/icons/svg/language.svg | 2 +- frontend/src/layout/components/Topbar.vue | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 frontend/src/icons/svg/docs.svg diff --git a/frontend/src/icons/svg/docs.svg b/frontend/src/icons/svg/docs.svg new file mode 100644 index 0000000000..42a1046e3d --- /dev/null +++ b/frontend/src/icons/svg/docs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/language.svg b/frontend/src/icons/svg/language.svg index 0082b577ab..312f4f3b54 100644 --- a/frontend/src/icons/svg/language.svg +++ b/frontend/src/icons/svg/language.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue index 8826e2dfef..2f9fcffbf0 100644 --- a/frontend/src/layout/components/Topbar.vue +++ b/frontend/src/layout/components/Topbar.vue @@ -37,6 +37,11 @@ --> +
+ + + +
@@ -50,9 +55,9 @@ {{ $t('user.change_password') }} - - {{ $t('commons.help_documentation') }} - + + + {{ $t('commons.about_us') }} From 9b638f0a1a0c318a778989d439f5474cefd73060 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 17 Jun 2021 11:08:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=B3=BB=E7=BB=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E5=AD=90=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E4=B9=9F=E6=98=BE=E7=A4=BA=E5=B7=A6=E4=BE=A7=E8=8F=9C?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/layout/components/Topbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue index 2f9fcffbf0..e68f484a9d 100644 --- a/frontend/src/layout/components/Topbar.vue +++ b/frontend/src/layout/components/Topbar.vue @@ -211,7 +211,7 @@ export default { // 设置侧边栏的显示和隐藏 setSidebarHide(route) { // if (!route.children || route.children.length === 1) { - if (!route.children || this.showChildLength(route) === 1) { + if (route.name !== 'system' && (!route.children || this.showChildLength(route) === 1)) { this.$store.dispatch('app/toggleSideBarHide', true) } else { this.$store.dispatch('app/toggleSideBarHide', false)