提交 8f918318 编写于 作者: L lang

markArea default to use alpha instead of opacity

上级 5631efec
......@@ -6,7 +6,8 @@ define(function (require) {
defaultOption: {
zlevel: 0,
z: 5,
// PENDING
z: 1,
tooltip: {
trigger: 'item'
},
......@@ -21,12 +22,11 @@ define(function (require) {
show: true,
position: 'top'
}
},
itemStyle: {
normal: {
opacity: 0.4
}
}
// itemStyle: {
// normal: {
// }
// }
}
});
});
\ No newline at end of file
......@@ -5,6 +5,7 @@ define(function (require) {
var List = require('../../data/List');
var numberUtil = require('../../util/number');
var graphic = require('../../util/graphic');
var colorUtil = require('zrender/tool/color');
var markerHelper = require('./markerHelper');
......@@ -211,11 +212,12 @@ define(function (require) {
var itemModel = areaData.getItemModel(idx);
var labelModel = itemModel.getModel('label.normal');
var labelHoverModel = itemModel.getModel('label.emphasis');
var color = areaData.getItemVisual(idx, 'color');
polygon.useStyle(
zrUtil.extend(
itemModel.getModel('itemStyle.normal').getItemStyle(),
{
fill: areaData.getItemVisual(idx, 'color')
fill: colorUtil.modifyAlpha(color, 0.4)
}
)
);
......@@ -223,13 +225,14 @@ define(function (require) {
polygon.hoverStyle = itemModel.getModel('itemStyle.normal').getItemStyle();
var defaultValue = areaData.getName(idx) || '';
graphic.setText(polygon.style, labelModel, polygon.style.fill);
var textColor = color || polygon.style.fill;
graphic.setText(polygon.style, labelModel, textColor);
polygon.style.text = zrUtil.retrieve(
maModel.getFormattedLabel(idx, 'normal'),
defaultValue
);
graphic.setText(polygon.hoverStyle, labelHoverModel, polygon.style.fill);
graphic.setText(polygon.hoverStyle, labelHoverModel, textColor);
polygon.hoverStyle.text = zrUtil.retrieve(
maModel.getFormattedLabel(idx, 'emphasis'),
defaultValue
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册