From db544b3d75778783e7d33cee92019bb2e44d6030 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Fri, 18 Jan 2019 22:41:40 +0800
Subject: [PATCH] :tada: 1.0.0-RC2

---
 src/pages/Account/Center/Applications.js |  6 +--
 src/pages/Dashboard/Analysis.js          | 50 ++++++++++++------------
 src/pages/Dashboard/Analysis.less        | 19 +++++++++
 src/pages/Dashboard/ProportionSales.js   | 31 ++++++---------
 src/pages/Dashboard/Workplace.js         |  2 +-
 5 files changed, 62 insertions(+), 46 deletions(-)

diff --git a/src/pages/Account/Center/Applications.js b/src/pages/Account/Center/Applications.js
index 6429106..1c81572 100644
--- a/src/pages/Account/Center/Applications.js
+++ b/src/pages/Account/Center/Applications.js
@@ -16,17 +16,17 @@ class Center extends PureComponent {
     const itemMenu = (
       <Menu>
         <Menu.Item>
-          <a target="_blank" rel="noopener noreferrer" href="http://www.alipay.com/">
+          <a target="_blank" rel="noopener noreferrer" href="https://www.alipay.com/">
             1st menu item
           </a>
         </Menu.Item>
         <Menu.Item>
-          <a target="_blank" rel="noopener noreferrer" href="http://www.taobao.com/">
+          <a target="_blank" rel="noopener noreferrer" href="https://www.taobao.com/">
             2nd menu item
           </a>
         </Menu.Item>
         <Menu.Item>
-          <a target="_blank" rel="noopener noreferrer" href="http://www.tmall.com/">
+          <a target="_blank" rel="noopener noreferrer" href="https://www.tmall.com/">
             3d menu item
           </a>
         </Menu.Item>
diff --git a/src/pages/Dashboard/Analysis.js b/src/pages/Dashboard/Analysis.js
index 58261eb..0b85db7 100644
--- a/src/pages/Dashboard/Analysis.js
+++ b/src/pages/Dashboard/Analysis.js
@@ -144,30 +144,32 @@ class Analysis extends Component {
             selectDate={this.selectDate}
           />
         </Suspense>
-        <Row gutter={24}>
-          <Col xl={12} lg={24} md={24} sm={24} xs={24}>
-            <Suspense fallback={null}>
-              <TopSearch
-                loading={loading}
-                visitData2={visitData2}
-                selectDate={this.selectDate}
-                searchData={searchData}
-                dropdownGroup={dropdownGroup}
-              />
-            </Suspense>
-          </Col>
-          <Col xl={12} lg={24} md={24} sm={24} xs={24}>
-            <Suspense fallback={null}>
-              <ProportionSales
-                dropdownGroup={dropdownGroup}
-                salesType={salesType}
-                loading={loading}
-                salesPieData={salesPieData}
-                handleChangeSalesType={this.handleChangeSalesType}
-              />
-            </Suspense>
-          </Col>
-        </Row>
+        <div className={styles.twoColLayout}>
+          <Row gutter={24}>
+            <Col xl={12} lg={24} md={24} sm={24} xs={24}>
+              <Suspense fallback={null}>
+                <TopSearch
+                  loading={loading}
+                  visitData2={visitData2}
+                  selectDate={this.selectDate}
+                  searchData={searchData}
+                  dropdownGroup={dropdownGroup}
+                />
+              </Suspense>
+            </Col>
+            <Col xl={12} lg={24} md={24} sm={24} xs={24}>
+              <Suspense fallback={null}>
+                <ProportionSales
+                  dropdownGroup={dropdownGroup}
+                  salesType={salesType}
+                  loading={loading}
+                  salesPieData={salesPieData}
+                  handleChangeSalesType={this.handleChangeSalesType}
+                />
+              </Suspense>
+            </Col>
+          </Row>
+        </div>
         <Suspense fallback={null}>
           <OfflineData
             activeKey={activeKey}
diff --git a/src/pages/Dashboard/Analysis.less b/src/pages/Dashboard/Analysis.less
index d9b437c..70877d6 100644
--- a/src/pages/Dashboard/Analysis.less
+++ b/src/pages/Dashboard/Analysis.less
@@ -134,6 +134,25 @@
   }
 }
 
+.twoColLayout {
+  .salesCard {
+    height: calc(100% - 24px);
+  }
+  div[class^='ant-col']:last-child {
+    right: 0\9;
+    height: 100%\9;
+    position: absolute\9;
+  }
+  :global {
+    .ant-row {
+      display: flex;
+      display: block\9;
+      flex-flow: row wrap;
+      position: relative\9;
+    }
+  }
+}
+
 .trendText {
   margin-left: 8px;
   color: @heading-color;
diff --git a/src/pages/Dashboard/ProportionSales.js b/src/pages/Dashboard/ProportionSales.js
index 6343b71..ff16a7d 100644
--- a/src/pages/Dashboard/ProportionSales.js
+++ b/src/pages/Dashboard/ProportionSales.js
@@ -38,24 +38,19 @@ const ProportionSales = memo(
       }
       style={{ marginTop: 24 }}
     >
-      <div
-        style={{
-          minHeight: 380,
-        }}
-      >
-        <h4 style={{ marginTop: 8, marginBottom: 32 }}>
-          <FormattedMessage id="app.analysis.sales" defaultMessage="Sales" />
-        </h4>
-        <Pie
-          hasLegend
-          subTitle={<FormattedMessage id="app.analysis.sales" defaultMessage="Sales" />}
-          total={() => <Yuan>{salesPieData.reduce((pre, now) => now.y + pre, 0)}</Yuan>}
-          data={salesPieData}
-          valueFormat={value => <Yuan>{value}</Yuan>}
-          height={248}
-          lineWidth={4}
-        />
-      </div>
+      <h4 style={{ marginTop: 10, marginBottom: 32 }}>
+        <FormattedMessage id="app.analysis.sales" defaultMessage="Sales" />
+      </h4>
+      <Pie
+        hasLegend
+        subTitle={<FormattedMessage id="app.analysis.sales" defaultMessage="Sales" />}
+        total={() => <Yuan>{salesPieData.reduce((pre, now) => now.y + pre, 0)}</Yuan>}
+        data={salesPieData}
+        valueFormat={value => <Yuan>{value}</Yuan>}
+        height={270}
+        lineWidth={4}
+        style={{ padding: '8px 0' }}
+      />
     </Card>
   )
 );
diff --git a/src/pages/Dashboard/Workplace.js b/src/pages/Dashboard/Workplace.js
index ad8ace6..e5c8082 100644
--- a/src/pages/Dashboard/Workplace.js
+++ b/src/pages/Dashboard/Workplace.js
@@ -177,7 +177,7 @@ class Workplace extends PureComponent {
                         <span>
                           <a className={styles.username}>SpringBlade 企业版系列 </a>
                           <span className={styles.event}>
-                            已通过长时间生产环境的考验，现将其拆分出基础模块进行开源，当前版本为：2.0.0-RC1。
+                            已通过长时间生产环境的考验，现将其拆分出基础模块进行开源，当前版本为：2.0.0-RC2。
                           </span>
                         </span>
                       }