Skip to content

Commit

Permalink
代码优化
Browse files Browse the repository at this point in the history
  • Loading branch information
kener committed Apr 1, 2014
1 parent f99b6e7 commit 22574bf
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.
Binary file modified doc/asset/img/magicType.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ <h2 class="featurette-heading">数据视图</h2>
</div>
<hr class="featurette-divider">
<div class="featurette">
<div class="span6 pull-right">
<div class="span5 pull-right">
<img src="doc/asset/img/magicType.gif" alt="Echarts 动态类型切换"/>
</div>
<h2 class="featurette-heading">动态类型切换</h2>
Expand Down
4 changes: 2 additions & 2 deletions src/chart/scatter.js
Original file line number Diff line number Diff line change
Expand Up @@ -370,14 +370,14 @@ define(function(require) {
return itemShape;
}

function _getLargeSymbol(symbolList, nColor) {
function _getLargeSymbol(pointList, nColor) {
return {
shape : 'symbol',
zlevel : _zlevelBase,
_main : true,
hoverable: false,
style : {
pointList : symbolList,
pointList : pointList,
color : nColor,
strokeColor : nColor
}
Expand Down
3 changes: 2 additions & 1 deletion src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,7 @@ define(function() {
}
},

// 主题,主题
textStyle: {
decoration: 'none',
fontFamily: 'Arial, Verdana, sans-serif',
Expand Down Expand Up @@ -934,7 +935,7 @@ define(function() {
TOOLTIP_OUT_GRID: 'tooltipOutGrid'
},
DRAG_ENABLE_TIME : 150, // 降低图表内元素拖拽敏感度,单位ms,不建议外部干预
// 默认标志图形类型列表
// 主题,默认标志图形类型列表
symbolList : [
'circle', 'rectangle', 'triangle', 'diamond',
'emptyCircle', 'emptyRectangle', 'emptyTriangle', 'emptyDiamond'
Expand Down
2 changes: 2 additions & 0 deletions src/echarts.js
Original file line number Diff line number Diff line change
Expand Up @@ -986,9 +986,11 @@ define(function(require) {
}

// 默认标志图形类型列表
/*
if (typeof magicOption.symbolList == 'undefined') {
magicOption.symbolList = _themeConfig.symbolList;
}
*/

var zrColor = require('zrender/tool/color');
// 数值系列的颜色列表,不传则采用内置颜色,可配数组,借用zrender实例注入,会有冲突风险,先这样
Expand Down

0 comments on commit 22574bf

Please sign in to comment.