From 1313fcc509980347f764f7a340bfa2307317409e Mon Sep 17 00:00:00 2001 From: kener Date: Fri, 6 Jun 2014 18:23:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=8B=E5=AD=90=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/asset/js/echartsExample.js | 4 +- doc/asset/js/echartsTheme.js | 6 ++- doc/asset/js/echartsThemeDesigner.js | 6 ++- doc/slide/js/whyEcharts.js | 4 +- src/component/base.js | 1 + src/component/categoryAxis.js | 3 -- src/config.js | 72 ++++++++++++++++++++++++++++ test/allchart/all.js | 6 ++- test/performance/p.js | 6 ++- 9 files changed, 95 insertions(+), 13 deletions(-) diff --git a/doc/asset/js/echartsExample.js b/doc/asset/js/echartsExample.js index 297e12ae5..702ce9dc3 100644 --- a/doc/asset/js/echartsExample.js +++ b/doc/asset/js/echartsExample.js @@ -101,7 +101,8 @@ else { 'echarts/chart/radar': fileLocation, 'echarts/chart/map': fileLocation, 'echarts/chart/chord': fileLocation, - 'echarts/chart/force': fileLocation + 'echarts/chart/force': fileLocation, + 'echarts/chart/gauge': fileLocation } }); } @@ -118,6 +119,7 @@ require( 'echarts/chart/radar', 'echarts/chart/force', 'echarts/chart/chord', + 'echarts/chart/gauge', needMap() ? 'echarts/chart/map' : 'echarts' ], requireCallback diff --git a/doc/asset/js/echartsTheme.js b/doc/asset/js/echartsTheme.js index 1d1ccea66..a7389fa11 100644 --- a/doc/asset/js/echartsTheme.js +++ b/doc/asset/js/echartsTheme.js @@ -69,7 +69,8 @@ else { 'echarts/chart/radar': fileLocation, 'echarts/chart/map': fileLocation, 'echarts/chart/chord': fileLocation, - 'echarts/chart/force': fileLocation + 'echarts/chart/force': fileLocation, + 'echarts/chart/gauge': fileLocation, } }); } @@ -93,7 +94,8 @@ require( 'echarts/chart/radar', 'echarts/chart/force', 'echarts/chart/chord', - 'echarts/chart/map' + 'echarts/chart/map', + 'echarts/chart/gauge' ], requireCallback ); diff --git a/doc/asset/js/echartsThemeDesigner.js b/doc/asset/js/echartsThemeDesigner.js index 3493986a6..29afbac01 100644 --- a/doc/asset/js/echartsThemeDesigner.js +++ b/doc/asset/js/echartsThemeDesigner.js @@ -93,7 +93,8 @@ else { 'echarts/chart/radar': fileLocation, 'echarts/chart/map': fileLocation, 'echarts/chart/chord': fileLocation, - 'echarts/chart/force': fileLocation + 'echarts/chart/force': fileLocation, + 'echarts/chart/gauge': fileLocation } }); } @@ -110,7 +111,8 @@ require( 'echarts/chart/radar', 'echarts/chart/force', 'echarts/chart/chord', - 'echarts/chart/map' + 'echarts/chart/map', + 'echarts/chart/gauge' ], requireCallback ); diff --git a/doc/slide/js/whyEcharts.js b/doc/slide/js/whyEcharts.js index ae4cc7bed..246c6df46 100644 --- a/doc/slide/js/whyEcharts.js +++ b/doc/slide/js/whyEcharts.js @@ -36,6 +36,7 @@ else { 'echarts/chart/map': fileLocation, 'echarts/chart/chord': fileLocation, 'echarts/chart/force': fileLocation, + 'echarts/chart/gauge': fileLocation, webkitDep : '../../doc/example/webkit-dep' } }); @@ -71,7 +72,8 @@ require( 'echarts/chart/radar', 'echarts/chart/force', 'echarts/chart/chord', - 'echarts/chart/map' + 'echarts/chart/map', + 'echarts/chart/gauge' ], function (ec, wd) { echarts = ec; diff --git a/src/component/base.js b/src/component/base.js index f794a0f37..ef757bc2a 100644 --- a/src/component/base.js +++ b/src/component/base.js @@ -76,6 +76,7 @@ define(function (require) { case ecConfig.CHART_TYPE_MAP : case ecConfig.CHART_TYPE_K : case ecConfig.CHART_TYPE_CHORD: + case ecConfig.CHART_TYPE_GUAGE: return 2; case ecConfig.COMPONENT_TYPE_LEGEND : diff --git a/src/component/categoryAxis.js b/src/component/categoryAxis.js index b4e1b3527..dd07086a2 100644 --- a/src/component/categoryAxis.js +++ b/src/component/categoryAxis.js @@ -160,9 +160,6 @@ define(function (require) { * 绘制图形 */ _buildShape : function () { - this._axisLine = null; - // 标签文字格式化 - // this._labelData = this._reformLabel(); // 标签显示的挑选间隔 this._interval = this._getInterval(); diff --git a/src/config.js b/src/config.js index 321fa3280..926522fdb 100644 --- a/src/config.js +++ b/src/config.js @@ -19,6 +19,7 @@ define(function() { CHART_TYPE_ISLAND: 'island', CHART_TYPE_FORCE : 'force', CHART_TYPE_CHORD : 'chord', + CHART_TYPE_GAUGE : 'gauge', // 组件类型 COMPONENT_TYPE_TITLE: 'title', @@ -879,6 +880,77 @@ define(function() { matrix : [] }, + gauge : { + center : ['50%', '50%'], // 默认全局居中 + radius : [0, '75%'], + startAngle: 225, + endAngle : -45, + min: 0, // 最小值 + max: 100, // 最大值 + precision: 0, // 小数精度，默认为0，无小数点 + splitNumber: 10, // 分割段数，默认为5 + axisLine: { // 坐标轴线 + show: true, // 默认显示，属性show控制显示与否 + lineStyle: { // 属性lineStyle控制线条样式 + color: [[0.2, '#228b22'],[0.8, '#48b'],[1, '#ff4500']], + width: 30 + } + }, + axisTick: { // 坐标轴小标记 + show: true, // 属性show控制显示与否，默认不显示 + splitNumber: 5, // 每份split细分多少段 + length :8, // 属性length控制线长 + lineStyle: { // 属性lineStyle控制线条样式 + color: '#eee', + width: 1, + type: 'solid' + } + }, + axisLabel: { // 坐标轴文本标签，详见axis.axisLabel + show: true, + // formatter: null, + textStyle: { // 其余属性默认使用全局文本样式，详见TEXTSTYLE + color: '#333' + } + }, + splitLine: { // 分隔线 + show: true, // 默认显示，属性show控制显示与否 + length :30, // 属性length控制线长 + lineStyle: { // 属性lineStyle（详见lineStyle）控制线条样式 + color: '#eee', + width: 2, + type: 'solid' + } + }, + pointer : { + length : '80%', + width : 8, + color : 'auto' + }, + title : { + show : true, + offsetCenter: [0, '-40%'], // x, y，单位px + textStyle: { // 其余属性默认使用全局文本样式，详见TEXTSTYLE + color: '#333', + fontSize : 15 + } + }, + detail : { + show : true, + backgroundColor: 'rgba(0,0,0,0)', + borderWidth: 0, + borderColor: '#ccc', + width: 100, + height: 40, + offsetCenter: [0, '40%'], // x, y，单位px + // formatter: null, + textStyle: { // 其余属性默认使用全局文本样式，详见TEXTSTYLE + color: 'auto', + fontSize : 30 + } + } + }, + island: { r: 15, calculateStep: 0.1 // 滚轮可计算步长 0.1 = 10% diff --git a/test/allchart/all.js b/test/allchart/all.js index 6a3610863..be59c4c25 100644 --- a/test/allchart/all.js +++ b/test/allchart/all.js @@ -117,7 +117,8 @@ else { 'echarts/chart/radar': fileLocation, 'echarts/chart/map': fileLocation, 'echarts/chart/chord': fileLocation, - 'echarts/chart/force': fileLocation + 'echarts/chart/force': fileLocation, + 'echarts/chart/gauge': fileLocation } }); } @@ -134,7 +135,8 @@ require( 'echarts/chart/radar', 'echarts/chart/force', 'echarts/chart/chord', - 'echarts/chart/map' + 'echarts/chart/map', + 'echarts/chart/gauge' ], requireCallback ); diff --git a/test/performance/p.js b/test/performance/p.js index 0b7df3431..21b51babb 100644 --- a/test/performance/p.js +++ b/test/performance/p.js @@ -31,7 +31,8 @@ else { 'echarts/chart/radar': fileLocation, 'echarts/chart/map': fileLocation, 'echarts/chart/chord': fileLocation, - 'echarts/chart/force': fileLocation + 'echarts/chart/force': fileLocation, + 'echarts/chart/gauge': fileLocation } }); } @@ -48,7 +49,8 @@ require( 'echarts/chart/radar', 'echarts/chart/force', 'echarts/chart/chord', - 'echarts/chart/map' + 'echarts/chart/map', + 'echarts/chart/gauge' ], requireCallback ); -- GitLab