diff --git a/src/component/marker/MarkLineView.js b/src/component/marker/MarkLineView.js index 11aa4514e7259eb0c814a5509ebcc3c66a489516..b60ae8214c8d9432d07c3ad9bbb14cc01a6c7600 100644 --- a/src/component/marker/MarkLineView.js +++ b/src/component/marker/MarkLineView.js @@ -185,7 +185,7 @@ define(function (require) { // Set host model for tooltip // FIXME mlData.line.eachItemGraphicEl(function (el, idx) { - el.eachChild(function (child) { + el.traverse(function (child) { child.hostModel = mlModel; }); }); diff --git a/src/util/symbol.js b/src/util/symbol.js index bfba014b85d575e5341edb96be695eef9df279d0..81ed78e5644e6914c942afeb8930939924c2362f 100644 --- a/src/util/symbol.js +++ b/src/util/symbol.js @@ -68,15 +68,6 @@ define(function(require) { height: 0 }, - beforeBrush: function () { - var style = this.style; - if (style.textPosition === 'inside') { - style.textPosition = ['50%', '35%']; - style.textAlign = 'center'; - style.textBaseline = 'middle'; - } - }, - buildPath: function (path, shape) { var x = shape.x; var y = shape.y; @@ -256,6 +247,17 @@ define(function(require) { height: 0 }, + beforeBrush: function () { + var style = this.style; + var shape = this.shape; + // FIXME + if (shape.symbolType === 'pin' && style.textPosition === 'inside') { + style.textPosition = ['50%', '40%']; + style.textAlign = 'center'; + style.textBaseline = 'middle'; + } + }, + buildPath: function (ctx, shape) { var proxySymbol = symbolBuildProxies[shape.symbolType]; if (proxySymbol) {