Skip to content

Commit

Permalink
changelog & ie test~
Browse files Browse the repository at this point in the history
  • Loading branch information
@kener
kener committed Jul 3, 2013
1 parent 16169da commit afd7472
Show file tree
Hide file tree
Showing 10 changed files with 219 additions and 133 deletions.
Binary file removed doc/asset/img/magicType2.gif
View file
Binary file not shown.
42 changes: 41 additions & 1 deletion doc/asset/js/echartsConfig.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,9 @@
xAxisIndex: 0,
yAxisIndex: 0,
//symbol: null, // 图形类型，非标准参数
symbolSize: 4 // 图形大小，半宽（半径）参数，当图形为方向或菱形则总宽度为symbolSize * 2
symbolSize: 4, // 图形大小，半宽（半径）参数，当图形为方向或菱形则总宽度为symbolSize * 2
large: false, // 大规模散点图
largeThreshold: 2000 // 大规模阀值，large为true且数据量大于largeThreshold才启用大规模模式
},

// 饼图默认参数
Expand Down Expand Up @@ -388,6 +390,42 @@
}
},

force : {
// 数据map到圆的半径的最小值和最大值
minRadius : 10,
maxRadius : 20,
density : 1.0,
attractiveness : 1.0,
// 分类里如果有样式会覆盖节点默认样式
categories : [],
itemStyle: {
normal: {
// color: 各异,
label: {
show: false
// textStyle: null // 默认使用全局文本样式，详见TEXTSTYLE
},
nodeStyle : {
brushType : 'both',
color : '#f08c2e',
strokeColor : '#5182ab'
},
linkStyle : {
strokeColor : '#5182ab'
}
},
emphasis: {
// color: 各异,
label: {
show: false
// textStyle: null // 默认使用全局文本样式，详见TEXTSTYLE
},
nodeStyle : {},
linkStyle : {}
}
}
},

island: {
r: 15,
calculateStep: 0.1 // 滚轮可计算步长 0.1 = 10%
Expand Down Expand Up @@ -423,8 +461,10 @@
CHART_TYPE_PIE: 'pie',
CHART_TYPE_MAP: 'map',
CHART_TYPE_K: 'k',
CHART_TYPE_FORCE : 'force',
// CHART_TYPE_RADAR: 'radar',
// CHART_TYPE_ISLAND: 'island',

// 事件类型
EVENT: {
REFRESH: 'refresh',
Expand Down
2 changes: 1 addition & 1 deletion doc/asset/js/echartsExample.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ require.config({
var echarts;
require(
[
'echarts/echarts',
'echarts',
'echarts/chart/line',
'echarts/chart/bar',
'echarts/chart/scatter',
Expand Down
259 changes: 149 additions & 110 deletions doc/changelog.html
View file
Original file line number Diff line number Diff line change
@@ -1,110 +1,149 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>ECharts</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="ECharts">
<meta name="author" content="[email protected]">

<script src="asset/js/esl/esl.js"></script>

<!-- Le styles -->
<link href="asset/css/bootstrap.css" rel="stylesheet">
<link href="asset/css/bootstrap-responsive.css" rel="stylesheet">
<link href="asset/css/echartsHome.css" rel="stylesheet">

<!-- Fav and touch icons -->
<link rel="shortcut icon" href="asset/ico/favicon.png">
</head>

<body>

<!-- NAVBAR
================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="brand" href="../index.html">ECharts</a>
<div class="nav-collapse collapse">
<a id="forkme_banner" href="https://github.com/ecomfe/echarts">View on GitHub</a>
<ul class="nav">
<li><a href="../index.html"><i class="icon-home icon-white"></i> Home</a></li>
<li class="active"><a href="example.html" class="active">Example</a></li>
<li><a href="doc.html" >API &amp; Doc</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-download-alt icon-white"></i>Download <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="https://github.com/ecomfe/echarts/archive/1.0.0.zip">ZIP (1.0.0)</a></li>
<li><a href="https://github.com/ecomfe/echarts/archive/master.zip">ZIP (Latest)</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Link <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="https://github.com/ecomfe" target="_blank">Ecom-FE</a></li>
<li><a href="http://fe.baidu.com/doc/ecom/tech/topic/dv/index.html" target="_blank">Data Visualization</a></li>
<li class="divider"></li>
<!--li class="nav-header">Library</li-->
<li><a href="http://ecomfe.github.io/zrender/index.html" target="_blank">ZRender</a></li>
<li><a href="http://tangram.baidu.com/" target="_blank">Tangram</a></li>
</ul>
</li>
</ul>
</div><!--/.nav-collapse -->
</div><!-- /.container -->
</div><!-- /.navbar-inner -->
</div><!-- /.navbar-wrapper -->

<div class="container">
<h2>修改记录</h2>
<div class="row-fluid">
<div>
<h3>1.0.0</h3>
<ul>
<li>ddd</li>
<li>ddd</li>
<li>ddd</li>
</ul>
</div>
<div>
<h3>1.0.0</h3>
<ul>
<li>ddd</li>
<li>ddd</li>
<li>ddd</li>
</ul>
</div>
</div>
<hr>
<footer>
<p class="pull-right"><a href="#">Back to top</a></p>
<p>&copy; 2013 ECOM-FE &middot; <a href="https://github.com/ecomfe/echarts/blob/master/LICENSE.txt" target="_blank">Terms</a> &middot; <a href="doc/changelog.html" target="_blank" class="link">Changelog</a></p>
</footer>

</div> <!-- /container -->

<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="asset/js/jquery.js"></script>
<script src="asset/js/bootstrap-transition.js"></script>
<script src="asset/js/bootstrap-alert.js"></script>
<script src="asset/js/bootstrap-modal.js"></script>
<script src="asset/js/bootstrap-dropdown.js"></script>
<script src="asset/js/bootstrap-scrollspy.js"></script>
<script src="asset/js/bootstrap-tab.js"></script>
<script src="asset/js/bootstrap-tooltip.js"></script>
<script src="asset/js/bootstrap-popover.js"></script>
<script src="asset/js/bootstrap-button.js"></script>
<script src="asset/js/bootstrap-collapse.js"></script>
<script src="asset/js/bootstrap-carousel.js"></script>
<script src="asset/js/bootstrap-typeahead.js"></script>

</body>
</html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>ECharts</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="ECharts">
<meta name="author" content="[email protected]">

<script src="asset/js/esl/esl.js"></script>

<!-- Le styles -->
<link href="asset/css/bootstrap.css" rel="stylesheet">
<link href="asset/css/bootstrap-responsive.css" rel="stylesheet">
<link href="asset/css/echartsHome.css" rel="stylesheet">

<!-- Fav and touch icons -->
<link rel="shortcut icon" href="asset/ico/favicon.png">
</head>

<body>

<!-- NAVBAR
================================================== -->
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="brand" href="../index.html">ECharts</a>
<div class="nav-collapse collapse">
<a id="forkme_banner" href="https://github.com/ecomfe/echarts">View on GitHub</a>
<ul class="nav">
<li><a href="../index.html"><i class="icon-home icon-white"></i> Home</a></li>
<li class="active"><a href="example.html" class="active">Example</a></li>
<li><a href="doc.html" >API &amp; Doc</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-download-alt icon-white"></i>Download <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="https://github.com/ecomfe/echarts/archive/1.0.0.zip">ZIP (1.0.0)</a></li>
<li><a href="https://github.com/ecomfe/echarts/archive/master.zip">ZIP (Latest)</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Link <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="https://github.com/ecomfe" target="_blank">Ecom-FE</a></li>
<li><a href="http://fe.baidu.com/doc/ecom/tech/topic/dv/index.html" target="_blank">Data Visualization</a></li>
<li class="divider"></li>
<!--li class="nav-header">Library</li-->
<li><a href="http://ecomfe.github.io/zrender/index.html" target="_blank">ZRender</a></li>
<li><a href="http://tangram.baidu.com/" target="_blank">Tangram</a></li>
</ul>
</li>
</ul>
</div><!--/.nav-collapse -->
</div><!-- /.container -->
</div><!-- /.navbar-inner -->
</div><!-- /.navbar-wrapper -->

<div class="container">
<h2>修改记录</h2>
<div class="row-fluid">
<div>
<h3>1.1.0</h3>
<ul>
<li>新增图表</li>
<ul>
<li>散点图（气泡图）</li>
<li>K线图</li>
<li>地图（地图类型支持：中国）</li>
<li>力导向布局图</li>
</ul>
<li>新增组件</li>
<ul>
<li>dataRange</li>
</ul>
<li>新增特性</li>
<ul>
<li>数据区域选择（支持框选）</li>
<li>值域漫游</li>
<li>大数据模式（仅散点图支持）</li>
</ul>
<li>新增事件：RESTORE，DATA_RANGE，MAP_SELECTED</li>
<li>新增接口：</li>
<ul>
<li>resize，显示区域大小更新</li>
<li>refresh，刷新图表，图例选择、数据区域缩放，拖拽状态均保持</li>
<li>restore，还原图表，各种状态均被清除，还原为最初展现时的状态。</li>
<li>getZrender，获取当前图表所用ZRender实例，可用于添加额外图形或进行深度定制</li>
</ul>
<li>【重要】图表按需加载，需要使用方主动require</li>
<li>toolbox.feature.refresh改为restore</li>
<li>tooltip 0值bug fixed</li>
<li>饼图升级selected Mode，label支持formatter</li>
<li>图例升级为icon，折线图例有更形象的展现和更易点击</li>
<li>数值轴升级scale模式，可以脱离0值，聚焦到数值变化区间</li>
</ul>
</div>
<div>
<h3>1.0.0</h3>
<ul>
<li>提供商业产品常用图表库，支持折线图（区域图）、柱状图（条状图）、饼图（环形图）</li>
<li>特性</li>
<ul>
<li>图表混搭</li>
<li>拖拽重计算</li>
<li>数据视图</li>
<li>动态类型切换</li>
<li>图例开关</li>
<li>数据区域选择</li>
<li>标线辅助</li>
<li>多维度堆积</li>
</ul>
<li>多级控制，个性化定制</li>
<li>事件交互：REFRESH，CLICK，HOVER，DATA_CHANGED，MAGIC_TYPE_CHANGED，DATA_VIEW_CHANGED，DATA_ZOOM，LEGEND_SELECTED</li>
</ul>
</div>
</div>
<hr>
<footer>
<p class="pull-right"><a href="#">Back to top</a></p>
<p>&copy; 2013 ECOM-FE &middot; <a href="https://github.com/ecomfe/echarts/blob/master/LICENSE.txt" target="_blank">Terms</a> &middot; <a href="doc/changelog.html" target="_blank" class="link">Changelog</a></p>
</footer>

</div> <!-- /container -->

<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="asset/js/jquery.js"></script>
<script src="asset/js/bootstrap-transition.js"></script>
<script src="asset/js/bootstrap-alert.js"></script>
<script src="asset/js/bootstrap-modal.js"></script>
<script src="asset/js/bootstrap-dropdown.js"></script>
<script src="asset/js/bootstrap-scrollspy.js"></script>
<script src="asset/js/bootstrap-tab.js"></script>
<script src="asset/js/bootstrap-tooltip.js"></script>
<script src="asset/js/bootstrap-popover.js"></script>
<script src="asset/js/bootstrap-button.js"></script>
<script src="asset/js/bootstrap-collapse.js"></script>
<script src="asset/js/bootstrap-carousel.js"></script>
<script src="asset/js/bootstrap-typeahead.js"></script>

</body>
</html>
5 changes: 3 additions & 2 deletions doc/doc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1628,7 +1628,7 @@ <h4>itemStyle<a name="ItemStyle"> </a></h4>
<tr>
<td> {Object} label </td>
<td> {show: true, position:'outer'} </td>
<td> 饼图 ，地图</td>
<td> 饼图 ，地图，力导向</td>
<td> 标签，饼图默认显示在外部，离饼图距离由labelLine.length决定，地图标签不可指定位置 </td>
</tr>
<tr>
Expand Down Expand Up @@ -1920,7 +1920,8 @@ <h3>附录：一个直观的事例<a name="附录一个直观的事例"> </a></h
<p>查看更多实例 <a href="example.html" target="_blank">example</a></p>
<div class="code">
<pre>// 图表实例化------------------
var echarts = require('echarts/echarts');
var echarts = require('echarts');
require('echarts/chart/line'); // 图表按需加载，需要主动require
var myChart = echarts.init(document.getElementById('main'));

// ajax getting data...............
Expand Down
2 changes: 1 addition & 1 deletion doc/example.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ <h1>地图</h1>
</div>
</div>
<hr>
<h1>力导布局图</h1>
<h1>力导向布局图</h1>
<div class="row-fluid">
<div class="span12">
<div class="span4">
Expand Down
6 changes: 3 additions & 3 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ <h2 class="featurette-heading">Architecture</h2>
<img src="doc/asset/img/architecture.png" />
</div>
<p class="lead">ECharts (Enterprise Charts 商业产品图表库)</p>
<p>提供商业产品常用图表库，底层基于<a href="http://ecomfe.github.io/zrender/" target="_blank">ZRender</a>，创建了坐标系，图例，提示，工具箱等基础组件，并在此上构建出折线图（区域图）、柱状图（条状图）、散点图（气泡图）、K线图、饼图（环形图）、地图、力导布局图，同时支持任意维度的堆积和多图表混合展现。</p>
<p>提供商业产品常用图表库，底层基于<a href="http://ecomfe.github.io/zrender/" target="_blank">ZRender</a>，创建了坐标系，图例，提示，工具箱等基础组件，并在此上构建出折线图（区域图）、柱状图（条状图）、散点图（气泡图）、K线图、饼图（环形图）、地图、力导向布局图，同时支持任意维度的堆积和多图表混合展现。</p>
<div style="float:left;margin:10px 10px 30px 10px;"><img src="doc/asset/img/device.png" /></div>
<div>
<img src="doc/asset/img/explorer.png" />
Expand All @@ -128,7 +128,7 @@ <h2 class="featurette-heading">混搭</h2>
<img src="doc/asset/img/draggable.gif" />
</div>
<h2 class="featurette-heading">拖拽重计算</h2>
<p>拖拽重计算特性（已申请专利）带来了数据统计图表从未有过的用户体验，允许用户对统计数据进行有效的提取、整合，甚至在多个图表间交换数据，赋予了用户对数据进行挖掘、整合的能力。</p>
<p>拖拽重计算特性（专利）带来了数据统计图表从未有过的用户体验，允许用户对统计数据进行有效的提取、整合，甚至在多个图表间交换数据，赋予了用户对数据进行挖掘、整合的能力。</p>
</div>
<hr class="featurette-divider">
<div class="featurette">
Expand Down Expand Up @@ -182,7 +182,7 @@ <h2 class="featurette-heading">值域漫游</h2>
</div>
<h2 class="featurette-heading">大规模散点图</h2>
<p>如何展现成千上百万的离散数据从而找出他们的分布和聚类？貌似除了用专业的统计工具（如MATLAB）外别无选择？</p>
<p>不，ECharts发明了基于像素的大规模散点图，一个900 x 400的散点区域就能够毫不重复的呈现35万组数据，这对于常规的应用，用现代浏览器就足以轻松展现百万级的散点数据！</p>
<p>不，ECharts发明了基于像素的大规模散点图（专利），一个900 x 400的散点区域就能够毫不重复的呈现35万组数据，这对于常规的应用，用现代浏览器就足以轻松展现百万级的散点数据！</p>
</div>
<hr class="featurette-divider">
<div class="featurette">
Expand Down
2 changes: 1 addition & 1 deletion src/component/legend.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ define(function (require) {
height : height,
color : color,
strokeColor : color,
lineWidth : 2
lineWidth : 3
},
clickable : true
};
Expand Down
Loading

0 comments on commit afd7472

Please sign in to comment.