提交 1fdb4233 编写于 作者: L lang

Legend add inactiveColor


上级 0aa31e33
...@@ -162,6 +162,10 @@ define(function(require) { ...@@ -162,6 +162,10 @@ define(function(require) {
itemWidth: 25, itemWidth: 25,
// 图例图形高度 // 图例图形高度
itemHeight: 14, itemHeight: 14,
// 图例关闭时候的颜色
inactiveColor: '#ccc',
textStyle: { textStyle: {
// 图例文字颜色 // 图例文字颜色
color: '#333' color: '#333'
......
...@@ -7,8 +7,6 @@ define(function (require) { ...@@ -7,8 +7,6 @@ define(function (require) {
var curry = zrUtil.curry; var curry = zrUtil.curry;
var LEGEND_DISABLE_COLOR = '#ccc';
function dispatchSelectAction(name, api) { function dispatchSelectAction(name, api) {
api.dispatchAction({ api.dispatchAction({
type: 'legendToggleSelect', type: 'legendToggleSelect',
...@@ -154,6 +152,7 @@ define(function (require) { ...@@ -154,6 +152,7 @@ define(function (require) {
) { ) {
var itemWidth = legendModel.get('itemWidth'); var itemWidth = legendModel.get('itemWidth');
var itemHeight = legendModel.get('itemHeight'); var itemHeight = legendModel.get('itemHeight');
var inactiveColor = legendModel.get('inactiveColor');
var isSelected = legendModel.isSelected(name); var isSelected = legendModel.isSelected(name);
var itemGroup = new graphic.Group(); var itemGroup = new graphic.Group();
...@@ -165,7 +164,7 @@ define(function (require) { ...@@ -165,7 +164,7 @@ define(function (require) {
// Use user given icon first // Use user given icon first
legendSymbolType = itemIcon || legendSymbolType; legendSymbolType = itemIcon || legendSymbolType;
itemGroup.add(symbolCreator.createSymbol( itemGroup.add(symbolCreator.createSymbol(
legendSymbolType, 0, 0, itemWidth, itemHeight, isSelected ? color : LEGEND_DISABLE_COLOR legendSymbolType, 0, 0, itemWidth, itemHeight, isSelected ? color : inactiveColor
)); ));
// Compose symbols // Compose symbols
...@@ -181,7 +180,7 @@ define(function (require) { ...@@ -181,7 +180,7 @@ define(function (require) {
// Put symbol in the center // Put symbol in the center
itemGroup.add(symbolCreator.createSymbol( itemGroup.add(symbolCreator.createSymbol(
symbolType, (itemWidth - size) / 2, (itemHeight - size) / 2, size, size, symbolType, (itemWidth - size) / 2, (itemHeight - size) / 2, size, size,
isSelected ? color : LEGEND_DISABLE_COLOR isSelected ? color : inactiveColor
)); ));
} }
...@@ -202,7 +201,7 @@ define(function (require) { ...@@ -202,7 +201,7 @@ define(function (require) {
text: name, text: name,
x: textX, x: textX,
y: itemHeight / 2, y: itemHeight / 2,
fill: isSelected ? textStyleModel.getTextColor() : LEGEND_DISABLE_COLOR, fill: isSelected ? textStyleModel.getTextColor() : inactiveColor,
textFont: textStyleModel.getFont(), textFont: textStyleModel.getFont(),
textAlign: textAlign, textAlign: textAlign,
textVerticalAlign: 'middle' textVerticalAlign: 'middle'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册