【重要】图表类型自注册，按需加载

doc/asset/js/echartsExample.js

@@ -65,14 +65,23 @@ require.config({
         {
             name: 'zrender',
             location: 'http://ecomfe.github.io/zrender/src',
+            //location: '../../../zrender/src',
             main: 'zrender'
         }
     ]
 });
 
 var echarts;
 require(
-    ['echarts/echarts'],
+    [
+        'echarts/echarts',
+        'echarts/chart/line',
+        'echarts/chart/bar',
+        'echarts/chart/scatter',
+        'echarts/chart/k',
+        'echarts/chart/pie',
+        'echarts/chart/map'
+    ],
     function(ec) {
         echarts = ec;
         if (myChart && myChart.dispose) {

src/chart.js

@@ -28,20 +28,5 @@ define(function(require) {    //chart
         return _chartLibrary[name];
     };
 
-    // 内置图表注册
-    self.define('island', require('./chart/island'));
-
-    self.define('pie', require('./chart/pie'));
-
-    self.define('bar', require('./chart/bar'));
-
-    self.define('line', require('./chart/line'));
-
-    self.define('map', require('./chart/map'));
-
-    self.define('k', require('./chart/k'));
-
-    self.define('scatter', require('./chart/scatter'));
-
     return self;
 });

src/chart/bar.js

@@ -760,5 +760,8 @@ define(function(require) {
         init(option, component);
     }
 
+    // 图表注册
+    require('../chart').define('bar', Bar);
+
     return Bar;
 });

src/chart/island.js

@@ -233,5 +233,8 @@ define(function (require) {
         self.ondragend = ondragend;
     }
 
+    // 图表注册
+    require('../chart').define('island', Island);
+
     return Island;
 });

src/chart/k.js

@@ -433,9 +433,11 @@ define(function(require) {
         init(option, component);
     }
 
-    var shape = require('zrender/shape');
-    var Candle = require('../util/shape/candle');
-    shape.define('candle', new Candle());
+    // 动态扩展zrender shape：candle
+    require('../util/shape/candle');
 
+    // 图表注册
+    require('../chart').define('k', K);
+
     return K;
 });

src/chart/line.js

@@ -797,5 +797,8 @@ define(function(require) {
         init(option, component);
     }
 
+    // 图表注册
+    require('../chart').define('line', Line);
+
     return Line;
 });

src/chart/map.js

@@ -515,5 +515,8 @@ define(function(require) {
         init(option, component);
     }
 
+    // 图表注册
+    require('../chart').define('map', Map);
+
     return Map;
 });

src/chart/pie.js

@@ -876,5 +876,8 @@ define(function(require) {
         init(option, component);
     }
 
+    // 图表注册
+    require('../chart').define('pie', Pie);
+
     return Pie;
 });

src/chart/scatter.js

@@ -420,9 +420,11 @@ define(function(require) {
         init(option, component);
     }
 
-    var shape = require('zrender/shape');
-    var Symbol = require('../util/shape/symbol');
-    shape.define('symbol', new Symbol());
-
+    // 动态扩展zrender shape：symbol
+    require('../util/shape/symbol');
+
+    // 自注册
+    require('../chart').define('scatter', Scatter);
+
     return Scatter;
 });

src/component.js

@@ -29,26 +29,5 @@ define(function(require) {    //component
         return _componentLibrary[name];
     };
 
-    // 内置组件注册
-    self.define('axis', require('./component/axis'));
-
-    self.define('categoryAxis', require('./component/categoryAxis'));
-
-    self.define('valueAxis', require('./component/valueAxis'));
-
-    self.define('grid', require('./component/grid'));
-
-    self.define('dataZoom', require('./component/dataZoom'));
-
-    self.define('legend', require('./component/legend'));
-
-    self.define('dataRange', require('./component/dataRange'));
-
-    self.define('tooltip', require('./component/tooltip'));
-
-    self.define('toolbox', require('./component/toolbox'));
-
-    self.define('dataView', require('./component/dataView'));
-
     return self;
 });

src/component/axis.js

@@ -184,5 +184,7 @@ define(function (require) {
         init(option, component, axisType);
     }
 
+    require('../component').define('axis', Axis);
+
     return Axis;
 });

src/component/categoryAxis.js

@@ -639,5 +639,7 @@ define(function (require) {
         init(option, grid);
     }
 
+    require('../component').define('categoryAxis', CategoryAxis);
+
     return CategoryAxis;
 });

src/component/dataRange.js

@@ -1130,6 +1130,8 @@ define(function (require) {
         init(option);
     }
 
+    require('../component').define('dataRange', DataRange);
+
     return DataRange;
 });
 

src/component/dataView.js

@@ -433,5 +433,7 @@ define(function (require) {
         _init();
     }
 
+    require('../component').define('dataView', DataView);
+
     return DataView;
 });

src/component/dataZoom.js

@@ -679,5 +679,7 @@ define(function (require) {
         init(option);
     }
 
+    require('../component').define('dataZoom', DataZoom);
+
     return DataZoom;
 });

src/component/grid.js

@@ -132,5 +132,7 @@ define(function (require) {
         init(option);
     }
 
+    require('../component').define('grid', Grid);
+
     return Grid;
 });

src/component/legend.js

@@ -498,6 +498,8 @@ define(function (require) {
         init(option);
     }
 
+    require('../component').define('legend', Legend);
+
     return Legend;
 });
 

src/component/toolbox.js

@@ -633,5 +633,10 @@ define(function (require) {
         self.resetMagicType = resetMagicType;
     }
 
+    // 动态扩展zrender shape：icon
+    require('../util/shape/icon');
+
+    require('../component').define('toolbox', Toolbox);
+
     return Toolbox;
 });

src/component/tooltip.js

@@ -778,5 +778,7 @@ define(function (require) {
         init(option, dom);
     }
 
+    require('../component').define('tooltip', Tooltip);
+
     return Tooltip;
 });

src/component/valueAxis.js

@@ -790,6 +790,8 @@ define(function (require) {
         init(option, grid, series);
     }
 
+    require('../component').define('valueAxis', ValueAxis);
+
     return ValueAxis;
 });
 

src/echarts.js

@@ -92,17 +92,27 @@ define(function(require) {
             _zr.on(zrConfig.EVENT.DROP, _ondrop);
 
 
-            var shape = require('zrender/shape');
-            var Icon = require('./util/shape/icon');
-            shape.define('icon', new Icon());
-
-            // 孤岛
+            // 内置图表注册
             var chartLibrary = require('./chart');
+            require('./chart/island');
+            // 孤岛
             var Island = chartLibrary.get('island');
             _island = new Island(_messageCenter, _zr);
-
-            // 工具箱
+
+
+            // 内置组件注册
             var componentLibrary = require('./component');
+            require('./component/axis');
+            require('./component/categoryAxis');
+            require('./component/valueAxis');
+            require('./component/grid');
+            require('./component/dataZoom');
+            require('./component/legend');
+            require('./component/dataRange');
+            require('./component/tooltip');
+            require('./component/toolbox');
+            require('./component/dataView');
+            // 工具箱
             var Toolbox = componentLibrary.get('toolbox');
             _toolbox = new Toolbox(_messageCenter, _zr, dom);
         }

src/util/shape/candle.js

@@ -183,9 +183,9 @@ define(
             }
         };
 
-        var base = require('zrender/shape/base');
-            base.derive(Candle);
-
+        require('zrender/shape/base').derive(Candle);
+        require('zrender/shape').define('candle', new Candle());
+        
         return Candle;
     }
 );

src/util/shape/icon.js

@@ -328,9 +328,9 @@ define(
             }
         };
 
-        var base = require('zrender/shape/base');
-            base.derive(Icon);
-
+        require('zrender/shape/base').derive(Icon);
+        require('zrender/shape').define('icon', new Icon());
+            
         return Icon;
     }
 );

src/util/shape/symbol.js

@@ -206,9 +206,9 @@ define(
             }
         };
 
-        var base = require('zrender/shape/base');
-            base.derive(Symbol);
-
+        require('zrender/shape/base').derive(Symbol);
+        require('zrender/shape').define('symbol', new Symbol());
+        
         return Symbol;
     }
 );