Merge pull request apache#1570 from loutongbing/master

tree图
simcn · May 25, 2015 · c3ee1a4 · c3ee1a4
2 parents 332f676 + d2c4c9a
commit c3ee1a4
Show file tree

Hide file tree

Showing 14 changed files with 909 additions and 57 deletions.
diff --git a/build/dist/echarts.js b/build/dist/echarts.js
diff --git a/build/source/echarts-all.js b/build/source/echarts-all.js
@@ -47827,6 +47827,8 @@ require("echarts/chart/venn");
 
 require("echarts/chart/treemap");
 
+require("echarts/chart/tree");
+
 _global['echarts'] = echarts;
 _global['zrender'] = zrender;
 

diff --git a/doc/asset/js/echartsExample.js b/doc/asset/js/echartsExample.js
@@ -212,6 +212,7 @@ function launchExample() {
             'echarts/chart/eventRiver',
             'echarts/chart/venn',
             'echarts/chart/treemap',
+            'echarts/chart/tree',
             needMap() ? 'echarts/chart/map' : 'echarts'
         ],
         requireCallback

diff --git a/doc/example/tree.html b/doc/example/tree.html
@@ -0,0 +1,199 @@
+<!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="../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">
+        <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: '手机占有率',
+        subtext: '虚构数据'
+    },
+    tooltip : {
+        trigger: 'item',
+        formatter: "{b}: {c}"
+    },
+    toolbox: {
+        show : true,
+        feature : {
+            mark : {show: true},
+            dataView : {show: true, readOnly: false},
+            restore : {show: true},
+            saveAsImage : {show: true}
+        }
+    },
+    calculable : false,
+
+    series : [
+        {
+            name:'树图',
+            type:'tree',
+            orient: 'vertical',  // vertical horizontal
+            rootLocation: {x: 'center',y: 10}, // 根节点位置  {x: 100, y: 'center'}
+            nodePadding: 1,
+            itemStyle: {
+                normal: {
+                    label: {
+                        show: false,
+                        formatter: "{b}"
+                    },
+                    lineStyle: {
+                        color: '#48b',
+                        //shadowColor: '#000',
+                        //shadowBlur: 3,
+                        //shadowOffsetX: 3,
+                        //shadowOffsetY: 5,
+                        type: 'curve' // 'curve'|'broken'|'solid'|'dotted'|'dashed'
+
+                    }
+                },
+                emphasis: {
+                    label: {
+                        show: true
+                    }
+                }
+            },
+
+            data: [
+                {
+                    name: '手机',
+                    value: 6,
+                    children: [
+                        {
+                            name: '小米',
+                            value: 4,
+                            symbolSize: 40,
+                            children: [
+                                {
+                                    name: '小米1',
+                                    value: 4
+                                },
+                                {
+                                    name: '小米2',
+                                    value: 4
+                                },
+                                {
+                                    name: '小米3',
+                                    value: 2
+                                },
+                                {
+                                    name: '小米4',
+                                    value: 2
+                                },
+                                {
+                                    name: '小米5',
+                                    value: 4
+                                },
+                                {
+                                    name: '小米6',
+                                    value: 4
+                                },
+                                {
+                                    name: '小米7',
+                                    value: 2
+                                },
+                                {
+                                    name: '小米8',
+                                    value: 2
+                                },
+                                {
+                                    name: '小米9',
+                                    value: 4
+                                },
+                                {
+                                    name: '小米10',
+                                    value: 4
+                                },
+                                {
+                                    name: '小米11',
+                                    value: 2
+                                },
+                                {
+                                    name: '小米12',
+                                    value: 2
+                                }
+                            ]
+                        },
+                        {
+                            name: '苹果',
+                            value: 4
+                        },
+                        {
+                            name: '华为',
+                            value: 2
+                        },
+                        {
+                            name: '联想',
+                            value: 2
+                        },
+                        {
+                            name: '魅族',
+                            value: 1
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+};
+                    </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>