diff --git a/package.json b/package.json index 31d9b5be..4aa52308 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@ant-design/pro-layout": "^6.35.0", "@ant-design/pro-table": "^2.71.0", "@umijs/route-utils": "^2.0.0", - "antd": "^4.19.0", + "antd": "^4.20.0", "classnames": "^2.3.0", "lodash": "^4.17.0", "moment": "^2.29.0", diff --git a/src/components/RightContent/AvatarDropdown.tsx b/src/components/RightContent/AvatarDropdown.tsx index fc768c29..af29ae11 100644 --- a/src/components/RightContent/AvatarDropdown.tsx +++ b/src/components/RightContent/AvatarDropdown.tsx @@ -68,28 +68,35 @@ const AvatarDropdown: React.FC = ({ menu }) => { return loading; } - const menuHeaderDropdown = ( - - {menu && ( - - - 个人中心 - - )} - {menu && ( - - - 个人设置 - - )} - {menu && } + const menuItems = [ + ...(menu + ? [ + { + key: 'center', + icon: , + label: '个人中心', + }, + { + key: 'settings', + icon: , + label: '个人设置', + }, + { + type: 'divider', + }, + ] + : []), + { + key: 'logout', + icon: , + label: '退出登录', + }, + ]; - - - 退出登录 - - + const menuHeaderDropdown = ( + ); + return (