diff --git a/src/components/GlobalHeader/index.less b/src/components/GlobalHeader/index.less index e66510b90f73693c5575d8bf518cc13be5b9d880..75b450bfceef3b375908baf063c8ead34ba8d418 100644 --- a/src/components/GlobalHeader/index.less +++ b/src/components/GlobalHeader/index.less @@ -2,14 +2,6 @@ @pro-header-hover-bg: rgba(0, 0, 0, 0.025); -.header { - position: relative; - height: @layout-header-height; - padding: 0; - background: #fff; - box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08); -} - .logo { display: inline-block; height: @layout-header-height; @@ -100,30 +92,28 @@ } @media only screen and (max-width: @screen-md) { - .header { - :global(.ant-divider-vertical) { - vertical-align: unset; - } - .name { - display: none; - } - i.trigger { - padding: 22px 12px; - } - .logo { - position: relative; - padding-right: 12px; - padding-left: 12px; - } - .right { - position: absolute; - top: 0; - right: 12px; - background: #fff; - .account { - .avatar { - margin-right: 0; - } + :global(.ant-divider-vertical) { + vertical-align: unset; + } + .name { + display: none; + } + i.trigger { + padding: 22px 12px; + } + .logo { + position: relative; + padding-right: 12px; + padding-left: 12px; + } + .right { + position: absolute; + top: 0; + right: 12px; + background: #fff; + .account { + .avatar { + margin-right: 0; } } } diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx index a28d8348ba2555f3b2111082eb184acd6afe9d4d..67dbcd4f042418a71658e85a86a92f908f154a60 100644 --- a/src/layouts/BasicLayout.tsx +++ b/src/layouts/BasicLayout.tsx @@ -1,6 +1,5 @@ import { ConnectState, ConnectProps } from '@/models/connect'; import RightContent from '@/components/GlobalHeader/RightContent'; -import { formatMessage } from 'umi-plugin-react/locale'; import { connect } from 'dva'; import React, { useState } from 'react'; import logo from '../assets/logo.svg'; @@ -12,6 +11,7 @@ import { Settings, SettingDrawer, } from '@ant-design/pro-layout'; +import Link from 'umi/link'; export interface BasicLayoutProps extends BasicLayoutComponentsProps, ConnectProps { breadcrumbNameMap: { [path: string]: MenuDataItem }; @@ -43,7 +43,10 @@ const BasicLayout: React.FC = props => { } + menuItemRender={(menuItemProps, defaultDom) => { + return {defaultDom}; + }} + rightContentRender={rightProps => } {...props} {...settings} >