diff --git a/react-ui/src/app.tsx b/react-ui/src/app.tsx index 25b9fab0..6de3d781 100644 --- a/react-ui/src/app.tsx +++ b/react-ui/src/app.tsx @@ -10,6 +10,7 @@ import defaultSettings from '../config/defaultSettings'; import '../public/fonts/font.css'; import { getAccessToken } from './access'; import ErrorBoundary from './components/ErrorBoundary'; +import PageContainer from './components/PageContainer'; import './dayjsConfig'; import { removeAllPageCacheState } from './hooks/useCacheState'; import { globalGetSeverTime } from './hooks/useServerTime'; @@ -87,12 +88,7 @@ export const layout: RuntimeConfig['layout'] = ({ initialState }) => { childrenRender: (children) => { // 增加一个 loading 的状态 // if (initialState?.loading) return ; - return ( -
- {/* */} -
{children}
-
- ); + return {children}; }, collapsedButtonRender: false, collapsed: initialState?.collapsed, diff --git a/react-ui/src/components/PageContainer/index.less b/react-ui/src/components/PageContainer/index.less new file mode 100644 index 00000000..6f055f71 --- /dev/null +++ b/react-ui/src/components/PageContainer/index.less @@ -0,0 +1,14 @@ +.kf-page-container { + height: 100%; + + &__breadcrumb { + display: flex; + align-items: center; + height: 70px; + padding-left: 30px; + } + + &__content { + height: calc(100% - 70px); + } +} diff --git a/react-ui/src/components/PageContainer/index.tsx b/react-ui/src/components/PageContainer/index.tsx new file mode 100644 index 00000000..c8a35416 --- /dev/null +++ b/react-ui/src/components/PageContainer/index.tsx @@ -0,0 +1,16 @@ +import { ProBreadcrumb } from '@ant-design/pro-components'; +import React from 'react'; +import './index.less'; + +function PageContainer({ children }: { children: React.ReactNode }) { + return ( +
+
+ +
+
{children}
+
+ ); +} + +export default PageContainer; diff --git a/react-ui/src/global.less b/react-ui/src/global.less index 6a8506af..c7b3c868 100644 --- a/react-ui/src/global.less +++ b/react-ui/src/global.less @@ -137,14 +137,6 @@ ol { } } -.kf-page-container { - height: 100%; - - &__content { - height: calc(100% - 55px); - } -} - .kf-menu-collapsed { position: fixed; top: 0;