markPoint复用getSymbolShape

eastmacro · Dec 30, 2013 · c346349 · c346349
1 parent 6fd7206
commit c346349
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 111 deletions.
diff --git a/src/chart/scatter.js b/src/chart/scatter.js
@@ -214,10 +214,10 @@ define(function(require) {
          * 生成折线图上的拐点图形
          */
         function _getSymbol(seriesIndex, dataIndex, name, x, y) {
-            var dataRange = component.dataRange;
             var serie = series[seriesIndex];
             var data = serie.data[dataIndex];
 
+            var dataRange = component.dataRange;
             var rangColor;
             if (dataRange) {
                 rangColor = isNaN(data[2]) 

diff --git a/src/component/base.js b/src/component/base.js
@@ -267,127 +267,52 @@ define(function(require) {
             );
             mpOption.name = series.name;
 
-            var dataRange = component.dataRange;
             var pList = [];
             var data = mpOption.data;
-            var queryTarget;
-            var symbol;
-            var symbolSize;
-            var symbolRotate;
             var itemShape;
 
-            // 多级控制
+            var dataRange = component.dataRange;
+            var legend = component.legend;
             var color;
+            var value
+            var queryTarget;
             var nColor;
             var eColor;
-            var nBorderColor;
-            var eBorderColor;
-            var nBorderWidth;
-            var eBorderWidth
-            var x;
-            var y;
             for (var i = 0, l = data.length; i < l; i++) {
-                queryTarget = [data[i], mpOption];
-                symbol = self.deepQuery(queryTarget, 'symbol') || 'pin';
-                symbolSize = self.deepQuery(queryTarget,'symbolSize');
-                symbolSize = typeof symbolSize == 'function'
-                             ? symbolSize(data[i].value)
-                             : symbolSize;
-                symbolRotate = self.deepQuery(queryTarget, 'symbolRotate');
-                color = (dataRange && !isNaN(data[i].value))
-                        ? dataRange.getColor(data[i].value)
-                        : null;
-                // 用户设定优先于从值域控件里取
-                nColor = self.deepQuery(
-                    queryTarget, 'itemStyle.normal.color'
-                ) 
-                || color 
-                || (component.legend && component.legend.getColor(series.name));
-                eColor = self.deepQuery(
-                    queryTarget, 'itemStyle.emphasis.color'
-                ) || nColor;
-
-                nBorderColor = self.deepQuery(
-                    queryTarget, 'itemStyle.normal.borderColor'
-                ) || nColor;
-                eBorderColor = self.deepQuery(
-                    queryTarget, 'itemStyle.emphasis.borderColor'
-                ) || nBorderColor;
-
-                nBorderWidth = self.deepQuery(
-                    queryTarget, 'itemStyle.normal.borderWidth'
-                );
-                eBorderWidth = self.deepQuery(
-                    queryTarget, 'itemStyle.emphasis.borderWidth'
-                ) || (nBorderWidth + 2);
-
-                x = data[i].x;
-                y = data[i].y;
-
-                itemShape = {
-                    shape : 'icon',
-                    style : {
-                        iconType : symbol.replace('empty', '').toLowerCase(),
-                        x : x - symbolSize,
-                        y : y - symbolSize,
-                        width : symbolSize * 2,
-                        height : symbolSize * 2,
-                        brushType : 'both',
-                        color : symbol.match('empty') 
-                                ? 'rgba(0,0,0,0)' : nColor,
-                        strokeColor : nBorderColor,
-                        lineWidth: nBorderWidth
-                    },
-                    highlightStyle : {
-                        color : symbol.match('empty') 
-                                ? 'rgba(0,0,0,0)' : eColor,
-                        strokeColor : eBorderColor,
-                        lineWidth: eBorderWidth
-                    },
-                    clickable : true
-                };
-
-                if (symbol.match('image')) {
-                    itemShape.style.image = 
-                        symbol.replace(new RegExp('^image:\\/\\/'), '');
-                    itemShape.shape = 'image';
-                }
-
-                if (typeof symbolRotate != 'undefined') {
-                    itemShape.rotation = [
-                        symbolRotate * Math.PI / 180, x, y
-                    ];
-                }
-
-                if (symbol.match('star')) {
-                    itemShape.style.iconType = 'star';
-                    itemShape.style.n = 
-                        (symbol.replace('empty', '').replace('star','') - 0) 
-                        || 5;
+                // 图例
+                if (legend) {
+                    color = legend.getColor(series.name)
                 }
-
-                if (symbol == 'none' ||(nColor == null && eColor == null)) {
-                    itemShape.invisible = true;
-                    itemShape.hoverable = false;
-                }
-
-                itemShape = self.addLabel(
-                    itemShape, 
-                    mpOption,
-                    data[i], 
-                    data[i].name, 
-                    'horizontal'
-                );
-                if (symbol.match('empty')) {
-                    if (typeof itemShape.style.textColor == 'undefined') {
-                        itemShape.style.textColor = itemShape.style.strokeColor;
-                    }
-                    if (typeof itemShape.highlightStyle.textColor == 'undefined'
-                    ) {
-                        itemShape.highlightStyle.textColor = 
-                            itemShape.highlightStyle.strokeColor;
+                // 值域
+                if (dataRange) {
+                    value = typeof data[i] != 'undefined'
+                            ? (typeof data[i].value != 'undefined'
+                              ? data[i].value
+                              : data[i])
+                            : '-';
+                    color = isNaN(value) ? color : dataRange.getColor(value);
+
+                    queryTarget = [data[i], mpOption];
+                    nColor = self.deepQuery(
+                        queryTarget, 'itemStyle.normal.color'
+                    ) || color;
+                    eColor = self.deepQuery(
+                        queryTarget, 'itemStyle.emphasis.color'
+                    ) || nColor;
+                    // 有值域，并且值域返回null且用户没有自己定义颜色，则隐藏这个mark
+                    if (nColor == null && eColor == null) {
+                        continue;
                     }
                 }
+                // 复用getSymbolShape
+                itemShape = getSymbolShape(
+                    mpOption, seriesIndex,      // 系列 
+                    data[i], i, data[i].name,   // 数据
+                    data[i].x, data[i].y,       // 坐标
+                    'pin', color,               // 默认symbol和color
+                    'rgba(0,0,0,0)',
+                    'horizontal'                // 走向，用于默认文字定位
+                )
 
                 ecData.pack(
                     itemShape,