diff --git a/doc/doc.html b/doc/doc.html index 7b2f958a52d56e4faffce0177f9701832a8a1b1e..02d7cb7c3e5b47c5147bfd4fece775ac75f83bd2 100644 --- a/doc/doc.html +++ b/doc/doc.html @@ -1086,7 +1086,7 @@ feature : {
  • 折线（区域）图、柱状（条形）图: a（系列名称），b（类目值），c（数值）, d（无）
  • 散点图（气泡）图 : a（系列名称），b（数据名称），c（数值数组）, d（无）
  • 饼图、雷达图 : a（系列名称），b（数据项名称），c（数值）, d（百分比）
    • -
  • 弦图 : a（系列名称），b（源数据项名称），c（源数据项值）, d（目标数据项名称), e(目标数据项值)
    • +
  • 弦图 : a（系列名称），b（源数据项名称），c（源数据项值），d（目标数据项名称)， e(目标数据项值)
    • diff --git a/doc/example/chord.html b/doc/example/chord.html index 9aaedb1ce20bd0b6f2230df39251cf840bc8085e..bcafeb0c7e22f3ecccd7a1736f3a9bd87817f759 100644 --- a/doc/example/chord.html +++ b/doc/example/chord.html @@ -75,8 +75,7 @@ option = { y:'bottom' }, tooltip : { - trigger: 'item', - formatter: '{b}' + trigger: 'item' }, legend: { x: 'left', @@ -87,19 +86,18 @@ option = { type:'chord', sort : 'ascending', sortSub : 'descending', - data : [{ - name : 'g1' - }, { - name : 'g2' - }, { - name : 'g3' - }, { - name : 'g4' - }], + showScale : true, + showScaleText : true, + data : [ + {name : 'g1'}, + {name : 'g2'}, + {name : 'g3'}, + {name : 'g4'} + ], itemStyle : { normal : { label : { - color : 'blue' + show : false } } }, diff --git a/doc/example/chord1.html b/doc/example/chord1.html index 9a5c558207b2b63bfd42970960a805e4c9ca3c30..f5b46265295b67e95c799bfc6dbf0cab10742872 100644 --- a/doc/example/chord1.html +++ b/doc/example/chord1.html @@ -75,8 +75,8 @@ option = { y:'bottom' }, tooltip : { - trigger: 'item', - formatter: '{b} {a} {d}' + trigger: 'item' + //formatter: '{b} {a} {d}' }, legend : { data : [ diff --git a/src/component/legend.js b/src/component/legend.js index 64c488dc953ea1dfc4c050f181ada7671ea982ac..d97cc9e894287b27ece6cdefe06ddaa1a33debec 100644 --- a/src/component/legend.js +++ b/src/component/legend.js @@ -570,6 +570,9 @@ define(function (require) { * @param {Object} itemShape */ function getItemShape(name) { + if (typeof name == 'undefined') { + return; + } var shape; for (var i = 0, l = self.shapeList.length; i < l; i++) { shape = self.shapeList[i]; diff --git a/src/component/tooltip.js b/src/component/tooltip.js index e0d0eddd218cdb642c17b7422ee51bac588c1f71..10df9e9838d9172b0d19a7a09f389cd5031beeab 100644 --- a/src/component/tooltip.js +++ b/src/component/tooltip.js @@ -573,7 +573,7 @@ define(function (require) { : '-'; params.push([ - seriesArray[i].name, + seriesArray[i].name || '', categoryAxis.getNameByIndex(dataIndex), data ]); @@ -591,7 +591,7 @@ define(function (require) { for (var i = 0, l = seriesArray.length; i < l; i++) { formatter = formatter.replace( '{a' + i + '}', - _encodeHTML(seriesArray[i].name) + _encodeHTML(seriesArray[i].name || '') ); formatter = formatter.replace( '{b' + i + '}', @@ -617,7 +617,8 @@ define(function (require) { ); for (var i = 0, l = seriesArray.length; i < l; i++) { - formatter += '
    ' + _encodeHTML(seriesArray[i].name) + formatter += '
    ' + + _encodeHTML(seriesArray[i].name || '') + ' : '; data = seriesArray[i].data[dataIndex]; data = typeof data != 'undefined' @@ -706,8 +707,7 @@ define(function (require) { : {name:'', value: {dataIndex:'-'}}; params.push([ - typeof seriesArray[i].name != 'undefined' - ? seriesArray[i].name : '', + seriesArray[i].name || '', data.name, data.value[dataIndex], indicatorName @@ -786,7 +786,7 @@ define(function (require) { var data = ecData.get(_curTarget, 'data'); var name = ecData.get(_curTarget, 'name'); var value = ecData.get(_curTarget, 'value'); - var speical = ecData.get(_curTarget, 'special'); + var special = ecData.get(_curTarget, 'special'); // 从低优先级往上找到trigger为item的formatter和样式 var formatter; var showContent; @@ -831,15 +831,15 @@ define(function (require) { } if (typeof formatter == 'function') { - _curTicket = serie.name + _curTicket = (serie.name || '') + ':' + ecData.get(_curTarget, 'dataIndex'); _tDom.innerHTML = formatter( [ - serie.name, + serie.name || '', name, value, - speical + special ], _curTicket, _setContent @@ -849,45 +849,71 @@ define(function (require) { _curTicket = NaN; formatter = formatter.replace('{a}','{a0}') .replace('{b}','{b0}') - .replace('{c}','{c0}') - .replace('{d}','{d0}'); - formatter = formatter.replace('{a0}', _encodeHTML(serie.name)) + .replace('{c}','{c0}'); + formatter = formatter.replace( + '{a0}', _encodeHTML(serie.name || '') + ) .replace('{b0}', _encodeHTML(name)) .replace('{c0}', value); - if (typeof speical != 'undefined') { - formatter = formatter.replace('{d0}', speical); - } + formatter = formatter.replace('{d}','{d0}') + .replace('{d0}', special || ''); + formatter = formatter.replace('{e}','{e0}') + .replace('{e0}', ecData.get(_curTarget, 'special2') || ''); _tDom.innerHTML = formatter; } else { _curTicket = NaN; if (serie.type == ecConfig.CHART_TYPE_SCATTER) { - _tDom.innerHTML = _encodeHTML(serie.name) + '
    ' + - (name === '' - ? '' : (_encodeHTML(name) + ' : ') + _tDom.innerHTML = (typeof serie.name != 'undefined' + ? (_encodeHTML(serie.name) + '
    ') + : '' + ) + + (name === '' + ? '' : (_encodeHTML(name) + ' : ') ) + value - + (typeof speical == 'undefined' + + (typeof special == 'undefined' ? '' - : (' (' + speical + ')')); + : (' (' + special + ')')); } else if (serie.type == ecConfig.CHART_TYPE_RADAR) { - indicator = speical; - html += _encodeHTML(name === '' ? serie.name : name) + '
    '; + indicator = special; + html += _encodeHTML( + name === '' ? (serie.name || '') : name + ); + html += html === '' ? '' : '
    '; for (var i = 0 ; i < indicator.length; i ++) { html += _encodeHTML(indicator[i].text) + ' : ' + value[i] + '
    '; } _tDom.innerHTML = html; } + else if (serie.type == ecConfig.CHART_TYPE_CHORD) { + var special2 = ecData.get(_curTarget, 'special2'); + if (typeof special2 == 'undefined') { + // 外环上 + _tDom.innerHTML = _encodeHTML(name) + ' (' + value + ')'; + } + else { + // 内部弦上 + _tDom.innerHTML = (typeof serie.name != 'undefined' + ? (_encodeHTML(serie.name) + '
    ') + : '') + + _encodeHTML(name) + ' (' + value + ')' + + ' : ' + + _encodeHTML(special) + ' (' + special2 + ')'; + } + } else { - _tDom.innerHTML = _encodeHTML(serie.name) + '
    ' + - _encodeHTML(name) + ' : ' + value + - (typeof speical == 'undefined' + _tDom.innerHTML = (typeof serie.name != 'undefined' + ? (_encodeHTML(serie.name) + '
    ') + : '') + + _encodeHTML(name) + ' : ' + value + + (typeof special == 'undefined' ? '' - : (' (' + speical + ')')); + : (' (' + special + ')')); } } diff --git a/src/config.js b/src/config.js index c787aecec4ac138cc4d0902be71248850705bf2b..70f2fc2f5656b6e2f7c9acd0ebea5f76fb9d710d 100644 --- a/src/config.js +++ b/src/config.js @@ -671,7 +671,7 @@ define(function() { sortSub : 'none', // can be 'none', 'ascending', 'descending' startAngle : 90, clockWise : false, - showScale : true, + showScale : false, showScaleText : false, itemStyle : { normal : { diff --git a/src/util/ecData.js b/src/util/ecData.js index bedaf2c01f51ba6c221bfce7ff5bc0f91313c69e..e844a6635544e4bd39fca603e922d44859417b0f 100644 --- a/src/util/ecData.js +++ b/src/util/ecData.js @@ -15,8 +15,11 @@ define(function() { * @param {number | Object} data * @param {number} dataIndex * @param {*=} special + * @param {*=} special2 */ - function pack(shape, series, seriesIndex, data, dataIndex, name, special) { + function pack( + shape, series, seriesIndex, data, dataIndex, name, special, special2 + ) { var value; if (typeof data != 'undefined') { if (typeof data.value != 'undefined') { @@ -34,7 +37,8 @@ define(function() { '_dataIndex' : dataIndex, '_name' : name, '_value' : value, - '_special' : special + '_special' : special, + '_special2' : special2 }; return shape._echartsData; } @@ -65,6 +69,8 @@ define(function() { return data && data._value; case 'special' : return data && data._special; + case 'special2' : + return data && data._special2; } return null; @@ -100,6 +106,9 @@ define(function() { case 'special' : shape._echartsData._special = value; break; + case 'special2' : + shape._echartsData._special2 = value; + break; } }