From 013247c6a8cdc2d0bb82106e175e9292afd351a4 Mon Sep 17 00:00:00 2001
From: niko <644506165@qq.com>
Date: Fri, 5 Jan 2018 16:23:14 +0800
Subject: [PATCH] fixed charts colors & import default g2 config in charts
 (#567)

---
 src/components/Charts/TagCloud/index.js | 11 ++++++++++-
 src/{ => components/Charts}/g2.js       |  0
 src/components/Charts/index.js          |  1 +
 src/index.js                            |  1 -
 4 files changed, 11 insertions(+), 2 deletions(-)
 rename src/{ => components/Charts}/g2.js (100%)

diff --git a/src/components/Charts/TagCloud/index.js b/src/components/Charts/TagCloud/index.js
index 6667c121..6f11c479 100644
--- a/src/components/Charts/TagCloud/index.js
+++ b/src/components/Charts/TagCloud/index.js
@@ -131,7 +131,16 @@ class TagCloud extends Component {
         ref={this.saveRootRef}
       >
         {dv && (
-          <Chart width={w} height={h} data={dv} padding={0}>
+          <Chart
+            width={w}
+            height={h}
+            data={dv}
+            padding={0}
+            scale={{
+              x: { nice: false },
+              y: { nice: false },
+            }}
+          >
             <Coord reflect="y" />
             <Geom type="point" position="x*y" color="text" shape="cloud" />
           </Chart>
diff --git a/src/g2.js b/src/components/Charts/g2.js
similarity index 100%
rename from src/g2.js
rename to src/components/Charts/g2.js
diff --git a/src/components/Charts/index.js b/src/components/Charts/index.js
index d974de67..0fbf0144 100644
--- a/src/components/Charts/index.js
+++ b/src/components/Charts/index.js
@@ -1,4 +1,5 @@
 import numeral from 'numeral';
+import './g2';
 import ChartCard from './ChartCard';
 import Bar from './Bar';
 import Pie from './Pie';
diff --git a/src/index.js b/src/index.js
index f1a55e95..844b84a4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -2,7 +2,6 @@ import '@babel/polyfill';
 import dva from 'dva';
 import 'moment/locale/zh-cn';
 import FastClick from 'fastclick';
-import './g2';
 import './rollbar';
 import onError from './error';
 // import browserHistory from 'history/createBrowserHistory';
-- 
GitLab