Commit 6670f9f8 authored by afc163's avatar afc163

Fix footer

parent c5d6923d
...@@ -229,9 +229,8 @@ class BasicLayout extends React.PureComponent { ...@@ -229,9 +229,8 @@ class BasicLayout extends React.PureComponent {
</Dropdown> </Dropdown>
</div> </div>
</Header> </Header>
<Content style={{ margin: '24px 24px 0 24px', height: '100%' }}> <Content style={{ margin: '24px 24px 0', height: '100%' }}>
{children} {children}
</Content>
<GlobalFooter <GlobalFooter
links={[{ links={[{
title: '帮助', title: '帮助',
...@@ -246,6 +245,7 @@ class BasicLayout extends React.PureComponent { ...@@ -246,6 +245,7 @@ class BasicLayout extends React.PureComponent {
}]} }]}
copyright={<div>Copyright <Icon type="copyright" /> 2017 蚂蚁金服体验技术部出品</div>} copyright={<div>Copyright <Icon type="copyright" /> 2017 蚂蚁金服体验技术部出品</div>}
/> />
</Content>
</Layout> </Layout>
</Layout> </Layout>
</DocumentTitle> </DocumentTitle>
......
import React from 'react'; import React from 'react';
import PageHeader from '../components/PageHeader'; import PageHeader from '../components/PageHeader';
export default ({ children, ...restProps }) => ( export default ({ children, wrapperClassName, ...restProps }) => (
<div style={{ margin: -24 }}> <div style={{ margin: '-24px -24px 0' }} className={wrapperClassName}>
<PageHeader {...restProps} /> <PageHeader {...restProps} />
{children ? <div style={{ margin: 24 }}>{children}</div> : null} {children ? <div style={{ margin: '24px 24px 0' }}>{children}</div> : null}
</div> </div>
); );
...@@ -97,6 +97,7 @@ function AdvancedForm({ form, dispatch, submitting }) { ...@@ -97,6 +97,7 @@ function AdvancedForm({ form, dispatch, submitting }) {
<PageHeaderLayout <PageHeaderLayout
title="高级表单" title="高级表单"
content="在后台页面中,大批量的数据修改和提交是很常见的情况。" content="在后台页面中,大批量的数据修改和提交是很常见的情况。"
wrapperClassName={styles.withFooterToolbar}
> >
<Card title="仓库管理" className={styles.card} bordered={false}> <Card title="仓库管理" className={styles.card} bordered={false}>
<Form layout="vertical" hideRequiredMark> <Form layout="vertical" hideRequiredMark>
......
...@@ -79,3 +79,8 @@ ...@@ -79,3 +79,8 @@
padding-bottom: 12.5px !important; padding-bottom: 12.5px !important;
} }
} }
// custom footer for fixed footer toolbar
.withFooterToolbar + div {
padding-bottom: 64px;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment