From d358e81d5c69271b197de42197332704b23e2c79 Mon Sep 17 00:00:00 2001
From: pshu <stormslowly@gmail.com>
Date: Tue, 16 May 2023 13:51:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=20layout=20+=20ant3=E5=BA=94=E7=94=A8=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=B3=E4=B8=8A=E7=9A=84=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E7=9A=84=E6=8C=89=E9=92=AE=20(#11146)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 🐛 支持开启 layout + ant3应用 显示右上的退出登陆的按钮

* fix: 🐛 SelectLang 修复

---------

Co-authored-by: pshu <pishu.spf@antfin.com>
---
 packages/plugins/src/layout.ts                | 23 ++++++++++++++---
 .../plugins/templates/locale/SelectLang.tpl   | 25 ++++++++++++++-----
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/packages/plugins/src/layout.ts b/packages/plugins/src/layout.ts
index 65a01a96cd01..722090d37925 100644
--- a/packages/plugins/src/layout.ts
+++ b/packages/plugins/src/layout.ts
@@ -497,10 +497,25 @@ export function getRightRenderContent (opts: {
     ],
   };
   // antd@5 和  4.24 之后推荐使用 menu，性能更好
-  const dropdownProps =
-    version.startsWith("5.") || version.startsWith("4.24.")
-      ? { menu: langMenu }
-      : { overlay: <Menu {...langMenu} /> };
+  let dropdownProps;
+  if (version.startsWith("5.") || version.startsWith("4.24.")) {
+    dropdownProps = { menu: langMenu };
+  } else if (version.startsWith("3.")) {
+    dropdownProps = {
+      overlay: (
+        <Menu>
+          {langMenu.items.map((item) => (
+            <Menu.Item key={item.key} onClick={item.onClick}>
+              {item.label}
+            </Menu.Item>
+          ))}
+        </Menu>
+      ),
+    };
+  } else { // 需要 antd 4.20.0 以上版本
+    dropdownProps = { overlay: <Menu {...langMenu} /> };
+  }
+
 
   return (
     <div className="umi-plugin-layout-right anticon">
diff --git a/packages/plugins/templates/locale/SelectLang.tpl b/packages/plugins/templates/locale/SelectLang.tpl
index 04c577349f21..f0577a809f5b 100644
--- a/packages/plugins/templates/locale/SelectLang.tpl
+++ b/packages/plugins/templates/locale/SelectLang.tpl
@@ -442,12 +442,25 @@ export const SelectLang: React.FC<SelectLangProps> = (props) => {
   };
 
   // antd@5 和  4.24 之后推荐使用 menu，性能更好
-  const dropdownProps =
-    version.startsWith('5.') || version.startsWith('4.24.')
-      ? { menu: langMenu }
-      : { overlay: <Menu {...langMenu} /> };
-
-
+  let dropdownProps;
+  if (version.startsWith("5.") || version.startsWith("4.24.")) {
+    dropdownProps = { menu: langMenu };
+  } else if (version.startsWith("3.")) {
+    dropdownProps = {
+      overlay: (
+        <Menu>
+          {langMenu.items.map((item) => (
+            <Menu.Item key={item.key} onClick={item.onClick}>
+              {item.label}
+            </Menu.Item>
+          ))}
+        </Menu>
+      ),
+    };
+  } else { // 需要 antd 4.20.0 以上版本
+    dropdownProps = { overlay: <Menu {...langMenu} /> };
+  }
+  
   const inlineStyle = {
     cursor: "pointer",
     padding: "12px",