雷达图 itemStyle.label.formatter支持

doc/example/radar.html

@@ -214,6 +214,17 @@ option = {
                     name : '张三',
                     itemStyle: {
                         normal: {
+                            color: function(seriesIndex, dataIndex, value) {
+                                return isNaN(value) 
+                                       ? undefined
+                                       : (value >= 120 ? 'green' : 'red')
+                            },
+                            label: {
+                                show: true,
+                                formatter:function(seriesName, indicatorName, value) {
+                                    return value;
+                                }
+                            },
                             areaStyle: {
                                 color: (function (){
                                     var zrColor = require('zrender/tool/color');

src/chart/radar.js

@@ -123,7 +123,7 @@
 
                 pointList = this._getPointList(this.serie.polarIndex, data[i]);
                 // 添加拐点形状
-                this._addSymbol(pointList, defaultColor, i, index);
+                this._addSymbol(pointList, defaultColor, i, index, this.serie.polarIndex);
                 // 添加数据形状
                 this._addDataShape(
                     pointList, defaultColor, data[i],
@@ -145,7 +145,12 @@
             var polar = this.component.polar;
 
             for (var i = 0, l = dataArr.value.length; i < l; i++) {
-                vector = polar.getVector(polarIndex, i, dataArr.value[i]);
+                vector = polar.getVector(
+                    polarIndex, 
+                    i, 
+                    typeof dataArr.value[i].value != 'undefined'
+                    ? dataArr.value[i].value : dataArr.value[i]
+                );
                 if (vector) {
                     pointList.push(vector);
                 } 
@@ -160,13 +165,19 @@
          * @param {object} data 数据
          * @param {number} serieIndex
          */
-        _addSymbol : function (pointList, defaultColor, dataIndex, seriesIndex) {
+        _addSymbol : function (pointList, defaultColor, dataIndex, seriesIndex, polarIndex) {
             var series = this.series;
             var itemShape;
+            var polar = this.component.polar;
+
             for (var i = 0, l = pointList.length; i < l; i++) {
                 itemShape = this.getSymbolShape(
-                    series[seriesIndex], seriesIndex, 
-                    series[seriesIndex].data[dataIndex], dataIndex, '', 
+                    this.deepMerge(
+                        [series[seriesIndex].data[dataIndex], series[seriesIndex]]
+                    ),
+                    seriesIndex, 
+                    series[seriesIndex].data[dataIndex].value[i], i,
+                    polar.getIndicatorText(polarIndex, i),
                     pointList[i][0],    // x
                     pointList[i][1],    // y
                     this._symbol[this._radarDataCounter % this._symbol.length],
@@ -175,6 +186,9 @@
                     'vertical'
                 );
                 itemShape.zlevel = this._zlevelBase + 1;
+                ecData.set(itemShape, 'data', series[seriesIndex].data[dataIndex]);
+                ecData.set(itemShape, 'value', series[seriesIndex].data[dataIndex].value);
+                ecData.set(itemShape, 'dataIndex', dataIndex);
                 ecData.set(itemShape, 'special', i);
                 this.shapeList.push(itemShape);
             }

src/component/polar.js

@@ -216,6 +216,7 @@ define(function (require) {
                 else {
                     style.text = indicator[i].text;
                 }
+                __ecIndicator[i].text = style.text;
                 
                 vector = __ecIndicator[i].vector;
 
@@ -266,6 +267,12 @@ define(function (require) {
                 }));
             }
         },
+        
+        getIndicatorText : function(polarIndex, indicatorIndex) {
+            return this.polar[polarIndex]
+                   && this.polar[polarIndex].__ecIndicator[indicatorIndex]
+                   && this.polar[polarIndex].__ecIndicator[indicatorIndex].text;
+        },
 
         /**
          * 添加一个隐形的盒子 当做drop的容器 暴露给外部的图形类使用
@@ -622,14 +629,18 @@ define(function (require) {
             }
             if (data.length != 1) {
                 for (var i = 0; i < data.length; i ++) {
-                    value = data[i].value[index];
+                    value = typeof data[i].value[index].value != 'undefined'
+                            ? data[i].value[index].value : data[i].value[index];
                     _compare(value);
                 }
             }
             else {
                 one = data[0];
                 for (var i = 0; i < one.value.length; i ++) {
-                    _compare(one.value[i]);
+                    _compare(
+                        typeof one.value[i].value != 'undefined' 
+                        ? one.value[i].value : one.value[i]
+                    );
                 }
             }
 

src/component/tooltip.js

@@ -782,7 +782,8 @@ define(function (require) {
                         params.push([
                             seriesArray[i].name || '',
                             data.name,
-                            data.value[dataIndex],
+                            typeof data.value[dataIndex].value != 'undefined'
+                                ? data.value[dataIndex].value : data.value[dataIndex],
                             indicatorName
                         ]);
                     }