From 17e8977e589a7c4b2fbb8795ed70c124dbe1ac33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Tue, 18 Jun 2019 15:02:09 +0800
Subject: [PATCH] fix: fix #3312, The height of the card  is different

---
 .../src/components/Charts/MiniArea/index.tsx  | 23 ++++++++-----------
 .../src/components/IntroduceRow.tsx           |  2 +-
 .../src/components/OfflineData.tsx            |  2 +-
 .../src/components/ProportionSales.tsx        | 11 ++++-----
 .../src/components/SalesCard.tsx              |  2 +-
 .../src/components/TopSearch.tsx              |  6 +++--
 DashboardAnalysis/src/index.tsx               |  8 ++++++-
 .../src/components/Charts/MiniArea/index.tsx  |  7 ++----
 package.json                                  |  2 +-
 9 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/DashboardAnalysis/src/components/Charts/MiniArea/index.tsx b/DashboardAnalysis/src/components/Charts/MiniArea/index.tsx
index 7aa55dd9..2e12183b 100644
--- a/DashboardAnalysis/src/components/Charts/MiniArea/index.tsx
+++ b/DashboardAnalysis/src/components/Charts/MiniArea/index.tsx
@@ -28,9 +28,6 @@ export interface MiniAreaProps {
   }[];
 }
 
-// g2 4.0 发布之前只能这样先修一下了
-const FixTypeAxis: any = Axis;
-
 const MiniArea: React.FC<MiniAreaProps> = props => {
   const {
     height = 1,
@@ -82,22 +79,22 @@ const MiniArea: React.FC<MiniAreaProps> = props => {
             data={data}
             padding={padding}
           >
-            <FixTypeAxis
+            <Axis
               key="axis-x"
               name="x"
-              label={undefined}
-              line={undefined}
-              tickLine={undefined}
-              grid={undefined}
+              label={null}
+              line={null}
+              tickLine={null}
+              grid={null}
               {...xAxis}
             />
-            <FixTypeAxis
+            <Axis
               key="axis-y"
               name="y"
-              label={undefined}
-              line={undefined}
-              tickLine={undefined}
-              grid={undefined}
+              label={null}
+              line={null}
+              tickLine={null}
+              grid={null}
               {...yAxis}
             />
             <Tooltip showTitle={false} crosshairs={false} />
diff --git a/DashboardAnalysis/src/components/IntroduceRow.tsx b/DashboardAnalysis/src/components/IntroduceRow.tsx
index 8057b6c8..e97a96a8 100644
--- a/DashboardAnalysis/src/components/IntroduceRow.tsx
+++ b/DashboardAnalysis/src/components/IntroduceRow.tsx
@@ -19,7 +19,7 @@ const topColResponsiveProps = {
 };
 
 const IntroduceRow = ({ loading, visitData }: { loading: boolean; visitData: VisitDataType[] }) => (
-  <Row gutter={24}>
+  <Row gutter={24} type="flex">
     <Col {...topColResponsiveProps}>
       <ChartCard
         bordered={false}
diff --git a/DashboardAnalysis/src/components/OfflineData.tsx b/DashboardAnalysis/src/components/OfflineData.tsx
index deec77a8..a27ec3e5 100644
--- a/DashboardAnalysis/src/components/OfflineData.tsx
+++ b/DashboardAnalysis/src/components/OfflineData.tsx
@@ -14,7 +14,7 @@ const CustomTab = ({
   data: OfflineDataType;
   currentTabKey: string;
 }) => (
-  <Row gutter={8} style={{ width: 138, margin: '8px 0' }}>
+  <Row gutter={8} style={{ width: 138, margin: '8px 0' }} type="flex">
     <Col span={12}>
       <NumberInfo
         title={data.name}
diff --git a/DashboardAnalysis/src/components/ProportionSales.tsx b/DashboardAnalysis/src/components/ProportionSales.tsx
index 29ffb432..7c5bcb71 100644
--- a/DashboardAnalysis/src/components/ProportionSales.tsx
+++ b/DashboardAnalysis/src/components/ProportionSales.tsx
@@ -31,7 +31,9 @@ const ProportionSales = ({
         defaultMessage="The Proportion of Sales"
       />
     }
-    bodyStyle={{ padding: 24 }}
+    style={{
+      height: '100%',
+    }}
     extra={
       <div className={styles.salesCardExtra}>
         {dropdownGroup}
@@ -50,13 +52,8 @@ const ProportionSales = ({
         </div>
       </div>
     }
-    style={{ marginTop: 24 }}
   >
-    <div
-      style={{
-        minHeight: 380,
-      }}
-    >
+    <div>
       <h4 style={{ marginTop: 8, marginBottom: 32 }}>
         <FormattedMessage id="BLOCK_NAME.analysis.sales" defaultMessage="Sales" />
       </h4>
diff --git a/DashboardAnalysis/src/components/SalesCard.tsx b/DashboardAnalysis/src/components/SalesCard.tsx
index 269e1902..c7317eb1 100644
--- a/DashboardAnalysis/src/components/SalesCard.tsx
+++ b/DashboardAnalysis/src/components/SalesCard.tsx
@@ -67,7 +67,7 @@ const SalesCard = ({
           tab={<FormattedMessage id="BLOCK_NAME.analysis.sales" defaultMessage="Sales" />}
           key="sales"
         >
-          <Row>
+          <Row type="flex">
             <Col xl={16} lg={12} md={12} sm={24} xs={24}>
               <div className={styles.salesBar}>
                 <Bar
diff --git a/DashboardAnalysis/src/components/TopSearch.tsx b/DashboardAnalysis/src/components/TopSearch.tsx
index 198147ff..f987e535 100644
--- a/DashboardAnalysis/src/components/TopSearch.tsx
+++ b/DashboardAnalysis/src/components/TopSearch.tsx
@@ -64,9 +64,11 @@ const TopSearch = ({
       />
     }
     extra={dropdownGroup}
-    style={{ marginTop: 24 }}
+    style={{
+      height: '100%',
+    }}
   >
-    <Row gutter={68}>
+    <Row gutter={68} type="flex">
       <Col sm={12} xs={24} style={{ marginBottom: 24 }}>
         <NumberInfo
           subTitle={
diff --git a/DashboardAnalysis/src/index.tsx b/DashboardAnalysis/src/index.tsx
index e66186ce..c31338b1 100644
--- a/DashboardAnalysis/src/index.tsx
+++ b/DashboardAnalysis/src/index.tsx
@@ -176,7 +176,13 @@ class PAGE_NAME_UPPER_CAMEL_CASE extends Component<
               selectDate={this.selectDate}
             />
           </Suspense>
-          <Row gutter={24}>
+          <Row
+            gutter={24}
+            type="flex"
+            style={{
+              marginTop: 24,
+            }}
+          >
             <Col xl={12} lg={24} md={24} sm={24} xs={24}>
               <Suspense fallback={null}>
                 <TopSearch
diff --git a/DashboardMonitor/src/components/Charts/MiniArea/index.tsx b/DashboardMonitor/src/components/Charts/MiniArea/index.tsx
index e2688848..22ea7f0b 100644
--- a/DashboardMonitor/src/components/Charts/MiniArea/index.tsx
+++ b/DashboardMonitor/src/components/Charts/MiniArea/index.tsx
@@ -28,9 +28,6 @@ export interface MiniAreaProps {
   }[];
 }
 
-// g2 4.0 发布之前只能这样先修一下了
-const FixTypeAxis: any = Axis;
-
 const MiniArea: React.FC<MiniAreaProps> = props => {
   const {
     height = 1,
@@ -82,7 +79,7 @@ const MiniArea: React.FC<MiniAreaProps> = props => {
             data={data}
             padding={padding}
           >
-            <FixTypeAxis
+            <Axis
               key="axis-x"
               name="x"
               label={null}
@@ -91,7 +88,7 @@ const MiniArea: React.FC<MiniAreaProps> = props => {
               grid={null}
               {...xAxis}
             />
-            <FixTypeAxis
+            <Axis
               key="axis-y"
               name="y"
               label={null}
diff --git a/package.json b/package.json
index 48f51cc4..1cbcbb5b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "dev": "cross-env PAGES_PATH='DashboardMonitor/src' umi dev",
+    "dev": "cross-env PAGES_PATH='DashboardAnalysis/src' umi dev",
     "start": "umi dev",
     "lint-staged": "lint-staged",
     "lint": "npm run lint:js && npm run lint:style",
-- 
GitLab