文档更新

antsfee · Jun 29, 2014 · bb95f7e · bb95f7e
1 parent 6b373f9
commit bb95f7e
Show file tree

Hide file tree

Showing 18 changed files with 591 additions and 62 deletions.
diff --git a/doc/asset/img/architecture.png b/doc/asset/img/architecture.png
diff --git a/doc/asset/img/device.png b/doc/asset/img/device.png
diff --git a/doc/asset/img/echarts-logo2.png b/doc/asset/img/echarts-logo2.png
diff --git a/doc/asset/img/example/bar12.png b/doc/asset/img/example/bar12.png
diff --git a/doc/asset/img/example/mix11.png b/doc/asset/img/example/mix11.png
diff --git a/doc/asset/img/explorer.png b/doc/asset/img/explorer.png
diff --git a/doc/asset/img/feature1.png b/doc/asset/img/feature1.png
diff --git a/doc/asset/img/feature2.png b/doc/asset/img/feature2.png
diff --git a/doc/asset/img/feature3.png b/doc/asset/img/feature3.png
diff --git a/doc/asset/img/theme.png b/doc/asset/img/theme.png
diff --git a/doc/example.html b/doc/example.html
@@ -480,10 +480,6 @@ <h3>仪表盘<a name="gauge"> </a></h3>
                                <a href="example/gauge3.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/gauge.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/gauge4.html"><img src="asset/img/example/cache.png">
                               <span><strong>多仪表盘</strong><br/>个性化</span></a>
@@ -492,6 +488,10 @@ <h3>仪表盘<a name="gauge"> </a></h3>
                               <a href="example/gauge5.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/gauge.html"><img src="asset/img/example/cache.png">
+                              <span><strong>标准仪表盘</strong><br/>个性化</span></a>
+                            </li><!--/li-->
                           </ul>
                         </div>
                     </div>
@@ -562,6 +562,10 @@ <h3>混搭<a name="mix"> </a></h3>
                                   <a href="example/mix8.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/mix11.html"><img src="asset/img/example/cache.png">
+                                  <span><strong>商业BI类图表</strong><br/>仪表盘、嵌套漏斗图</span></a>
+                                </li><!--/li-->
                                 <li data-thumb="asset/img/example/cache.png">
                                   <a href="example/lasagna.html"><img src="asset/img/example/cache.png">
                                   <span><strong>千层饼</strong><br/>多层嵌套环形图</span></a>

diff --git a/doc/example/bar12.html b/doc/example/bar12.html
@@ -0,0 +1,157 @@
+<!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="[email protected]">
+    <title>ECharts · Example</title>
+
+    <link rel="shortcut icon" href="../asset/ico/favicon.png">
+
+    <link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.1.0/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="../asset/js/esl/esl.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">
+        <div class="row-fluid example">
+            <div id="sidebar-code" class="col-md-4">
+                <div class="well sidebar-nav">
+                    <div class="nav-header"><a href="#" onclick="autoResize()" class="glyphicon glyphicon-resize-full" id ="icon-resize" ></a>option</div>
+                    <textarea id="code" name="code">
+option = {
+    title : {
+        text: 'ECharts2 vs ECharts1',
+        subtext: 'Chrome下测试数据'
+    },
+    tooltip : {
+        trigger: 'axis'
+    },
+    legend: {
+        data:[
+            'ECharts1 - 2k数据','ECharts1 - 2w数据','ECharts1 - 20w数据','',
+            'ECharts2 - 2k数据','ECharts2 - 2w数据','ECharts2 - 20w数据',
+        ]
+    },
+    toolbox: {
+        show : true,
+        feature : {
+            mark : {show: true},
+            dataView : {show: true, readOnly: false},
+            magicType : {show: true, type: ['line', 'bar']},
+            restore : {show: true},
+            saveAsImage : {show: true}
+        }
+    },
+    calculable : true,
+    grid: {y: 70, y2:30, x2:20},
+    xAxis : [
+        {
+            type : 'category',
+            data : ['Line','Bar','Scatter','K','Map']
+        },
+        {
+            type : 'category',
+            axisLine: {show:false},
+            axisTick: {show:false},
+            axisLabel: {show:false},
+            splitArea: {show:false},
+            splitLine: {show:false},
+            data : ['Line','Bar','Scatter','K','Map']
+        }
+    ],
+    yAxis : [
+        {
+            type : 'value',
+            axisLabel:{formatter:'{value} ms'}
+        }
+    ],
+    series : [
+        {
+            name:'ECharts2 - 2k数据',
+            type:'bar',
+            itemStyle: {normal: {color:'rgba(193,35,43,1)', label:{show:true}}},
+            data:[40,155,95,75, 0]
+        },
+        {
+            name:'ECharts2 - 2w数据',
+            type:'bar',
+            itemStyle: {normal: {color:'rgba(181,195,52,1)', label:{show:true,textStyle:{color:'#27727B'}}}},
+            data:[100,200,105,100,156]
+        },
+        {
+            name:'ECharts2 - 20w数据',
+            type:'bar',
+            itemStyle: {normal: {color:'rgba(252,206,16,1)', label:{show:true,textStyle:{color:'#E87C25'}}}},
+            data:[906,911,908,778,0]
+        },
+        {
+            name:'ECharts1 - 2k数据',
+            type:'bar',
+            xAxisIndex:1,
+            itemStyle: {normal: {color:'rgba(193,35,43,0.5)', label:{show:true,formatter:function(a,b,c){return c>0 ? (c +'\n'):'';}}}},
+            data:[96,224,164,124,0]
+        },
+        {
+            name:'ECharts1 - 2w数据',
+            type:'bar',
+            xAxisIndex:1,
+            itemStyle: {normal: {color:'rgba(181,195,52,0.5)', label:{show:true}}},
+            data:[491,2035,389,955,347]
+        },
+        {
+            name:'ECharts1 - 20w数据',
+            type:'bar',
+            xAxisIndex:1,
+            itemStyle: {normal: {color:'rgba(252,206,16,0.5)', label:{show:true,formatter:function(a,b,c){return c>0 ? (c +'+'):'';}}}},
+            data:[3000,3000,2817,3000,0]
+        }
+    ]
+};
+                    </textarea>
+              </div><!--/.well -->
+            </div><!--/span-->
+            <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>
+
+                    <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>
diff --git a/doc/example/mix11.html b/doc/example/mix11.html
@@ -48,7 +48,7 @@
         'rgba(55, 200, 100, 0.5)'
     ],
     title : {
-        text: '漏斗图',
+        text: '商业BI类图表',
         subtext: '纯属虚构'
     },
     tooltip : {
@@ -71,7 +71,7 @@
         {
             name:'业务指标',
             type:'gauge',
-            center: ['25%','50%'],
+            center: ['25%','55%'],
             splitNumber: 10,       // 分割段数，默认为5
             axisLine: {            // 坐标轴线
                 lineStyle: {       // 属性lineStyle控制线条样式

diff --git a/doc/feature.html b/doc/feature.html
@@ -34,19 +34,19 @@
 
       <div class="row featurette">
         <h2 class="featurette-heading">Architecture</h2>
-        <div class="col-md-7 pull-right" style="padding:0;margin-top:-30px;">
+        <div class="col-md-7 pull-right" style="padding:0;margin-top:-60px;">
             <img src="./asset/img/architecture.png" alt="ECharts Architecture" style="max-width: 100%;"/>
         </div>
         <p class="lead">ECharts (Enterprise Charts 商业产品图表库)</p>
         <p>提供商业产品常用图表，底层基于<a href="http://ecomfe.github.io/zrender/" target="_blank">ZRender</a>（一个全新的轻量级canvas类库），创建了坐标系，图例，提示，工具箱等基础组件，并在此上构建出折线图、柱状图、散点图、K线图、饼图、雷达图、地图、和弦图、力导向布局图、仪表盘以及漏斗图，同时支持任意维度的堆积和多图表混合展现。</p>
         <div style="float:left;margin:20px 10px 30px 10px;"><img src="./asset/img/device.png" alt="Echarts device"/></div>
         <div>
             <img src="./asset/img/explorer.png"  alt="Echarts explorer"/>
-            <p style="float:right;text-align:right;padding-top:20px;"><strong>———— 开源来自百度商业前端数据可视化团队</strong><br/><span><a href="http://im.baidu.com/" target="_blank">Baidu Hi</a> : 1379172 | <a href="mailto:[email protected]">[email protected]</a></span></p>
             <div>
-                <small>&nbsp;&nbsp;支持IE6/7/8/9+，chrome、firefox、safari、opera <i>(IE8- power by <a href="https://code.google.com/p/explorercanvas/" target="_blank">excanvas</a> )</i></small>
+                <small>&nbsp;&nbsp;支持IE6/7/8/9+，chrome、firefox、safari、opera <i><br/>&nbsp;&nbsp;(IE8- power by <a href="https://code.google.com/p/explorercanvas/" target="_blank">excanvas</a> )</i></small>
             </div>
         </div>
+        <p style="float:right;text-align:right;"><strong>———— 开源来自百度商业前端数据可视化团队</strong><br/><span><a href="http://im.baidu.com/" target="_blank">Baidu Hi</a> : 1379172 | <a href="mailto:[email protected]">[email protected]</a></span></p>
       </div>
 
       <div class="row featurette">

diff --git a/doc/slide/js/timelineOption.js b/doc/slide/js/timelineOption.js