component style can be configured

piaolinzhi · Jan 4, 2015 · 3733d09 · 3733d09
1 parent b7654f1
commit 3733d09
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/src/component/dataRange.js b/src/component/dataRange.js
@@ -233,6 +233,7 @@ define(function (require) {
             var itemWidth = this.dataRangeOption.itemWidth;
             var itemHeight = this.dataRangeOption.itemHeight;
             var textHeight = zrArea.getTextHeight('国', font);
+            var mSize = 10;
 
 
             var needValueText = true;
@@ -272,16 +273,16 @@ define(function (require) {
                     style : {
                         x : lastX,
                         y : lastY,
-                        width : itemWidth * 10,
+                        width : itemWidth * mSize,
                         height : itemHeight,
                         color : zrColor.getLinearGradient(
-                            lastX, lastY, lastX + itemWidth * 10, lastY,
+                            lastX, lastY, lastX + itemWidth * mSize, lastY,
                             colorList
                         )
                     },
                     hoverable : false
                 };
-                lastX += itemWidth * 10 + this._textGap;
+                lastX += itemWidth * mSize + this._textGap;
             }
             else {
                 itemShape = {
@@ -291,15 +292,15 @@ define(function (require) {
                         x : lastX,
                         y : lastY,
                         width : itemWidth,
-                        height : itemHeight * 10,
+                        height : itemHeight * mSize,
                         color : zrColor.getLinearGradient(
-                            lastX, lastY, lastX, lastY + itemHeight * 10,
+                            lastX, lastY, lastX, lastY + itemHeight * mSize,
                             colorList
                         )
                     },
                     hoverable : false
                 };
-                lastY += itemHeight * 10 + this._textGap;
+                lastY += itemHeight * mSize + this._textGap;
             }
             this.shapeList.push(new RectangleShape(itemShape));
             // 可计算元素的位置缓存
@@ -600,6 +601,7 @@ define(function (require) {
                     text : this._textFormat(this.dataRangeOption.max),
                     textX : textXStart,
                     textY : textYStart,
+                    textFont: font,
                     color : this.getColor(this.dataRangeOption.max),
                     rect : coverRectStart,
                     x : pointListStart[0][0],
@@ -619,6 +621,7 @@ define(function (require) {
                     text : this._textFormat(this.dataRangeOption.min),
                     textX : textXEnd,
                     textY : textYEnd,
+                    textFont: font,
                     color : this.getColor(this.dataRangeOption.min),
                     rect : coverRectEnd,
                     x : pointListEnd[0][0],
@@ -730,6 +733,7 @@ define(function (require) {
             var totalHeight = 0;
             var font = this.getFont(this.dataRangeOption.textStyle);
             var textHeight = zrArea.getTextHeight('国', font);
+            var mSize = 10;
 
             if (this.dataRangeOption.orient == 'horizontal') {
                 // 水平布局，计算总宽度
@@ -741,7 +745,7 @@ define(function (require) {
                     totalWidth = 
                         ((this.dataRangeOption.splitNumber <= 0
                           || this.dataRangeOption.calculable)
-                          ? (itemWidth * 10 + itemGap)
+                          ? (itemWidth * mSize + itemGap)
                           : dataLength * (itemWidth + itemGap))
                         + (this.dataRangeOption.text 
                            && typeof this.dataRangeOption.text[0] != 'undefined'
@@ -784,7 +788,7 @@ define(function (require) {
                     totalHeight =
                         ((this.dataRangeOption.splitNumber <= 0
                           || this.dataRangeOption.calculable)
-                          ? (itemHeight * 10 + itemGap)
+                          ? (itemHeight * mSize + itemGap)
                           : dataLength * (itemHeight + itemGap))
                         + (this.dataRangeOption.text
                            && typeof this.dataRangeOption.text[0] != 'undefined'

diff --git a/src/component/dataZoom.js b/src/component/dataZoom.js
@@ -36,7 +36,6 @@ define(function (require) {
         };
 
         this._fillerSize = 28;       // 控件大小，水平布局为高，纵向布局为宽
-        this._handleSize = 8;        // 手柄大小
         // this._fillerShae;            // 填充
         // this._startShape;            // 起始手柄
         // this._endShape;              // 结束手柄
@@ -49,6 +48,7 @@ define(function (require) {
 
         this.option.dataZoom = this.reformOption(this.option.dataZoom);
         this.zoomOption = this.option.dataZoom;
+        this._handleSize = this.zoomOption.handleSize;
         if (!this.myChart.canvasSupported) {
             // 不支持Canvas的强制关闭实时动画
             this.zoomOption.realtime = false;

diff --git a/src/component/timeline.js b/src/component/timeline.js
@@ -404,8 +404,8 @@ define(function (require) {
             if (timelineOption.controlPosition === 'none') {
                 return;
             }
-            var iconSize = 15;
-            var iconGap = 5;
+            var iconSize = controlStyle.itemSize;
+            var iconGap = controlStyle.itemGap;
             var x;
             if (timelineOption.controlPosition === 'left') {
                 x = this._location.x;

diff --git a/src/config.js b/src/config.js
@@ -302,6 +302,7 @@ define(function() {
             dataBackgroundColor: '#eee',            // 数据背景颜色
             fillerColor: 'rgba(144,197,237,0.2)',   // 填充颜色
             handleColor: 'rgba(70,130,180,0.8)',    // 手柄颜色
+            handleSize: 8,
             showDetail: true,
             // xAxisIndex: [],         // 默认控制所有横向类目
             // yAxisIndex: [],         // 默认控制所有横向类目
@@ -539,6 +540,8 @@ define(function() {
                 }
             },
             controlStyle: {
+                itemSize: 15,
+                itemGap: 5,
                 normal: { color: '#333'},
                 emphasis: { color: '#1e90ff'}
             },
@@ -1294,6 +1297,7 @@ define(function() {
             //symbolRotate: null,
             //smooth: false,
             large: false,
+            precision: 2,
             effect: {
                 show: false,
                 loop: true,