From 6670f9f87ddd30e506d6c5fc88d5aa8dbee60a97 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 29 Aug 2017 19:33:13 +0800
Subject: [PATCH] Fix footer

---
 src/layouts/BasicLayout.js       | 30 +++++++++++++++---------------
 src/layouts/PageHeaderLayout.js  |  6 +++---
 src/routes/Forms/AdvancedForm.js |  1 +
 src/routes/Forms/style.less      |  5 +++++
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/layouts/BasicLayout.js b/src/layouts/BasicLayout.js
index 75db512d..8b5ce710 100644
--- a/src/layouts/BasicLayout.js
+++ b/src/layouts/BasicLayout.js
@@ -229,23 +229,23 @@ class BasicLayout extends React.PureComponent {
                 </Dropdown>
               </div>
             </Header>
-            <Content style={{ margin: '24px 24px 0 24px', height: '100%' }}>
+            <Content style={{ margin: '24px 24px 0', height: '100%' }}>
               {children}
+              <GlobalFooter
+                links={[{
+                  title: '帮助',
+                  href: '',
+                }, {
+                  title: '隐私',
+                  href: '',
+                }, {
+                  title: '条款',
+                  href: '',
+                  blankTarget: true,
+                }]}
+                copyright={<div>Copyright <Icon type="copyright" /> 2017 蚂蚁金服体验技术部出品</div>}
+              />
             </Content>
-            <GlobalFooter
-              links={[{
-                title: '帮助',
-                href: '',
-              }, {
-                title: '隐私',
-                href: '',
-              }, {
-                title: '条款',
-                href: '',
-                blankTarget: true,
-              }]}
-              copyright={<div>Copyright <Icon type="copyright" /> 2017 蚂蚁金服体验技术部出品</div>}
-            />
           </Layout>
         </Layout>
       </DocumentTitle>
diff --git a/src/layouts/PageHeaderLayout.js b/src/layouts/PageHeaderLayout.js
index ef1f0f6d..1573b8a9 100644
--- a/src/layouts/PageHeaderLayout.js
+++ b/src/layouts/PageHeaderLayout.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import PageHeader from '../components/PageHeader';
 
-export default ({ children, ...restProps }) => (
-  <div style={{ margin: -24 }}>
+export default ({ children, wrapperClassName, ...restProps }) => (
+  <div style={{ margin: '-24px -24px 0' }} className={wrapperClassName}>
     <PageHeader {...restProps} />
-    {children ? <div style={{ margin: 24 }}>{children}</div> : null}
+    {children ? <div style={{ margin: '24px 24px 0' }}>{children}</div> : null}
   </div>
 );
diff --git a/src/routes/Forms/AdvancedForm.js b/src/routes/Forms/AdvancedForm.js
index 144374cf..95f10858 100644
--- a/src/routes/Forms/AdvancedForm.js
+++ b/src/routes/Forms/AdvancedForm.js
@@ -97,6 +97,7 @@ function AdvancedForm({ form, dispatch, submitting }) {
     <PageHeaderLayout
       title="高级表单"
       content="在后台页面中，大批量的数据修改和提交是很常见的情况。"
+      wrapperClassName={styles.withFooterToolbar}
     >
       <Card title="仓库管理" className={styles.card} bordered={false}>
         <Form layout="vertical" hideRequiredMark>
diff --git a/src/routes/Forms/style.less b/src/routes/Forms/style.less
index b74d8a64..14261a3b 100644
--- a/src/routes/Forms/style.less
+++ b/src/routes/Forms/style.less
@@ -79,3 +79,8 @@
     padding-bottom: 12.5px !important;
   }
 }
+
+// custom footer for fixed footer toolbar
+.withFooterToolbar + div {
+  padding-bottom: 64px;
+}
-- 
GitLab