From d4d4157cc42aa3d4ea8db8309c78675e6a0a66c2 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Fri, 1 Oct 2021 21:06:54 +0800 Subject: [PATCH] style: [sidebar.scss] delete overflow-x: auto --- src/layout/components/navbar.vue | 2 -- src/layout/components/sidebar/horizontal.vue | 16 +++++++++++++++- src/style/sidebar.scss | 2 -- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/layout/components/navbar.vue b/src/layout/components/navbar.vue index b07ceb6b0..74ea45975 100644 --- a/src/layout/components/navbar.vue +++ b/src/layout/components/navbar.vue @@ -129,14 +129,12 @@ export default defineComponent({ function translationCh() { instance.locale = { locale: "zh" }; locale.value = "zh"; - window.location.reload(); } // English function translationEn() { instance.locale = { locale: "en" }; locale.value = "en"; - window.location.reload(); } return { diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue index a7f33c65f..3af0a6885 100644 --- a/src/layout/components/sidebar/horizontal.vue +++ b/src/layout/components/sidebar/horizontal.vue @@ -78,6 +78,8 @@ import { defineComponent, unref, watch, + nextTick, + onMounted, getCurrentInstance } from "vue"; import { useI18n } from "vue-i18n"; @@ -137,6 +139,7 @@ export default defineComponent({ const instance = getCurrentInstance().appContext.config.globalProperties.$storage; const menuRef = templateRef("menu", null); + const routeStore = usePermissionStoreHook(); const route = useRoute(); const router = useRouter(); @@ -198,19 +201,30 @@ export default defineComponent({ router.push("/welcome"); } + function handleResize() { + menuRef.value.handleResize(); + } + // 简体中文 function translationCh() { instance.locale = { locale: "zh" }; locale.value = "zh"; + handleResize(); } // English function translationEn() { instance.locale = { locale: "en" }; locale.value = "en"; - menuRef.value.handleResize(); + handleResize(); } + onMounted(() => { + nextTick(() => { + handleResize(); + }); + }); + return { locale, usename, diff --git a/src/style/sidebar.scss b/src/style/sidebar.scss index e15809e9a..07111095b 100644 --- a/src/style/sidebar.scss +++ b/src/style/sidebar.scss @@ -161,8 +161,6 @@ height: 100%; min-width: 0; flex: 1; - // todo:: - overflow-x: auto; align-items: center; }