diff --git a/react-ui/config/defaultSettings.ts b/react-ui/config/defaultSettings.ts index cf0e5a16..8129ba1e 100644 --- a/react-ui/config/defaultSettings.ts +++ b/react-ui/config/defaultSettings.ts @@ -10,7 +10,7 @@ const Settings: ProLayoutProps & { locale: 'zh-CN', navTheme: 'light', colorPrimary: '#514cf9', - // layout: 'mix', + layout: 'mix', contentWidth: 'Fluid', fixedHeader: false, fixSiderbar: false, diff --git a/react-ui/src/app.tsx b/react-ui/src/app.tsx index 779ee3b3..25b9fab0 100644 --- a/react-ui/src/app.tsx +++ b/react-ui/src/app.tsx @@ -70,7 +70,7 @@ export async function getInitialState(): Promise { export const layout: RuntimeConfig['layout'] = ({ initialState }) => { return { ErrorBoundary: ErrorBoundary, - rightContentRender: false, + rightContentRender: () => , menu: { locale: false, // 每当 initialState?.currentUser?.userid 发生修改时重新执行 request @@ -89,7 +89,7 @@ export const layout: RuntimeConfig['layout'] = ({ initialState }) => { // if (initialState?.loading) return ; return (
- + {/* */}
{children}
); @@ -113,6 +113,11 @@ export const layout: RuntimeConfig['layout'] = ({ initialState }) => { colorBgMenuItemSelected: 'rgba(197, 232, 255, 0.8)', colorMenuBackground: themes['siderBGColor'], }, + header: { + colorBgHeader: '#3a3da5', + heightLayoutHeader: 60, + colorHeaderTitle: 'white', + }, }, menuItemRender: menuItemRender(false), subMenuItemRender: menuItemRender(true), diff --git a/react-ui/src/components/MessageBroadcast/index.less b/react-ui/src/components/MessageBroadcast/index.less index d3fda321..1935c56b 100644 --- a/react-ui/src/components/MessageBroadcast/index.less +++ b/react-ui/src/components/MessageBroadcast/index.less @@ -2,7 +2,6 @@ position: relative; width: 32px; height: 32px; - margin-right: 8px; cursor: pointer; .backgroundFullImage(url(@/assets/img/message/trumpet.png)); diff --git a/react-ui/src/components/RightContent/AvatarDropdown.tsx b/react-ui/src/components/RightContent/AvatarDropdown.tsx index 3ee4c156..43cc54bc 100644 --- a/react-ui/src/components/RightContent/AvatarDropdown.tsx +++ b/react-ui/src/components/RightContent/AvatarDropdown.tsx @@ -34,6 +34,7 @@ const Name = () => { lineHeight: '48px', whiteSpace: 'nowrap', textOverflow: 'ellipsis', + color: 'white', [`@media only screen and (max-width: ${token.screenMD}px)`]: { display: 'none', }, diff --git a/react-ui/src/components/RightContent/index.less b/react-ui/src/components/RightContent/index.less index df84cdfa..096e4da4 100644 --- a/react-ui/src/components/RightContent/index.less +++ b/react-ui/src/components/RightContent/index.less @@ -1,10 +1,9 @@ .right-content { display: flex; - gap: 8px; + gap: 10px; align-items: center; - height: 55px; - margin-right: -10px; - padding: 0 16px; - background-color: white; - border-bottom: 1px solid #e9edf0; + height: 60px; + padding: 0 14px; + // background-color: white; + // border-bottom: 1px solid #e9edf0; } diff --git a/react-ui/src/components/RightContent/index.tsx b/react-ui/src/components/RightContent/index.tsx index fcdf9f10..ede172a5 100644 --- a/react-ui/src/components/RightContent/index.tsx +++ b/react-ui/src/components/RightContent/index.tsx @@ -1,7 +1,6 @@ -import KFIcon from '@/components/KFIcon'; -import { ProBreadcrumb } from '@ant-design/pro-components'; +// import KFIcon from '@/components/KFIcon'; +// import { ProBreadcrumb } from '@ant-design/pro-components'; import { useModel } from '@umijs/max'; -import { Button, Flex } from 'antd'; import React from 'react'; import MessageBroadcast from '../MessageBroadcast'; import Avatar from './AvatarDropdown'; @@ -17,12 +16,12 @@ const GlobalHeaderRight: React.FC = () => { return null; } - const handleMenuCollapse = () => { - setInitialState((preInitialState) => ({ - ...preInitialState, - collapsed: !preInitialState?.collapsed, - })); - }; + // const handleMenuCollapse = () => { + // setInitialState((preInitialState) => ({ + // ...preInitialState, + // collapsed: !preInitialState?.collapsed, + // })); + // }; return (
@@ -35,23 +34,18 @@ const GlobalHeaderRight: React.FC = () => { */} - + > */} - + {/* */} - - + - - + {/* */}
diff --git a/react-ui/src/global.less b/react-ui/src/global.less index df79e9f7..6a8506af 100644 --- a/react-ui/src/global.less +++ b/react-ui/src/global.less @@ -76,7 +76,7 @@ body { } .ant-pro-layout .ant-layout-sider.ant-pro-sider { height: 100vh; - // padding-top: 56px; + padding-top: 60px; } .ant-pro-layout .ant-pro-layout-container { height: 100vh;