force加入label

Houfeng · Jul 2, 2013 · 9a17b7a · 9a17b7a
1 parent b23619f
commit 9a17b7a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/doc/example/force.html b/doc/example/force.html
@@ -115,6 +115,7 @@
                 {
                     value : 300,    //孤立点
                     category : 1,
+                    name : "Daemon",
                     itemStyle : {
                         normal : {
                             color : '#b10101'

diff --git a/src/chart/force.js b/src/chart/force.js
@@ -226,6 +226,25 @@ define(function(require) {
                     __force_index__ : i
                 };
 
+                // Label 
+                if (self.deepQuery([forceSerie], 'itemStyle.normal.label.show')) {
+                    shape.style.text = node.name;
+                    shape.style.textPosition = 'specific';
+                    shape.style.textColor = self.deepQuery([forceSerie], 'itemStyle.normal.label.textStyle.color') || '#fff';
+                    shape.style.textAlign = self.deepQuery([forceSerie], 'itemStyle.normal.label.textStyle.align') || 'center';
+                    shape.style.textBaseLine = self.deepQuery([forceSerie], 'itemStyle.normal.label.textStyle.baseline') || 'middle';
+                    shape.style.textFont = self.getFont(self.deepQuery([forceSerie], 'itemStyle.normal.label.textStyle'));
+                }
+
+                if (self.deepQuery([forceSerie], 'itemStyle.emphasis.label.show')) {
+                    shape.highlightStyle.text = node.name;
+                    shape.highlightStyle.textPosition = 'specific';
+                    shape.highlightStyle.textColor = self.deepQuery([forceSerie], 'itemStyle.emphasis.label.textStyle.color') || '#fff';
+                    shape.highlightStyle.textAlign = self.deepQuery([forceSerie], 'itemStyle.emphasis.label.textStyle.align') || 'center';
+                    shape.highlightStyle.textBaseLine = self.deepQuery([forceSerie], 'itemStyle.emphasis.label.textStyle.baseline') || 'middle';
+                    shape.highlightStyle.textFont = self.getFont(self.deepQuery([forceSerie], 'itemStyle.emphasis.label.textStyle'));
+                }
+
                 // 优先级 node.style > category.style > defaultStyle
                 zrUtil.merge(shape.style, nodeStyle);
                 zrUtil.merge(shape.highlightStyle, nodeEmphasisStyle);

diff --git a/src/config.js b/src/config.js
@@ -449,7 +449,6 @@ define(function() {
                     // color: 各异,
                     label: {
                         show: true,
-                        position: 'outer'
                         // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
                     },
                     nodeStyle : {
@@ -464,8 +463,6 @@ define(function() {
                 emphasis: {
                     // color: 各异,
                     label: {
-                        show: false,
-                        position: 'outer'
                         // textStyle: null      // 默认使用全局文本样式，详见TEXTSTYLE
                     },
                     nodeStyle : {