提交 0879f445 编写于 作者: L lang

hoverStyle

上级 9a5995ed
......@@ -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');
......
......@@ -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
......@@ -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);
});
}
};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册