Skip to content

I
incubator-echarts

x649585723 / incubator-echarts
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
I
incubator-echarts

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 9a1ac374 编写于 作者: P pah100
浏览文件
操作

Merge branch 'master' of https://github.com/ecomfe/echarts

上级 bee99de4 5006658b
隐藏空白更改
内联 并排
Showing with 291 addition and 123 deletion
build/echarts-optimize-conf.js
浏览文件 @ 9a1ac374
......@@ -58,7 +58,9 @@ exports.modules = {
},
{name: 'echarts/chart/gauge', weight: 30},
{name: 'echarts/chart/funnel', weight: 30},
{name: 'echarts/chart/eventRiver', weight: 10}
{name: 'echarts/chart/eventRiver', weight: 10},
{name: 'echarts/chart/venn', weight: 10},
{name: 'echarts/chart/treemap', weight: 10}
]
};
......
doc/asset/css/echartsHome.css
浏览文件 @ 9a1ac374
......@@ -436,4 +436,10 @@ table.full {width:100%;}
}
.ec-icon-eventRiver {
background-position: 0 -401px;
}
.ec-icon-venn {
background-position: 0 -426px;
}
.ec-icon-treemap {
background-position: 0 -451px;
}
\ No newline at end of file
doc/asset/img/example/treemap.png
查看替换文件 @ bee99de4 浏览文件 @ 9a1ac374
doc/asset/img/example/treemap.png

13.8 KB | W: | H:

doc/asset/img/example/treemap.png

18.3 KB | W: | H:

doc/asset/img/example/treemap.png
doc/asset/img/example/treemap.png
doc/asset/img/example/treemap.png
doc/asset/img/example/treemap.png
  • 2-up
  • Swipe
  • Onion skin
doc/asset/img/example/venn.png
查看替换文件 @ bee99de4 浏览文件 @ 9a1ac374
doc/asset/img/example/venn.png

19.8 KB | W: | H:

doc/asset/img/example/venn.png

24.5 KB | W: | H:

doc/asset/img/example/venn.png
doc/asset/img/example/venn.png
doc/asset/img/example/venn.png
doc/asset/img/example/venn.png
  • 2-up
  • Swipe
  • Onion skin
doc/asset/img/icon-bar.png
查看替换文件 @ bee99de4 浏览文件 @ 9a1ac374
doc/asset/img/icon-bar.png

8.0 KB | W: | H:

doc/asset/img/icon-bar.png

13.6 KB | W: | H:

doc/asset/img/icon-bar.png
doc/asset/img/icon-bar.png
doc/asset/img/icon-bar.png
doc/asset/img/icon-bar.png
  • 2-up
  • Swipe
  • Onion skin
doc/asset/js/echartsHome.js
浏览文件 @ 9a1ac374
......@@ -169,8 +169,10 @@ $('#footer')[0].innerHTML =
if (document.location.href.indexOf('local') == -1) {
var _bdhmProtocol = (("https:" == document.location.protocol) ? " https://" : " http://");
document.write(unescape("%3Cscript src='" + _bdhmProtocol + "hm.baidu.com/h.js%3Fb78830c9a5dad062d08b90b2bc0cf5da' type='text/javascript'%3E%3C/script%3E"));
var hm = document.createElement("script");
hm.src = "//hm.baidu.com/hm.js?4bad1df23f079e0d12bdbef5e65b072f";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
}
function fixFork () {
......
doc/changelog-en.html
浏览文件 @ 9a1ac374
......@@ -47,6 +47,19 @@
<h2>ChangeLog</h2>
<span>[+]Added [-]Deleted [^]Upgraded [#]Fixed 【】Important</span>
<div class="row-fluid">
<div>
<h3>2.2.2<small> (2015-04-30) </small></h3>
<ul>
<li>【+】 Add Venn chart. See example <a href="./example/venn.html">Venn</a></li>
<li>【+】 Add Treemap，See example <a href="./example/treemap.html">Treemap</a></li>
<li>【+】 Add logarithmic axis，See example <a href="./example/line9.html">line9</a></li>
<li>【+】 Release <a href="http://ecomfe.github.io/echarts-builder-web/">ECharts online builder</a></li>
<li>[^] Add data filter for line chart with large data. <a href="https://github.com/ecomfe/echarts/issues/1370">#1370 »</a></li>
<li>[^] symbolSize can configure width and height with an array</li>
<li>[^] Fix <a href="https://github.com/ecomfe/echarts/issues/1308">#1308 »</a></li>
<li>[^] Add configuration of z and zlevel</li>
</ul>
</div>
<div>
<h3>2.2.1<small> (2015-03-11) </small></h3>
<ul>
......
doc/changelog.html
浏览文件 @ 9a1ac374
......@@ -47,6 +47,19 @@
<h2>修改记录</h2>
<span>[+]新增 [-]删除 [^]升级 [#]修复 【】重要</span>
<div class="row-fluid">
<div>
<h3>2.2.2<small> (2015-04-30) </small></h3>
<ul>
<li>【+】 新增韦恩图(venn)，示例查看 <a href="./example/venn.html">韦恩图</a></li>
<li>【+】 新增 Treemap，示例查看 <a href="./example/treemap.html">手机占有率</a></li>
<li>【+】 新增对数轴，示例查看 <a href="./example/line9.html">对数轴示例</a></li>
<li>【+】 发布 <a href="http://ecomfe.github.io/echarts-builder-web/">ECharts 在线构建工具</a></li>
<li>[^] 大规模折线图添加数据抽希策略配置。详见 <a href="https://github.com/ecomfe/echarts/issues/1370">#1370 »</a></li>
<li>[^] symbolSize 支持通过数组分别设置宽高</li>
<li>[^] 修复 <a href="https://github.com/ecomfe/echarts/issues/1308">#1308 »</a></li>
<li>[^] 支持 z, zlevel 的配置</li>
</ul>
</div>
<div>
<h3>2.2.1<small> (2015-03-11) </small></h3>
<ul>
......
doc/doc-en.html
浏览文件 @ 9a1ac374
......@@ -311,6 +311,14 @@
<td> evnetRiver </td>
<td> EventRiver is commonly used to display multiple events with time attribute, the evolution of events can be shown by time sequence.</td>
</tr>
<tr>
<td> treemap </td>
<td> Treemap is commonly used to display a tree structure. And treemaps are very effective when size is the most important feature to be displayed..</td>
</tr>
<tr>
<td> venn </td>
<td> Venn shows all possible logical relations between a finite collection of different sets.</td>
</tr>
</table>
<h3>Chart Types<a name="Chart-Types"> </a></h3>
<P> The charting library includes basic single chart type and combination chart type. </P>
......@@ -2891,10 +2899,10 @@ indicator : [
</td>
</tr>
<tr>
<td> <b>{number | Function} </b>symbolSize </td>
<td> <b>{number | Array | Function} </b>symbolSize </td>
<td> 2 | 4</td>
<td> line (2), scatter(4) </td>
<td> size of the symbol. When "calculable" is enabled, it's recommended to increase symbolSize for better interactive experience. When implementing a bubble chart, symbolSize should be a Function, and the bubble size depends on the return value of the method, the parameter passed in is the current data item (value array). </td>
<td> size of the symbol. It is usually a number. But if you use an image as symbol. To prevent stretching of image caused by same width and height, you can use an array as symbolSize which first element is width and the second is height. When "calculable" is enabled, it's recommended to increase symbolSize for better interactive experience. When implementing a bubble chart, symbolSize should be a Function, and the bubble size depends on the return value of the method, the parameter passed in is the current data item (value array). </td>
</tr>
<tr>
<td> <b>{number}</b> symbolRotate </td>
......@@ -3015,7 +3023,7 @@ indicator : [
<td> same as <a href="#SeriesCartesian" title="">series (Cartesian). </a></td>
</tr>
<tr>
<td> <b>{number | Function} </b>symbolSize </td>
<td> <b>{number | Array | Function} </b>symbolSize </td>
<td> 2 </td>
<td> same as <a href="#SeriesCartesian" title="">series (Cartesian). </a></td>
</tr>
......@@ -3204,7 +3212,7 @@ indicator : [
<td> as <a href="#SeriesCartesian" title="">series (Cartesian)</a></td>
</tr>
<tr>
<td> <b>{number}</b> symbolSize </td>
<td> <b>{number | Array}</b> symbolSize </td>
<td></td>
<td> size of the node. </td>
</tr>
......@@ -3879,7 +3887,7 @@ indicator : [
<td> the symbol of markPoint, same as series' <a href="#Series">symbol</a>. </td>
</tr>
<tr>
<td> <b>{number | Function} </b> symbolSize </td>
<td> <b>{number | Array | Function} </b> symbolSize </td>
<td> 10 </td>
<td> the size of markPoint symbol, same as series' <a href="#Series">symbolSize</a>. </td>
</tr>
......@@ -4743,7 +4751,7 @@ geoCoord : {
<td> See <a href="#SeriesCartesian" title="">series (Cartesian)</a></td>
</tr>
<tr>
<td> {number} symbolSize </td>
<td> {number | Array} symbolSize </td>
<td></td>
<td> Size of symbol </td>
</tr>
......@@ -4787,7 +4795,7 @@ geoCoord : {
<td> See <a href="#SeriesCartesian" title="">series (Cartesian)</a></td>
</tr>
<tr>
<td> {number} symbolSize </td>
<td> {number | Array} symbolSize </td>
<td></td>
<td> Size of symbol </td>
</tr>
......
doc/doc.html
浏览文件 @ 9a1ac374
......@@ -311,6 +311,25 @@
<td> evnetRiver </td>
<td> 事件河流图。常用于展示具有时间属性的多个事件，以及事件随时间的演化。</td>
</tr>
<tr>
<td> funnel </td>
<td> 漏斗图。用于展现数据经过筛选、过滤等流程处理后发生的数据变化，常见于BI类系统。</td>
</tr>
<tr>
<td> evnetRiver </td>
<td> 事件河流图。常用于展示具有时间属性的多个事件，以及事件随时间的演化。</td>
</tr>
<tr>
<td> treemap </td>
<td>
矩形式树状结构图，简称：矩形树图。用于展示树形数据结构，优势是能最大限度展示节点的尺寸特征。</td>
</tr>
<tr>
<td> venn </td>
<td>
韦恩图。用于展示集合以及它们的交集。</td>
</tr>
</table>
<h3>图表类型<a name="图表类型"> </a></h3>
<P> 图表库标准包含单图表类型的标准图表以及多图表类型混合的混搭图表：</P>
......@@ -2911,10 +2930,10 @@ indicator : [
</td>
</tr>
<tr>
<td> <b>{number | Function} </b>symbolSize </td>
<td> <b>{number | Function | Array} </b>symbolSize </td>
<td> 2 | 4</td>
<td> 折线图 (2)，散点图(4) </td>
<td> 标志图形大小，可计算特性启用情况建议增大以提高交互体验。实现气泡图时symbolSize需为Function，气泡大小取决于该方法返回值，传入参数为当前数据项（value数组）</td>
<td> 标志图形大小，可计算特性启用情况建议增大以提高交互体验。可以是单个值，如果在 symbol 为图片的时候想要分别设置宽高防止图片被拉伸，可以使用数组，其中数组第一个值是高，第二个值是宽。 实现气泡图时symbolSize需为Function，气泡大小取决于该方法返回值，传入参数为当前数据项（value数组）。</td>
</tr>
<tr>
<td> <b>{number}</b> symbolRotate </td>
......@@ -3035,7 +3054,7 @@ indicator : [
<td> 同<a href="#SeriesCartesian" title="">series（直角系）</a></td>
</tr>
<tr>
<td> <b>{number | Function} </b>symbolSize </td>
<td> <b>{number | Function | Array} </b>symbolSize </td>
<td> 2 </td>
<td> 同<a href="#SeriesCartesian" title="">series（直角系）</a></td>
</tr>
......@@ -3224,7 +3243,7 @@ indicator : [
<td> 同<a href="#SeriesCartesian" title="">series（直角系）</a></td>
</tr>
<tr>
<td> <b>{number}</b> symbolSize </td>
<td> <b>{number|Array}</b> symbolSize </td>
<td></td>
<td> 节点的大小 </td>
</tr>
......@@ -3899,7 +3918,7 @@ indicator : [
<td> 标注类型，同series中的<a href="#Series">symbol</a> </td>
</tr>
<tr>
<td> <b>{number | Function} </b> symbolSize </td>
<td> <b>{number | Array | Function} </b> symbolSize </td>
<td> 10 </td>
<td> 标注大小，同series中的<a href="#Series">symbolSize</a> </td>
</tr>
......@@ -4761,7 +4780,7 @@ geoCoord : {
<td> 同<a href="#SeriesCartesian" title="">series（直角系）</a></td>
</tr>
<tr>
<td> {number} symbolSize </td>
<td> {number|Array} symbolSize </td>
<td></td>
<td> 所有该类目的节点的大小 </td>
</tr>
......@@ -4805,7 +4824,7 @@ geoCoord : {
<td> 同<a href="#SeriesCartesian" title="">series（直角系）</a></td>
</tr>
<tr>
<td> {number} symbolSize </td>
<td> {number|Array} symbolSize </td>
<td></td>
<td> 强制指定节点的大小 </td>
</tr>
......
doc/example-en.html
浏览文件 @ 9a1ac374
......@@ -102,6 +102,8 @@
<li><i class="ec-icon ec-icon-gauge"></i> <a href="#gauge">Gauges</a></li>
<li><i class="ec-icon ec-icon-funnel"></i> <a href="#funnel">Funnels</a></li>
<li><i class="ec-icon ec-icon-eventRiver"></i> <a href="#eventRiver">EventRiver</a></li>
<li><i class="ec-icon ec-icon-venn"></i> <a href="#venn">Venn</a></li>
<li><i class="ec-icon ec-icon-treemap"></i> <a href="#treemap">Treemap</a></li>
<li><i class="ec-icon ec-icon-mix"></i> <a href="#mix">Combinations</a></li>
<li><i class="ec-icon ec-icon-component"></i> <a href="#component">Components</a></li>
<li><i class="ec-icon ec-icon-other"></i> <a href="#other">Others</a></li>
......@@ -156,6 +158,10 @@
<a href="example/line.html"><img src="asset/img/example/cache.png">
<span><strong>Line</strong><br/>multilevel control, customizable</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/line9.html"><img src="asset/img/example/cache.png">
<span><strong>Logarithmic Axis</strong></a>
</li><!--/li-->
</ul>
</div>
</div>
......@@ -611,6 +617,40 @@
</div>
</div>
</div>
<div>
<h3>Venn<a name="venn"> </a></h3>
<div class="section">
<div class="thumb4">
<ul class="slides">
<li data-thumb="asset/img/example/cache.png">
<a href="example/venn.html"><img src="asset/img/example/cache.png">
<span><strong>Venn</strong><br/>customizable</span></a>
</li><!--/li-->
</ul>
</div>
</div>
</div>
<div>
<h3>Treemap<a name="treemap"> </a></h3>
<div class="section">
<div class="thumb4">
<ul class="slides">
<li data-thumb="asset/img/example/cache.png">
<a href="example/treemap.html"><img src="asset/img/example/cache.png">
<span><strong>Treemap</strong><br/>Basic example</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/treemap1.html"><img src="asset/img/example/cache.png">
<span><strong>Treemap</strong><br/>Drill down</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/treemap2.html"><img src="asset/img/example/cache.png">
<span><strong>Treemap</strong><br/>customizable</span></a>
</li><!--/li-->
</ul>
</div>
</div>
</div>
<div>
<h3>Combinations<a name="mix"> </a></h3>
<div class="section">
......
doc/example.html
浏览文件 @ 9a1ac374
......@@ -102,6 +102,8 @@
<li><i class="ec-icon ec-icon-gauge"></i> <a href="#gauge">仪表盘</a></li>
<li><i class="ec-icon ec-icon-funnel"></i> <a href="#funnel">漏斗图</a></li>
<li><i class="ec-icon ec-icon-eventRiver"></i> <a href="#eventRiver">事件河流图</a></li>
<li><i class="ec-icon ec-icon-venn"></i> <a href="#venn">韦恩图</a></li>
<li><i class="ec-icon ec-icon-treemap"></i> <a href="#treemap">矩形树图</a></li>
<li><i class="ec-icon ec-icon-mix"></i> <a href="#mix">混搭</a></li>
<li><i class="ec-icon ec-icon-component"></i> <a href="#component">组件</a></li>
<li><i class="ec-icon ec-icon-other"></i> <a href="#other">其他</a></li>
......@@ -611,8 +613,8 @@
<div class="section">
<div class="thumb4">
<ul class="slides">
<li data-thumb="asset/img/example/eventRiver1.png">
<a href="example/eventRiver1.html"><img src="asset/img/example/eventRiver1.png">
<li data-thumb="asset/img/example/cache.png">
<a href="example/eventRiver1.html"><img src="asset/img/example/cache.png">
<span><strong>事件河流图</strong><br/>个性化</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
......@@ -623,6 +625,40 @@
</div>
</div>
</div>
<div>
<h3>韦恩图<a name="venn"> </a></h3>
<div class="section">
<div class="thumb4">
<ul class="slides">
<li data-thumb="asset/img/example/cache.png">
<a href="example/venn.html"><img src="asset/img/example/cache.png">
<span><strong>韦恩图</strong><br/>个性化</span></a>
</li><!--/li-->
</ul>
</div>
</div>
</div>
<div>
<h3>矩形树图<a name="treemap"> </a></h3>
<div class="section">
<div class="thumb4">
<ul class="slides">
<li data-thumb="asset/img/example/cache.png">
<a href="example/treemap.html"><img src="asset/img/example/cache.png">
<span><strong>矩形树图</strong><br/>最简配置</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/treemap1.html"><img src="asset/img/example/cache.png">
<span><strong>矩形树图</strong><br/>数据下钻</span></a>
</li><!--/li-->
<li data-thumb="asset/img/example/cache.png">
<a href="example/treemap2.html"><img src="asset/img/example/cache.png">
<span><strong>矩形树图</strong><br/>个性化</span></a>
</li><!--/li-->
</ul>
</div>
</div>
</div>
<div>
<h3>混搭<a name="mix"> </a></h3>
<div class="section">
......
doc/example/bar.html
浏览文件 @ 9a1ac374
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="ECharts">
<meta name="author" content="kener.linfeng@gmail.com">
<title>ECharts · Example</title>
<link rel="shortcut icon" href="../asset/ico/favicon.png">
<link href="../asset/css/font-awesome.min.css" rel="stylesheet">
<link href="../asset/css/bootstrap.css" rel="stylesheet">
<link href="../asset/css/carousel.css" rel="stylesheet">
<link href="../asset/css/echartsHome.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<script src="./www/js/echarts.js"></script>
<script src="../asset/js/codemirror.js"></script>
<script src="../asset/js/javascript.js"></script>
<link href="../asset/css/codemirror.css" rel="stylesheet">
<link href="../asset/css/monokai.css" rel="stylesheet">
</head>
<body>
<!-- Fixed navbar -->
<div class="navbar navbar-default navbar-fixed-top" role="navigation" id="head"></div>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="ECharts">
<meta name="author" content="kener.linfeng@gmail.com">
<title>ECharts · Example</title>
<link rel="shortcut icon" href="../asset/ico/favicon.png">
<link href="../asset/css/font-awesome.min.css" rel="stylesheet">
<link href="../asset/css/bootstrap.css" rel="stylesheet">
<link href="../asset/css/carousel.css" rel="stylesheet">
<link href="../asset/css/echartsHome.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<script src="./www/js/echarts.js"></script>
<script src="../asset/js/codemirror.js"></script>
<script src="../asset/js/javascript.js"></script>
<link href="../asset/css/codemirror.css" rel="stylesheet">
<link href="../asset/css/monokai.css" rel="stylesheet">
</head>
<body>
<!-- Fixed navbar -->
<div class="navbar navbar-default navbar-fixed-top" role="navigation" id="head"></div>
<div class="container-fluid">
......@@ -75,7 +75,7 @@ option = {
type:'bar',
itemStyle: { // 系列级个性化样式，纵向渐变填充
normal: {
barBorderColor:'red',
barBorderColor:'red',
barBorderWidth: 5,
color : (function (){
var zrColor = require('zrender/tool/color');
......@@ -193,24 +193,24 @@ option = {
<div id="graphic" class="col-md-8">
<div id="main" class="main"></div>
<div>
<button type="button" class="btn btn-sm btn-success" onclick="refresh(true)">刷 新</button>
<span class="text-primary">切换主题</span>
<select id="theme-select"></select>
<button type="button" class="btn btn-sm btn-success" onclick="refresh(true)">刷 新</button>
<span class="text-primary">切换主题</span>
<select id="theme-select"></select>
<span id='wrong-message' style="color:red"></span>
</div>
</div><!--/span-->
</div><!--/row-->
</div><!--/.fluid-container-->
<footer id="footer"></footer>
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../asset/js/jquery.min.js"></script>
<script type="text/javascript" src="../asset/js/echartsHome.js"></script>
<script src="../asset/js/bootstrap.min.js"></script>
<script src="../asset/js/echartsExample.js"></script>
</body>
</html>
</div><!--/.fluid-container-->
<footer id="footer"></footer>
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../asset/js/jquery.min.js"></script>
<script type="text/javascript" src="../asset/js/echartsHome.js"></script>
<script src="../asset/js/bootstrap.min.js"></script>
<script src="../asset/js/echartsExample.js"></script>
</body>
</html>
doc/example/treemap.html
浏览文件 @ 9a1ac374
......@@ -41,7 +41,7 @@
option = {
title : {
text: '手机占有率',
subtext: '最少配置例子'
subtext: '虚构数据'
},
tooltip : {
trigger: 'item',
......@@ -77,21 +77,17 @@ option = {
},
data:[
{
name: '魅族',
name: '三星',
value: 6
},
{
name: '小米',
value: 6
value: 4
},
{
name: '苹果',
value: 4
},
{
name: '三星',
value: 3
},
{
name: '华为',
value: 2
......@@ -100,6 +96,10 @@ option = {
name: '联想',
value: 2
},
{
name: '魅族',
value: 1
},
{
name: '中兴',
value: 1
......
doc/example/treemap1.html
浏览文件 @ 9a1ac374
......@@ -41,7 +41,7 @@
option = {
title : {
text: '手机占有率',
subtext: '数据下钻例子'
subtext: '数据下钻例子，虚构数据'
},
tooltip : {
trigger: 'item',
......@@ -81,49 +81,29 @@ option = {
},
data:[
{
name: '魅族',
name: '三星',
itemStyle: {
normal: {
color: '#ccff99',
color: '#99cccc',
}
},
value: 6,
children: [
{
name: 'MX4',
itemStyle: {
normal: {
color: '#ccccff',
}
},
value: 6
name: 'Galaxy S4',
value: 2
},
{
name: 'MX3',
itemStyle: {
normal: {
color: '#99ccff',
}
},
value: 6
name: 'Galaxy S5',
value: 3
},
{
name: '魅蓝note',
itemStyle: {
normal: {
color: '#9999cc',
}
},
value: 4
name: 'Galaxy S6',
value: 3
},
{
name: 'MX4 pro',
itemStyle: {
normal: {
color: '#99cccc',
}
},
value: 3
name: 'Galaxy Tab',
value: 1
}
]
},
......@@ -134,21 +114,18 @@ option = {
color: '#99ccff',
}
},
value: 6,
value: 4,
children: [
{
name: '小米3',
color: '#ccccff',
value: 6
},
{
name: '小米4',
color: '#99ccff',
value: 6
},
{
name: '红米',
color: '#9999cc',
value: 4
}
]
......@@ -160,16 +137,68 @@ option = {
color: '#9999cc',
}
},
value: 4
value: 4,
children: [
{
name: 'iPhone 5s',
value: 6
},
{
name: 'iPhone 6',
value: 3
},
{
name: 'iPhone 6+',
value: 3
}
]
},
{
name: '三星',
name: '魅族',
itemStyle: {
normal: {
color: '#99cccc',
color: '#ccff99',
}
},
value: 3
value: 1,
children: [
{
name: 'MX4',
itemStyle: {
normal: {
color: '#ccccff',
}
},
value: 6
},
{
name: 'MX3',
itemStyle: {
normal: {
color: '#99ccff',
}
},
value: 6
},
{
name: '魅蓝note',
itemStyle: {
normal: {
color: '#9999cc',
}
},
value: 4
},
{
name: 'MX4 pro',
itemStyle: {
normal: {
color: '#99cccc',
}
},
value: 3
}
]
},
{
name: '华为',
......
doc/example/treemap2.html
浏览文件 @ 9a1ac374
......@@ -41,7 +41,7 @@
option = {
title : {
text: '手机占有率',
subtext: '复杂配置例子'
subtext: '虚构数据'
},
tooltip : {
trigger: 'item',
......@@ -80,13 +80,13 @@ option = {
},
data:[
{
name: '魅族',
name: '三星',
value: 6,
itemStyle: {
normal: {
label: {
show: true,
formatter : "{b}最多，值为{c}",
formatter : "{b}最多",
textStyle: {
color: '#ccc',
fontSize: 16
......@@ -112,7 +112,7 @@ option = {
},
{
name: '小米',
value: 6,
value: 4,
itemStyle: {
normal: {
color: '#99ccff',
......@@ -129,8 +129,8 @@ option = {
}
},
{
name: '三星',
value: 3,
name: '魅族',
value: 1,
itemStyle: {
normal: {
color: '#99cccc',
......
package.json
浏览文件 @ 9a1ac374
{
"name": "echarts",
"description": "Enterprise Charts，基于Canvas，纯Javascript图表库，提供直观，生动，可交互，可个性化定制的数据可视化表。",
"version": "2.2.1",
"version": "2.2.2",
"maintainers": [
{ "name": "Kener", "email": "kener.linfeng@gmail.com" },
{ "name": "Pissang", "email": "shenyi.914@gmail.com" },
......
src/chart/treemap.js
浏览文件 @ 9a1ac374
......@@ -250,12 +250,12 @@ define(function (require) {
textShape.style.textPosition = 'specific';
textShape.style.textX = rectangleX + marginX;
textShape.style.textY = rectangleY + marginY;
textShape.style.textColor = textShape.style.textColor || '#777';
textShape.style.textColor = textShape.style.textColor || '#000';
textShape.highlightStyle.textPosition = 'specific';
textShape.highlightStyle.textX = rectangleX + marginX;
textShape.highlightStyle.textY = rectangleY + marginY;
textShape.highlightStyle.textColor = textShape.highlightStyle.textColor || '#777';
textShape.highlightStyle.textColor = textShape.highlightStyle.textColor || '#000';
return textShape;
},
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或