From b30e3c5016ca0709e633683009ec2e9732dfda4d Mon Sep 17 00:00:00 2001 From: ElsaOOo Date: Tue, 30 Nov 2021 22:13:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=87=E6=8D=A2=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=EF=BC=8C=E8=8B=B1=E6=96=87=E4=B8=8D=E8=83=BD=E5=86=8D?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=9B=9E=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/devui-vue/.ls-lint.yml | 1 + .../docs/.vitepress/devui-theme/Layout.vue | 25 ++++++------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/packages/devui-vue/.ls-lint.yml b/packages/devui-vue/.ls-lint.yml index b367ef20..08f51be1 100644 --- a/packages/devui-vue/.ls-lint.yml +++ b/packages/devui-vue/.ls-lint.yml @@ -7,6 +7,7 @@ ls: .ts: kebab-case .tsx: kebab-case .spec.ts: kebab-case + .spec.tsx: kebab-case .route.ts: kebab-case .type.ts: kebab-case diff --git a/packages/devui-vue/docs/.vitepress/devui-theme/Layout.vue b/packages/devui-vue/docs/.vitepress/devui-theme/Layout.vue index 5a6a85b1..f7a99d82 100644 --- a/packages/devui-vue/docs/.vitepress/devui-theme/Layout.vue +++ b/packages/devui-vue/docs/.vitepress/devui-theme/Layout.vue @@ -2,7 +2,6 @@ import { ref, computed, watch, defineAsyncComponent } from 'vue' import { useRoute, useData } from 'vitepress' import { isSideBarEmpty, getSideBarConfig } from './support/sideBar' -import lang from '../config/lang'; // components import NavBar from './components/NavBar.vue' import SideBar from './components/SideBar.vue' @@ -32,9 +31,7 @@ const isCustomLayout = computed(() => !!frontmatter.value.customLayout) const enableHome = computed(() => !!frontmatter.value.home) // automatic multilang check for AlgoliaSearchBox -const isMultiLang = computed( - () => Object.keys(theme.value.locales || {}).length > 0 -) +const isMultiLang = computed(() => Object.keys(theme.value.locales || {}).length > 0) // navbar const showNavbar = computed(() => { @@ -42,9 +39,7 @@ const showNavbar = computed(() => { if (frontmatter.value.navbar === false || themeConfig.navbar === false) { return false } - return ( - site.value.title || themeConfig.logo || themeConfig.repo || themeConfig.nav - ) + return site.value.title || themeConfig.logo || themeConfig.repo || themeConfig.nav }) // sidebar @@ -55,9 +50,7 @@ const showSidebar = computed(() => { return false } - return !isSideBarEmpty( - getSideBarConfig(theme.value.sidebar, route.data.relativePath) - ) + return !isSideBarEmpty(getSideBarConfig(theme.value.sidebar, route.data.relativePath)) }) const toggleSidebar = (to?: boolean) => { @@ -83,12 +76,13 @@ const pageClasses = computed(() => { // layout组件加载,初始化国际化语言. const result = location.pathname.match(/[a-zA-Z]*-[A-Z]*/) -const langList = Object.keys(lang); +const langList = ['zh-CN', 'en-US'] + // 避免短横线分隔 (kebab-case)形式的路由命名导致读取语言错误 if (result && langList.includes(result[0])) { - localStorage.setItem('preferred_lang', result[0]) + localStorage.setItem('preferred_lang', result[0]) } else { - localStorage.setItem('preferred_lang', navigator.language); + localStorage.setItem('preferred_lang', navigator.language) } @@ -135,10 +129,7 @@ if (result && langList.includes(result[0])) {