diff --git a/apps/admin/autoResolver/components.d.ts b/apps/admin/autoResolver/components.d.ts index c8522ad..75f618a 100644 --- a/apps/admin/autoResolver/components.d.ts +++ b/apps/admin/autoResolver/components.d.ts @@ -19,6 +19,7 @@ declare module 'vue' { NDivider: typeof import('@celeris/ca-components')['NDivider'] NDrawer: typeof import('@celeris/ca-components')['NDrawer'] NDrawerContent: typeof import('@celeris/ca-components')['NDrawerContent'] + NDropdown: typeof import('@celeris/ca-components')['NDropdown'] NForm: typeof import('@celeris/ca-components')['NForm'] NFormItem: typeof import('@celeris/ca-components')['NFormItem'] NGlobalStyle: typeof import('@celeris/ca-components')['NGlobalStyle'] diff --git a/apps/admin/src/AppConfiguration.ts b/apps/admin/src/AppConfiguration.ts index 2065954..7e7b6dc 100644 --- a/apps/admin/src/AppConfiguration.ts +++ b/apps/admin/src/AppConfiguration.ts @@ -3,7 +3,7 @@ import { LocalesEngine } from "@celeris/locale"; import { createDiscreteApi } from "@celeris/ca-components"; import { field, logger } from "@celeris/utils"; import { useUserStoreWithOut } from "~/store/modules/user"; -import { useNaiveUIConfigProvider } from "~/composables"; +import { useAppSetting, useNaiveUIConfigProvider } from "~/composables"; const { configProviderProps } = useNaiveUIConfigProvider(); @@ -67,6 +67,7 @@ function initializeHttpRequest() { } function initializeI18n() { + const { getLocale } = useAppSetting(); const messages = Object.fromEntries( Object.entries( import.meta.glob<{ default: any }>("./locales/*.json", { eager: true }), @@ -75,7 +76,7 @@ function initializeI18n() { }), ); LocalesEngine.initLocales(() => ({ - locale: "zh", + locale: getLocale.value, fallbackLocale: "zh", messagesHandler: () => { return messages; diff --git a/apps/admin/src/layouts/header/components/LocaleSwitcher.vue b/apps/admin/src/layouts/header/components/LocaleSwitcher.vue new file mode 100644 index 0000000..5d32024 --- /dev/null +++ b/apps/admin/src/layouts/header/components/LocaleSwitcher.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/apps/admin/src/layouts/header/index.vue b/apps/admin/src/layouts/header/index.vue index bda502b..54fce3b 100644 --- a/apps/admin/src/layouts/header/index.vue +++ b/apps/admin/src/layouts/header/index.vue @@ -1,6 +1,7 @@