From ae20a768197bf2d4f021fe7f4bb18e7e0d7aeec5 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 14:26:07 +0800
Subject: [PATCH] fix g2 type error

---
 .../src/components/Charts/MiniArea/index.tsx  | 23 +++++++++++--------
 .../src/components/Charts/MiniArea/index.tsx  | 22 ++++++++++--------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/DashboardAnalysis/src/components/Charts/MiniArea/index.tsx b/DashboardAnalysis/src/components/Charts/MiniArea/index.tsx
index e2eecb42..225e087c 100644
--- a/DashboardAnalysis/src/components/Charts/MiniArea/index.tsx
+++ b/DashboardAnalysis/src/components/Charts/MiniArea/index.tsx
@@ -28,6 +28,9 @@ export interface MiniAreaProps {
   }[];
 }
 
+// g2 4.0 发布之前只能这样先修一下了
+const FixTypeAxis: any = Axis;
+
 const MiniArea: React.FC<MiniAreaProps> = props => {
   const {
     height = 1,
@@ -79,22 +82,22 @@ const MiniArea: React.FC<MiniAreaProps> = props => {
             data={data}
             padding={padding}
           >
-            <Axis
+            <FixTypeAxis
               key="axis-x"
               name="x"
-              label={undefined}
-              line={undefined}
-              tickLine={undefined}
-              grid={undefined}
+              label={false}
+              line={false}
+              tickLine={false}
+              grid={false}
               {...xAxis}
             />
-            <Axis
+            <FixTypeAxis
               key="axis-y"
               name="y"
-              label={undefined}
-              line={undefined}
-              tickLine={undefined}
-              grid={undefined}
+              label={false}
+              line={false}
+              tickLine={false}
+              grid={false}
               {...yAxis}
             />
             <Tooltip showTitle={false} crosshairs={false} />
diff --git a/DashboardMonitor/src/components/Charts/MiniArea/index.tsx b/DashboardMonitor/src/components/Charts/MiniArea/index.tsx
index 22ea7f0b..9c35cdf2 100644
--- a/DashboardMonitor/src/components/Charts/MiniArea/index.tsx
+++ b/DashboardMonitor/src/components/Charts/MiniArea/index.tsx
@@ -27,6 +27,8 @@ export interface MiniAreaProps {
     y: number;
   }[];
 }
+// g2 4.0 发布之前只能这样先修一下了
+const FixTypeAxis: any = Axis;
 
 const MiniArea: React.FC<MiniAreaProps> = props => {
   const {
@@ -79,22 +81,22 @@ const MiniArea: React.FC<MiniAreaProps> = props => {
             data={data}
             padding={padding}
           >
-            <Axis
+            <FixTypeAxis
               key="axis-x"
               name="x"
-              label={null}
-              line={null}
-              tickLine={null}
-              grid={null}
+              label={false}
+              line={false}
+              tickLine={false}
+              grid={false}
               {...xAxis}
             />
-            <Axis
+            <FixTypeAxis
               key="axis-y"
               name="y"
-              label={null}
-              line={null}
-              tickLine={null}
-              grid={null}
+              label={false}
+              line={false}
+              tickLine={false}
+              grid={false}
               {...yAxis}
             />
             <Tooltip showTitle={false} crosshairs={false} />
-- 
GitLab