From 29738494df3484106eb8db7dffb3902cc131c293 Mon Sep 17 00:00:00 2001 From: lang Date: Tue, 1 Dec 2015 11:34:19 +0800 Subject: [PATCH] Pin symbol text position fix --- src/component/marker/MarkLineView.js | 2 +- src/util/symbol.js | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/component/marker/MarkLineView.js b/src/component/marker/MarkLineView.js index 11aa4514e..b60ae8214 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 bfba014b8..81ed78e56 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) { -- GitLab