From 1fdb42330e96206e896de20063731714ce9226f8 Mon Sep 17 00:00:00 2001 From: lang Date: Mon, 6 Jun 2016 22:16:38 +0800 Subject: [PATCH] =?UTF-8?q?Legend=20add=20inactiveColor=E2=80=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/legend/LegendModel.js | 4 ++++ src/component/legend/LegendView.js | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/component/legend/LegendModel.js b/src/component/legend/LegendModel.js index bedf967e3..b2a473502 100644 --- a/src/component/legend/LegendModel.js +++ b/src/component/legend/LegendModel.js @@ -162,6 +162,10 @@ define(function(require) { itemWidth: 25, // 图例图形高度 itemHeight: 14, + + // 图例关闭时候的颜色 + inactiveColor: '#ccc', + textStyle: { // 图例文字颜色 color: '#333' diff --git a/src/component/legend/LegendView.js b/src/component/legend/LegendView.js index 66e6b4880..497295192 100644 --- a/src/component/legend/LegendView.js +++ b/src/component/legend/LegendView.js @@ -7,8 +7,6 @@ define(function (require) { var curry = zrUtil.curry; - var LEGEND_DISABLE_COLOR = '#ccc'; - function dispatchSelectAction(name, api) { api.dispatchAction({ type: 'legendToggleSelect', @@ -154,6 +152,7 @@ define(function (require) { ) { var itemWidth = legendModel.get('itemWidth'); var itemHeight = legendModel.get('itemHeight'); + var inactiveColor = legendModel.get('inactiveColor'); var isSelected = legendModel.isSelected(name); var itemGroup = new graphic.Group(); @@ -165,7 +164,7 @@ define(function (require) { // Use user given icon first legendSymbolType = itemIcon || legendSymbolType; itemGroup.add(symbolCreator.createSymbol( - legendSymbolType, 0, 0, itemWidth, itemHeight, isSelected ? color : LEGEND_DISABLE_COLOR + legendSymbolType, 0, 0, itemWidth, itemHeight, isSelected ? color : inactiveColor )); // Compose symbols @@ -181,7 +180,7 @@ define(function (require) { // Put symbol in the center itemGroup.add(symbolCreator.createSymbol( symbolType, (itemWidth - size) / 2, (itemHeight - size) / 2, size, size, - isSelected ? color : LEGEND_DISABLE_COLOR + isSelected ? color : inactiveColor )); } @@ -202,7 +201,7 @@ define(function (require) { text: name, x: textX, y: itemHeight / 2, - fill: isSelected ? textStyleModel.getTextColor() : LEGEND_DISABLE_COLOR, + fill: isSelected ? textStyleModel.getTextColor() : inactiveColor, textFont: textStyleModel.getFont(), textAlign: textAlign, textVerticalAlign: 'middle' -- GitLab