From 4ea7376dbc32374c03e60c131b5ce728762cff6b Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: Thu, 11 Jan 2024 15:26:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8Di18n=E6=97=A0=E6=84=9F?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LangSelect/index.vue | 4 ++--
 src/lang/index.ts                   | 1 +
 src/layout/components/Navbar.vue    | 2 +-
 vite.config.ts                      | 3 +--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue
index f5ae8e8..b5fafd3 100644
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -14,8 +14,8 @@
 
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n';
-import SvgIcon from '@/components/SvgIcon/index.vue';
 import { useAppStore } from '@/store/modules/app';
+import SvgIcon from '@/components/SvgIcon/index.vue';
 
 const appStore = useAppStore();
 const { locale } = useI18n();
@@ -24,7 +24,7 @@ const message: any = {
   zh_CN: '切换语言成功！',
   en_US: 'Switch Language Successful!'
 };
-const handleLanguageChange = (lang: string) => {
+const handleLanguageChange = (lang: any) => {
   locale.value = lang;
   appStore.changeLanguage(lang);
   ElMessage.success(message[lang] || '切换语言成功！');
diff --git a/src/lang/index.ts b/src/lang/index.ts
index 2b4c027..e4e1d25 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -18,6 +18,7 @@ export const getLanguage = (): LanguageEnum => {
 
 const i18n = createI18n({
   globalInjection: true,
+  allowComposition: true,
   legacy: false,
   locale: getLanguage(),
   messages
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 49018ce..5225cdc 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -92,11 +92,11 @@ import SearchMenu from './TopBar/search.vue';
 import useAppStore from '@/store/modules/app';
 import useUserStore from '@/store/modules/user';
 import useSettingsStore from '@/store/modules/settings';
+import useNoticeStore from '@/store/modules/notice';
 import { getTenantList } from '@/api/login';
 import { dynamicClear, dynamicTenant } from '@/api/system/tenant';
 import { TenantVO } from '@/api/types';
 import notice from './notice/index.vue';
-import useNoticeStore from '@/store/modules/notice';
 
 const appStore = useAppStore();
 const userStore = useUserStore();
diff --git a/vite.config.ts b/vite.config.ts
index e323dc7..01da668 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -13,8 +13,7 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
     resolve: {
       alias: {
         '~': path.resolve(__dirname, './'),
-        '@': path.resolve(__dirname, './src'),
-        'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js'
+        '@': path.resolve(__dirname, './src')
       },
       extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
     },