diff --git a/doc/asset/img/example/force2.png b/doc/asset/img/example/force2.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa194a108d60c45d086dfe24675a4f42c2ca25d7
Binary files /dev/null and b/doc/asset/img/example/force2.png differ
diff --git a/doc/asset/js/dataDancing.js b/doc/asset/js/dataDancing.js
index 4e480af365c6cc11c69441cb6bcb05d0fe5785fa..d04d9eaa1cddf95080250cd4424db1cc20409b04 100644
--- a/doc/asset/js/dataDancing.js
+++ b/doc/asset/js/dataDancing.js
@@ -2,14 +2,16 @@ require.config({
paths:{
echarts:'example/www/js/echarts',
'echarts/chart/bar' : 'example/www/js/echarts',
- 'echarts/chart/line': 'example/www/js/echarts'
+ 'echarts/chart/line': 'example/www/js/echarts',
+ 'echarts/chart/scatter': 'example/www/js/echarts'
}
});
require(
[
'echarts',
'echarts/chart/bar',
- 'echarts/chart/line'
+ 'echarts/chart/line',
+ 'echarts/chart/scatter'
],
function(ec) {
myChart = ec.init(document.getElementById('main'));
@@ -33,7 +35,7 @@ require(
xAxis : [
{
type : 'category',
- axisLabel:{formatter:' '},
+ axisLabel:{show:false},
data : (function() {
var res = [];
for (var i = 0; i < 30; i++) {
@@ -50,6 +52,8 @@ require(
min:-30,
max:30,
power:1,
+ axisLine:{show:false},
+ axisLabel:{show:false},
splitArea : {show : true}
}
],
diff --git a/doc/example.html b/doc/example.html
index f732f989e08769af6a2e0b91239577456398aa3d..9581f939104730ec374652cc89470386bc7179da 100644
--- a/doc/example.html
+++ b/doc/example.html
@@ -291,6 +291,10 @@
简单关系网络。
+树状关系网络。
+Webkit内核依赖。
diff --git a/doc/example/force2.html b/doc/example/force2.html index 071b5ba68f14c158054e61e51247d915d68b3467..cf3c01178d05255789015f93e36d393b5c176c88 100644 --- a/doc/example/force2.html +++ b/doc/example/force2.html @@ -170,7 +170,7 @@ option = { color : '#af0000' } } - }, + } ], itemStyle: { normal: { diff --git a/doc/example/force3.html b/doc/example/force3.html index 15b26bb7733259bba258ffdfc5fe700a7a033743..5d0c5ad2028610daff0491c9f622b4ee82a5d82b 100644 --- a/doc/example/force3.html +++ b/doc/example/force3.html @@ -168,7 +168,7 @@ option = { color : '#af0000' } } - }, + } ], itemStyle: { normal: { diff --git a/src/chart/pie.js b/src/chart/pie.js index 66c51a45ebdc5a3b94583f6681bd1bdc3334c9a5..353f49a82bf8489d2b968eeab1ebe1848e25dab0 100644 --- a/src/chart/pie.js +++ b/src/chart/pie.js @@ -416,7 +416,7 @@ define(function(require) { var prePercent = preData.value * percent / data.value; if (prePercent < 4) { // 都小就延长,前小后大就缩短 - radius = preData.__labelRadius + (percent < 4 ? 20 : -20) + radius = preData.__labelRadius + (percent < 4 ? 20 : -20); x = centerX + radius * zrMath.cos(midAngle, true); y = centerY - radius * zrMath.sin(midAngle, true); } diff --git a/src/component/dataRange.js b/src/component/dataRange.js index aed6957cf923e9f57b5672c9e8da7973508b2603..0221aebc239b48e686b20d4586b616929abc9f58 100644 --- a/src/component/dataRange.js +++ b/src/component/dataRange.js @@ -1135,7 +1135,7 @@ define(function (require) { var newColorList = [_colorList[0]]; var step = len / (splitNumber - 1); for (var i = 1; i < splitNumber - 1; i++) { - newColorList.push(_colorList[Math.floor(i * step)]) + newColorList.push(_colorList[Math.floor(i * step)]); } newColorList.push(_colorList[len - 1]); _colorList = newColorList; diff --git a/src/config.js b/src/config.js index 7fa22226e7ba3181442d6e6eca9e78fbe6bf6c40..db3d39353657508839e8414502d5a352a3ecc12e 100644 --- a/src/config.js +++ b/src/config.js @@ -569,7 +569,7 @@ define(function() { }, //symbol: null, // 拐点图形类型 symbolSize: 2 // 可计算特性参数,空数据拖拽提示图形大小 - //symbolRotate : null, // 图形旋转控制 + //symbolRotate : null, // 图形旋转控制 }, // 饼图默认参数