From 9c3225d1e52f0c743a530411f1f556fb23dcf3b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Tue, 16 Apr 2019 15:26:12 +0800
Subject: [PATCH] add GridContent

---
 Analysis/src/index.tsx | 97 ++++++++++++++++++++++--------------------
 package.json           |  2 +-
 2 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/Analysis/src/index.tsx b/Analysis/src/index.tsx
index 201009c6..005e8a20 100644
--- a/Analysis/src/index.tsx
+++ b/Analysis/src/index.tsx
@@ -8,6 +8,7 @@ import PageLoading from './components/PageLoading';
 import { Dispatch } from 'redux';
 import { IAnalysisData } from './data.d';
 import { RadioChangeEvent } from 'antd/lib/radio';
+import { GridContent } from '@ant-design/pro-layout';
 
 const IntroduceRow = React.lazy(() => import('./components/IntroduceRow'));
 const SalesCard = React.lazy(() => import('./components/SalesCard'));
@@ -156,53 +157,55 @@ class PAGE_NAME_UPPER_CAMEL_CASE extends Component<
 
     const activeKey = currentTabKey || (offlineData[0] && offlineData[0].name);
     return (
-      <React.Fragment>
-        <Suspense fallback={<PageLoading />}>
-          <IntroduceRow loading={loading} visitData={visitData} />
-        </Suspense>
-        <Suspense fallback={null}>
-          <SalesCard
-            rangePickerValue={rangePickerValue}
-            salesData={salesData}
-            isActive={this.isActive}
-            handleRangePickerChange={this.handleRangePickerChange}
-            loading={loading}
-            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}
-                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>
-        <Suspense fallback={null}>
-          <OfflineData
-            activeKey={activeKey}
-            loading={loading}
-            offlineData={offlineData}
-            offlineChartData={offlineChartData}
-            handleTabChange={this.handleTabChange}
-          />
-        </Suspense>
-      </React.Fragment>
+      <GridContent>
+        <React.Fragment>
+          <Suspense fallback={<PageLoading />}>
+            <IntroduceRow loading={loading} visitData={visitData} />
+          </Suspense>
+          <Suspense fallback={null}>
+            <SalesCard
+              rangePickerValue={rangePickerValue}
+              salesData={salesData}
+              isActive={this.isActive}
+              handleRangePickerChange={this.handleRangePickerChange}
+              loading={loading}
+              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}
+                  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>
+          <Suspense fallback={null}>
+            <OfflineData
+              activeKey={activeKey}
+              loading={loading}
+              offlineData={offlineData}
+              offlineChartData={offlineChartData}
+              handleTabChange={this.handleTabChange}
+            />
+          </Suspense>
+        </React.Fragment>
+      </GridContent>
     );
   }
 }
diff --git a/package.json b/package.json
index a70bd2ee..2147aeec 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "stylelint-config-prettier": "^4.0.0",
     "stylelint-config-standard": "^18.0.0",
     "umi": "^2.3.0-0",
-    "umi-plugin-block-dev": "^1.3.1",
+    "umi-plugin-block-dev": "^2.0.1",
     "umi-plugin-react": "^1.3.0-0",
     "umi-request": "^1.0.0"
   },
-- 
GitLab