From e54d91891e872315c7534b02638489361ce18f4e Mon Sep 17 00:00:00 2001
From: shizhongming <zhongming4762@hotmail.com>
Date: Fri, 16 Feb 2024 20:46:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=9E=B6=E6=9E=84):=20=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E3=80=81tab=E5=9B=BD=E9=99=85=E5=8C=96=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SimpleMenu/src/SimpleSubMenu.vue           | 18 ++++++++++++++----
 src/hooks/web/useI18n.ts                       |  1 +
 .../default/tabs/components/TabContent.vue     | 17 +++++++++++++++--
 src/locales/lang/{en.ts => en_US.ts}           |  0
 src/modules/system/views/user/lang/en_US.ts    |  1 +
 src/settings/localeSetting.ts                  |  2 +-
 types/config.d.ts                              |  2 +-
 7 files changed, 33 insertions(+), 8 deletions(-)
 rename src/locales/lang/{en.ts => en_US.ts} (100%)

diff --git a/src/components/SimpleMenu/src/SimpleSubMenu.vue b/src/components/SimpleMenu/src/SimpleSubMenu.vue
index c0e1b592a..0a7ef975b 100644
--- a/src/components/SimpleMenu/src/SimpleSubMenu.vue
+++ b/src/components/SimpleMenu/src/SimpleSubMenu.vue
@@ -45,10 +45,9 @@
   </SubMenu>
 </template>
 <script lang="ts" setup>
-  import type { PropType } from 'vue';
+  import { PropType, unref, computed } from 'vue';
   import type { Menu } from '@/router/types';
 
-  import { computed } from 'vue';
   import { useDesign } from '@/hooks/web/useDesign';
   import Icon from '@/components/Icon/Icon.vue';
 
@@ -73,13 +72,24 @@
     theme: propTypes.oneOf(['dark', 'light']),
   });
 
-  const { t } = useI18n();
+  const { locale } = useI18n();
   const { prefixCls } = useDesign('simple-menu');
 
   const getShowMenu = computed(() => !props.item?.meta?.hideMenu);
   const getIcon = computed(() => (props.item?.img ? undefined : props.item?.icon));
   const getImg = computed(() => props.item?.img);
-  const getI18nName = computed(() => t(props.item?.name));
+  // const getI18nName = computed(() => t(props.item?.name));
+  const getI18nName = computed(() => {
+    const locales = props.item.meta && props.item.meta.locales;
+    const title = props.item.meta && props.item.meta.title;
+    if (locales) {
+      const i18nTitle = locales[unref(locale)];
+      if (i18nTitle) {
+        return i18nTitle;
+      }
+    }
+    return title;
+  });
   const getShowSubTitle = computed(() => !props.collapse || !props.parent);
   const getIsCollapseParent = computed(() => !!props.collapse && !!props.parent);
   const getLevelClass = computed(() => {
diff --git a/src/hooks/web/useI18n.ts b/src/hooks/web/useI18n.ts
index 3c553c95d..5099e6cea 100644
--- a/src/hooks/web/useI18n.ts
+++ b/src/hooks/web/useI18n.ts
@@ -23,6 +23,7 @@ function getKey(namespace: string | undefined, key: string) {
 
 export function useI18n(namespace?: string): {
   t: I18nGlobalTranslation;
+  locale?: any;
 } {
   const normalFn = {
     t: (key: string) => {
diff --git a/src/layouts/default/tabs/components/TabContent.vue b/src/layouts/default/tabs/components/TabContent.vue
index c7b42b2a9..be17b8740 100644
--- a/src/layouts/default/tabs/components/TabContent.vue
+++ b/src/layouts/default/tabs/components/TabContent.vue
@@ -39,11 +39,24 @@
   });
 
   const { prefixCls } = useDesign('multiple-tabs-content');
-  const { t } = useI18n();
+  const { locale } = useI18n();
+
+  // const getTitle = computed(() => {
+  //   const { tabItem: { meta } = {} } = props;
+  //   return meta && t(meta.title as string);
+  // });
 
   const getTitle = computed(() => {
     const { tabItem: { meta } = {} } = props;
-    return meta && t(meta.title as string);
+    const { title, locales } = meta as any;
+    if (locales) {
+      const localeTitle = locales[unref(locale)];
+      if (!localeTitle || localeTitle.trim() === '') {
+        return title;
+      }
+      return locales[unref(locale)];
+    }
+    return title;
   });
 
   const getIsTabs = computed(() => !props.isExtra);
diff --git a/src/locales/lang/en.ts b/src/locales/lang/en_US.ts
similarity index 100%
rename from src/locales/lang/en.ts
rename to src/locales/lang/en_US.ts
diff --git a/src/modules/system/views/user/lang/en_US.ts b/src/modules/system/views/user/lang/en_US.ts
index 366b18eac..ed4f60606 100644
--- a/src/modules/system/views/user/lang/en_US.ts
+++ b/src/modules/system/views/user/lang/en_US.ts
@@ -20,6 +20,7 @@ export default {
           email: 'Email',
           mobile: 'Mobile',
           userType: 'User type',
+          accountStatus: 'Status',
         },
         button: {
           createAccount: 'Create account',
diff --git a/src/settings/localeSetting.ts b/src/settings/localeSetting.ts
index c73420a4d..d4527d916 100644
--- a/src/settings/localeSetting.ts
+++ b/src/settings/localeSetting.ts
@@ -3,7 +3,7 @@ import type { LocaleSetting, LocaleType } from '#/config';
 
 export const LOCALE: { [key: string]: LocaleType } = {
   ZH_CN: 'zh_CN',
-  EN_US: 'en',
+  EN_US: 'en_US',
 };
 
 export const localeSetting: LocaleSetting = {
diff --git a/types/config.d.ts b/types/config.d.ts
index ebdb99df9..bb0c744c6 100644
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -11,7 +11,7 @@ import {
 
 import { CacheTypeEnum } from '@/enums/cacheEnum';
 
-export type LocaleType = 'zh_CN' | 'en' | 'ru' | 'ja' | 'ko';
+export type LocaleType = 'zh_CN' | 'en_US' | 'ru' | 'ja' | 'ko';
 
 export interface MenuSetting {
   bgColor: string;