fix: remove the locale menu when menu is set to false

oceanbase · Aug 6, 2024 · 571246b · 571246b
1 parent c844080
commit 571246b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/layout/SpaceContainer/Sider/MineItem/Locale.tsx b/src/layout/SpaceContainer/Sider/MineItem/Locale.tsx
@@ -30,9 +30,6 @@ const Locale: React.FC<IProps> = function () {
   const localeObj =
     localeList.find((item) => item.value.toLowerCase() === locale?.toLowerCase()) ||
     localeList.find((item) => item.value?.toLowerCase() === defaultLocale?.toLowerCase());
-  if (!odc.appConfig.locale.menu) {
-    return null;
-  }
   return (
     <DropMenu
       small

diff --git a/src/layout/SpaceContainer/Sider/MineItem/index.tsx b/src/layout/SpaceContainer/Sider/MineItem/index.tsx
@@ -31,6 +31,7 @@ import styles from './index.less';
 import tracert from '@/util/tracert';
 import { ItemType } from 'antd/es/menu/hooks/useItems';
 import Locale from './Locale';
+import odc from '@/plugins/odc';
 
 interface IProps {
   userStore?: UserStore;
@@ -132,10 +133,13 @@ const MineItem: React.FC<IProps> = function ({ children, userStore, settingStore
         },
       });
     }
-    menu.push({
-      label: <Locale />,
-      key: 'locale',
-    });
+    if (odc.appConfig.locale.menu) {
+      menu.push({
+        label: <Locale />,
+        key: 'locale',
+      });
+    }
+
     if (settingStore.enablePersonalRecord) {
       menu.push({
         key: 'record',