From 0879f445c7870ce6584ce404bbea855c99747f7d Mon Sep 17 00:00:00 2001
From: lang <bm2736892@gmail.com>
Date: Thu, 24 Sep 2015 01:54:19 +0800
Subject: [PATCH] hoverStyle

---
 src/chart/helper/DataSymbol.js |  9 ++++++++-
 src/model/Model.js             |  9 +++++----
 src/util/graphic.js            | 10 ++++------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/chart/helper/DataSymbol.js b/src/chart/helper/DataSymbol.js
index df69d5598..fc67e7e82 100644
--- a/src/chart/helper/DataSymbol.js
+++ b/src/chart/helper/DataSymbol.js
@@ -3,6 +3,7 @@ define(function (require) {
     var zrUtil = require('zrender/core/util');
     var Group = require('zrender/container/Group');
     var symbolCreators = require('../../util/symbol');
+    var graphic = require('../../util/graphic');
 
     function createSymbol(data, idx, enableAnimation) {
         var point = data.getItemLayout(idx);
@@ -127,9 +128,15 @@ define(function (require) {
             data.eachItemGraphicEl(function (el, idx) {
                 el.z = this.z;
 
+                var itemModel = data.getItemModel(idx);
                 zrUtil.extend(
                     el.style,
-                    data.getItemModel(idx).getModel('itemStyle.normal').getItemStyle()
+                    itemModel.getModel('itemStyle.normal').getItemStyle()
+                );
+
+                graphic.setHoverStyle(
+                    el,
+                    itemModel.getModel('itemStyle.emphasis').getItemStyle()
                 );
 
                 var symbolSize = data.getItemVisual(idx, 'symbolSize');
diff --git a/src/model/Model.js b/src/model/Model.js
index 6aa7466ea..cb59c5c58 100644
--- a/src/model/Model.js
+++ b/src/model/Model.js
@@ -130,10 +130,11 @@ define(function (require) {
         return ExtendedModel;
     };
 
-    zrUtil.merge(Model.prototype, require('./mixin/lineStyle'));
-    zrUtil.merge(Model.prototype, require('./mixin/areaStyle'));
-    zrUtil.merge(Model.prototype, require('./mixin/textStyle'));
-    zrUtil.merge(Model.prototype, require('./mixin/itemStyle'));
+    var modelProto = Model.prototype;
+    zrUtil.merge(modelProto, require('./mixin/lineStyle'));
+    zrUtil.merge(modelProto, require('./mixin/areaStyle'));
+    zrUtil.merge(modelProto, require('./mixin/textStyle'));
+    zrUtil.merge(modelProto, require('./mixin/itemStyle'));
 
     return Model;
 });
\ No newline at end of file
diff --git a/src/util/graphic.js b/src/util/graphic.js
index 91e4bad63..4b27ce2c6 100644
--- a/src/util/graphic.js
+++ b/src/util/graphic.js
@@ -166,19 +166,17 @@ define(function(require) {
             var stroke = el.style.stroke;
             var fill = el.style.fill;
             hoverStyle = hoverStyle || {};
-            hoverStyle.fill = hoverStyle.fill || colorTool.lift(fill, -0.2);
-            hoverStyle.stroke = hoverStyle.stroke || colorTool.lift(stroke, -0.2);
+            hoverStyle.fill = hoverStyle.fill || colorTool.lift(fill, -0.1);
+            hoverStyle.stroke = hoverStyle.stroke || colorTool.lift(stroke, -0.1);
 
             var normalStyle = {};
             for (var name in hoverStyle) {
                 normalStyle[name] = el.style[name];
             }
             el.on('mouseover', function () {
-                this.style.set(hoverStyle);
-                this.dirty();
+                el.setStyle(hoverStyle);
             }).on('mouseout', function () {
-                this.style.set(normalStyle);
-                this.dirty();
+                el.setStyle(normalStyle);
             });
         }
     };
-- 
GitLab