From 9c240da3f97e32a12eb96dfdac963c34b13ef121 Mon Sep 17 00:00:00 2001
From: kener <kener.linfeng@gmail.com>
Date: Thu, 13 Mar 2014 16:16:45 +0800
Subject: [PATCH] markline tooltip bug fixed

---
 src/component/base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/component/base.js b/src/component/base.js
index 60fed6bdd..65bac4089 100644
--- a/src/component/base.js
+++ b/src/component/base.js
@@ -553,7 +553,7 @@ define(function(require) {
                 }
                 
                 // 标准化一些参数
-                data[i][0].tooltip = {trigger:'item'}; // tooltip.trigger指定为item
+                data[i][0].tooltip = mergeData.tooltip || {trigger:'item'}; // tooltip.trigger指定为item
                 data[i][0].name = typeof data[i][0].name != 'undefined'
                                   ? data[i][0].name : '';
                 data[i][1].name = typeof data[i][1].name != 'undefined'
-- 
GitLab