提交 70352c9a 作者: 郁骅焌

整体样式修改

上级 7831604d
...@@ -71,7 +71,7 @@ export default defineConfig({ ...@@ -71,7 +71,7 @@ export default defineConfig({
routes: [ routes: [
{ {
path: '/system/role', path: '/system/role',
name: 'role', name: '角色管理',
icon: 'SolutionOutlined', icon: 'SolutionOutlined',
component: './role', component: './role',
}, },
......
import React from 'react';
import './style.less';
const GlobalFooter = () => {
return (
<div className="sage-global-footer">
© 2020 江苏圣捷远创科技有限公司版权所有 ⋅ 苏ICP备17030519号
</div>
);
};
export default GlobalFooter;
.sage-global-footer {
position: fixed;
bottom: 0;
width: 100%;
height: 40px;
margin-left: -24px;
padding-left: 10px;
line-height: 40px;
background: #f0f2f5;
border-top: 1px solid #e7eaec;
}
.sage-tabbar { .sage-tabbar {
position: fixed;
z-index: 3;
display: flex; display: flex;
width: calc(100% - 256px);
height: 40px; height: 40px;
margin: -24px -24px -4px; margin: -24px -24px -4px;
background: #fff; background: #fff;
......
...@@ -43,7 +43,28 @@ ol { ...@@ -43,7 +43,28 @@ ol {
} }
.ant-pro-basicLayout-content .ant-pro-page-header-wrap { .ant-pro-basicLayout-content .ant-pro-page-header-wrap {
margin-top: 0px !important; margin-top: 24px !important;
padding-bottom: 40px;
}
.ant-layout-header {
position: fixed;
top: 0;
width: calc(100% - 256px) !important;
}
.ant-pro-basicLayout-content {
position: absolute;
top: 64px;
width: calc(100% - 48px);
}
.ant-layout-footer {
display: none;
}
.ant-table-pagination-right {
margin-right: 10px !important;
} }
// 公共样式 // 公共样式
...@@ -53,8 +74,6 @@ ol { ...@@ -53,8 +74,6 @@ ol {
// 新增组件样式 // 新增组件样式
@media (max-width: @screen-xs) { @media (max-width: @screen-xs) {
.ant-table { .ant-table {
width: 100%; width: 100%;
......
...@@ -11,6 +11,7 @@ import { Result, Button } from 'antd'; ...@@ -11,6 +11,7 @@ import { Result, Button } from 'antd';
import Authorized from '@/utils/Authorized'; import Authorized from '@/utils/Authorized';
import RightContent from '@/components/GlobalHeader/RightContent'; import RightContent from '@/components/GlobalHeader/RightContent';
import TabBar from '@/components/TabBar'; import TabBar from '@/components/TabBar';
import GlobalFooter from '@/components/GlobalFooter';
import { getAuthorityFromRouter } from '@/utils/utils'; import { getAuthorityFromRouter } from '@/utils/utils';
import logo from '../assets/logo.svg'; import logo from '../assets/logo.svg';
...@@ -152,8 +153,11 @@ const BasicLayout = (props) => { ...@@ -152,8 +153,11 @@ const BasicLayout = (props) => {
> >
<TabBar ref={tabBarRef} currentUser={currentUser} /> <TabBar ref={tabBarRef} currentUser={currentUser} />
<Authorized authority={authorized.authority} noMatch={noMatch}> <Authorized authority={authorized.authority} noMatch={noMatch}>
<KeepAliveLayout {...props}>{children}</KeepAliveLayout> <div style={{ position: 'absolute', top: 0, bottom: 0, left: 0, right: 0 }}>
<KeepAliveLayout {...props}>{children}</KeepAliveLayout>
</div>
</Authorized> </Authorized>
<GlobalFooter />
</ProLayout> </ProLayout>
); );
}; };
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论