From ffcf9d22115001b19c8245e6e6a128d0a4c71158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=AB=E9=9B=A8=E6=B0=B4=E8=BF=87=E6=BB=A4=E7=9A=84?= =?UTF-8?q?=E7=A9=BA=E6=B0=94-Rairn?= <958414905@qq.com> Date: Mon, 26 Jun 2023 11:03:42 +0800 Subject: [PATCH] fix: fix designer button does not appear (#2120) * refactor: convert to optional chain expresion * fix: fix designer button does not appear --- .../src/schema-component/antd/menu/Menu.tsx | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/packages/core/client/src/schema-component/antd/menu/Menu.tsx b/packages/core/client/src/schema-component/antd/menu/Menu.tsx index 892599415..c8afbbcfe 100644 --- a/packages/core/client/src/schema-component/antd/menu/Menu.tsx +++ b/packages/core/client/src/schema-component/antd/menu/Menu.tsx @@ -217,11 +217,11 @@ const HeaderMenu = ({ const s = schema.properties[info.key]; if (mode === 'mix') { if (s['x-component'] !== 'Menu.SubMenu') { - onSelect && onSelect(info); + onSelect?.(info); } else { const menuItemSchema = findMenuItem(s); if (!menuItemSchema) { - return onSelect && onSelect(info); + return onSelect?.(info); } // TODO setLoading(true); @@ -230,18 +230,17 @@ const HeaderMenu = ({ setTimeout(() => { setLoading(false); }, 100); - onSelect && - onSelect({ - key: menuItemSchema.name, - item: { - props: { - schema: menuItemSchema, - }, + onSelect?.({ + key: menuItemSchema.name, + item: { + props: { + schema: menuItemSchema, }, - }); + }, + }); } } else { - onSelect && onSelect(info); + onSelect?.(info); } }} mode={mode === 'mix' ? 'horizontal' : mode} @@ -315,7 +314,7 @@ const SideMenu = ({ defaultOpenKeys={defaultOpenKeys} defaultSelectedKeys={defaultSelectedKeys} onSelect={(info) => { - onSelect && onSelect(info); + onSelect?.(info); }} className={sideMenuClass} items={items as MenuProps['items']} @@ -489,13 +488,13 @@ Menu.Item = observer( > {field.title} - {Designer && } + ), }; - }, [field.title, icon, schema]); + }, [field.title, icon, schema, Designer]); if (!pushMenuItem) { error('Menu.Item must be wrapped by GetMenuItemsContext.Provider'); @@ -547,13 +546,13 @@ Menu.URL = observer( > {field.title} - {Designer && } + ), }; - }, [field.title, icon, props.href, schema]); + }, [field.title, icon, props.href, schema, Designer]); pushMenuItem(item); return null; @@ -582,7 +581,7 @@ Menu.SubMenu = observer( {field.title} - {Designer && } + @@ -591,7 +590,7 @@ Menu.SubMenu = observer( return ; }), }; - }, [field.title, icon, schema, children]); + }, [field.title, icon, schema, children, Designer]); if (!pushMenuItem) { error('Menu.SubMenu must be wrapped by GetMenuItemsContext.Provider');