tweak

src/chart/bar/BarView.js

@@ -36,12 +36,11 @@ define(function (require) {
                             y: layout.y + layout.height,
                             width: layout.width
                         },
-                        style: zrUtil.merge(
+                        style: zrUtil.extend(
                             dataItem.getModel('itemStyle.normal').getItemStyle(),
                             {
                                 fill: dataItem.getVisual('color')
-                            },
-                            true, false
+                            }
                         )
                     });
 

src/chart/line.js

 define(function (require) {
 
+    var zrUtil = require('zrender/core/util');
+    var echarts = require('../echarts');
+
     require('./line/LineSeries');
     require('./line/LineView');
 
-    require('./line/lineVisual');
-
-    var zrUtil = require('zrender/core/util');
-    require('../echarts').registerLayout(zrUtil.curry(
+    echarts.registerVisualCoding(zrUtil.curry(
+        require('../visual/symbol'), 'line', 'circle', 'line'
+    ));
+    echarts.registerLayout(zrUtil.curry(
         require('../layout/points'), 'line'
     ));
 });
\ No newline at end of file

src/chart/line/LineView.js

@@ -44,12 +44,11 @@ define(function(require) {
                     shape: {
                         points: points
                     },
-                    style: zrUtil.merge(
+                    style: zrUtil.extend(
                         lineStyleNormalModel.getLineStyle(),
                         {
                             stroke: seriesModel.getVisual('color')
-                        },
-                        true, false
+                        }
                     )
                 });
 
@@ -71,10 +70,12 @@ define(function(require) {
                 this.group.add(this._polyline);
             }
 
+            this._drawSymbol()
+
             this._data = data;
         },
 
-        _drawSymbols: function (data) {
+        _drawSymbol: function () {
 
         },
 

src/chart/line/lineVisual.js

-define(function (require) {
-
-    require('../../echarts').registerVisualCoding(function (ecModel) {
-        ecModel.eachSeriesByType('line', function (seriesModel) {
-            seriesModel.setVisual('legendSymbol', 'line');
-            var legendSymbol = seriesModel.get('symbol');
-            if (legendSymbol && legendSymbol !== 'none') {
-                seriesModel.setVisual('symbol', legendSymbol);
-            }
-        });
-    });
-});
\ No newline at end of file

src/chart/scatter.js

 define(function (require) {
 
     var zrUtil = require('zrender/core/util');
-
-    require('./scatter/scatterVisual');
+    var echarts = require('../echarts');
 
     require('./scatter/ScatterSeries');
     require('./scatter/ScatterView');
 
-    require('../echarts').registerLayout(zrUtil.curry(
+    echarts.registerVisualCoding(zrUtil.curry(
+        require('../visual/symbol'), 'scatter', 'circle', null
+    ));
+    echarts.registerLayout(zrUtil.curry(
         require('../layout/points'), 'scatter'
     ));
 });
\ No newline at end of file

src/component/axis.js

@@ -99,7 +99,7 @@ define(function(require) {
                     x2: p2[0],
                     y2: p2[1]
                 },
-                style: zrUtil.merge({
+                style: zrUtil.extend({
                     lineCap: 'round'
                 }, lineStyleModel.getLineStyle()),
                 z: axisModel.get('z'),

src/echarts.js

 /**
- * TODO processor的优先级
+ * TODO visualCoding 的优先级
  *      setTheme
- *      stack
  *      axis position 统一处理
+ *      规范 Symbol 配置和绘制
  */
 define(function (require) {
 
@@ -452,6 +452,7 @@ define(function (require) {
          * @param {*} layout
          */
         registerLayout: function (layout, isFactory) {
+            // PENDING All functions ?
             if (isFactory) {
                 if (zrUtil.indexOf(layoutClasses, layout) < 0) {
                     layoutClasses.push(layout);

src/model/Model.js

@@ -62,17 +62,18 @@ define(function (require) {
          * @param {string} path
          * @return {*}
          */
-        get: function (path, parentModel) {
+        get: function (path) {
+            if (! path) {
+                return this.option;
+            }
+
             if (typeof path === 'string') {
                 path = path.split('.');
             }
-            if (this.option == null) {
-                return;
-            }
 
             var obj = this.option;
             for (var i = 0; i < path.length; i++) {
-                obj = obj[path[i]];
+                obj = obj && obj[path[i]];
                 if (obj == null) {
                     break;
                 }

src/chart/scatter/scatterVisual.js → src/visual/symbol.js

 define(function (require) {
 
-    require('../../echarts').registerVisualCoding(function (ecModel) {
-
-        ecModel.eachSeriesByType('scatter', function (scatterSeries) {
-            var symbolType = scatterSeries.get('symbol') || 'circle';
+    return function (seriesType, defaultSymbolType, legendSymbol, ecModel, api) {
+        ecModel.eachSeriesByType(seriesType, function (scatterSeries) {
+            var symbolType = scatterSeries.get('symbol') || defaultSymbolType;
             var symbolSize = scatterSeries.get('symbolSize');
             scatterSeries.setVisual({
-                legendSymbol: symbolType,
+                legendSymbol: legendSymbol || symbolType,
                 symbol: symbolType,
                 symbolSize: symbolSize
             });
@@ -16,13 +15,10 @@ define(function (require) {
                 var symbolType = dataItem.get('symbol');
                 var symbolSize = dataItem.get('symbolSize');
                 if (typeof symbolSize === 'function') {
+                    var rawValue = dataItem.get('value') || dataItem.get();
                     dataItem.setVisual({
                         symbol: symbolType,
-                        symbolSize: symbolSize([
-                            dataItem.getX(),
-                            dataItem.getY(),
-                            dataItem.getValue()
-                        ])
+                        symbolSize: symbolSize(rawValue)
                     });
                 }
                 else if (symbolType && symbolType !== 'none') {
@@ -33,5 +29,5 @@ define(function (require) {
                 }
             });
         });
-    });
+    };
 });
\ No newline at end of file