bug fix

Author: somonus

example/graph/index.js

@@ -20,7 +20,6 @@ export default class App extends Component {
     const options = {
       title : {
         text: '某站点用户访问来源',
-        subtext: '纯属虚构',
         x:'center'
       },
       tooltip : {

lib/components/Chart.js

@@ -74,23 +74,33 @@ var Charts = (function (_Component) {
     var onReady = this.props.onReady;
 
     this.drawChart();
-    if (onReady) onReady(this.chart);
+    if (onReady) {
+      onReady(this.chart);
+    }
   };
 
   Charts.prototype.componentDidUpdate = function componentDidUpdate(prevProps) {
     var _this = this;
 
-    var prevPropsArray = _react2['default'].Children.map(prevProps.children, function (preChild) {
-      return preChild.props;
-    });
-    var propsArray = _react2['default'].Children.map(this.props.children, function (child) {
-      return child.props;
-    });
-    propsArray.map(function (props, index) {
-      if (props !== prevPropsArray[index]) {
-        _this.drawChart();
+    if (this.props.options) {
+      if (prevProps.options !== this.props.options) {
+        this.drawChart();
       }
-    });
+    } else {
+      (function () {
+        var prevPropsArray = _react2['default'].Children.map(prevProps.children, function (preChild) {
+          return preChild.props;
+        });
+        var propsArray = _react2['default'].Children.map(_this.props.children, function (child) {
+          return child.props;
+        });
+        propsArray.map(function (props, index) {
+          if (props !== prevPropsArray[index]) {
+            _this.drawChart();
+          }
+        });
+      })();
+    }
   };
 
   Charts.prototype.componentWillUnmount = function componentWillUnmount() {
@@ -105,10 +115,14 @@ var Charts = (function (_Component) {
   };
 
   Charts.prototype.drawChart = function drawChart() {
-    console.log(2);
     var node = this.refs.chart;
-    var options = _utilsFilterMap2['default'](['backgroundColor', 'animation', 'calculable', 'renderAsImage', 'timeline', 'title', 'toolbox', 'tooltip', 'legend', 'dataRange', 'dataZoom', 'roamController', 'grid', 'color', 'xAxis', 'yAxis', 'series'], this.props);
-    this.getChartData(options);
+    var options = undefined;
+    if (this.props.options) {
+      options = this.props.options;
+    } else {
+      options = _utilsFilterMap2['default'](['backgroundColor', 'animation', 'calculable', 'renderAsImage', 'timeline', 'title', 'toolbox', 'tooltip', 'legend', 'dataRange', 'dataZoom', 'roamController', 'grid', 'color', 'xAxis', 'yAxis', 'series'], this.props);
+      this.getChartData(options);
+    }
     this.chart = _echarts2['default'].init(node);
     this.chart.setOption(options, this.props.theme);
   };

lib/components/Graph.js

@@ -0,0 +1,38 @@
+'use strict';
+
+var _inherits = require('babel-runtime/helpers/inherits')['default'];
+
+var _createClass = require('babel-runtime/helpers/create-class')['default'];
+
+var _classCallCheck = require('babel-runtime/helpers/class-call-check')['default'];
+
+var _interopRequireDefault = require('babel-runtime/helpers/interop-require-default')['default'];
+
+exports.__esModule = true;
+
+var _ChartBase2 = require('./ChartBase');
+
+var _ChartBase3 = _interopRequireDefault(_ChartBase2);
+
+var graph = (function (_ChartBase) {
+  _inherits(graph, _ChartBase);
+
+  function graph() {
+    _classCallCheck(this, graph);
+
+    _ChartBase.apply(this, arguments);
+  }
+
+  _createClass(graph, null, [{
+    key: 'defaultProps',
+    value: {
+      type: 'graph'
+    },
+    enumerable: true
+  }]);
+
+  return graph;
+})(_ChartBase3['default']);
+
+exports['default'] = graph;
+module.exports = exports['default'];

lib/index.js

@@ -28,6 +28,10 @@ var _componentsMap = require('./components/Map');
 
 var _componentsMap2 = _interopRequireDefault(_componentsMap);
 
+var _componentsGraph = require('./components/Graph');
+
+var _componentsGraph2 = _interopRequireDefault(_componentsGraph);
+
 var _componentsChart = require('./components/Chart');
 
 var _componentsChart2 = _interopRequireDefault(_componentsChart);
@@ -38,6 +42,7 @@ _componentsChart2['default'].Pie = _componentsPie2['default'];
 _componentsChart2['default'].Bar = _componentsBar2['default'];
 _componentsChart2['default'].Cloud = _componentsCloud2['default'];
 _componentsChart2['default'].Map = _componentsMap2['default'];
+_componentsChart2['default'].Graph = _componentsGraph2['default'];
 
 exports['default'] = _componentsChart2['default'];
 module.exports = exports['default'];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-echarts",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "react echarts",
   "keywords": [
     "react",

src/components/Chart.js

@@ -45,17 +45,25 @@ export default class Charts extends Component {
   componentDidMount() {
     const { onReady } = this.props;
     this.drawChart();
-    if (onReady) onReady(this.chart);
+    if (onReady) {
+      onReady(this.chart);
+    }
   }
 
   componentDidUpdate(prevProps) {
-    const prevPropsArray = React.Children.map(prevProps.children, (preChild) => preChild.props);
-    const propsArray = React.Children.map(this.props.children, (child) => child.props);
-    propsArray.map((props, index) => {
-      if (props !== prevPropsArray[index]) {
+    if (this.props.options) {
+      if (prevProps.options !== this.props.options) {
         this.drawChart();
       }
-    });
+    } else {
+      const prevPropsArray = React.Children.map(prevProps.children, (preChild) => preChild.props);
+      const propsArray = React.Children.map(this.props.children, (child) => child.props);
+      propsArray.map((props, index) => {
+        if (props !== prevPropsArray[index]) {
+          this.drawChart();
+        }
+      });
+    }
   }
 
   componentWillUnmount() {