From 3cd561815c8b8a8bbe20685e6bf3710ffeb81fa1 Mon Sep 17 00:00:00 2001 From: pah100 Date: Tue, 1 Dec 2015 19:58:29 +0800 Subject: [PATCH] add colorHue --- src/component/dataRange/DataRangeModel.js | 4 ++-- src/visual/VisualMapping.js | 4 ++++ src/visual/visualDefault.js | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/component/dataRange/DataRangeModel.js b/src/component/dataRange/DataRangeModel.js index adcca8a53..63fe6028e 100644 --- a/src/component/dataRange/DataRangeModel.js +++ b/src/component/dataRange/DataRangeModel.js @@ -50,10 +50,10 @@ define(function(require) { categories: null, // 描述 category 数据。如：['some1', 'some2', 'some3']，设置后，min max失效。 dimension: null, - inRange: null, // 'color', 'colorH', 'colorSaturation', 'colorLightness', 'colorAlpha', + inRange: null, // 'color', 'colorHue', 'colorSaturation', 'colorLightness', 'colorAlpha', // 'symbol', 'symbolSize' - outOfRange: null, // 'color', 'colorH', 'colorSaturation', 'colorLightness', 'colorAlpha', + outOfRange: null, // 'color', 'colorHue', 'colorSaturation', 'colorLightness', 'colorAlpha', // 'symbol', 'symbolSize' orient: 'vertical', // 布局方式，默认为垂直布局，可选为： diff --git a/src/visual/VisualMapping.js b/src/visual/VisualMapping.js index 76d272139..7c044cb28 100644 --- a/src/visual/VisualMapping.js +++ b/src/visual/VisualMapping.js @@ -131,6 +131,10 @@ define(function (require) { } }, + colorHue: makePartialColorVisualHandler(function (color, value) { + return zrColor.modifyHSL(color, value); + }), + colorSaturation: makePartialColorVisualHandler(function (color, value) { return zrColor.modifyHSL(color, null, value); }), diff --git a/src/visual/visualDefault.js b/src/visual/visualDefault.js index fffb845b5..ba07314c8 100644 --- a/src/visual/visualDefault.js +++ b/src/visual/visualDefault.js @@ -30,6 +30,11 @@ define(function (require) { inactive: ['rgba(0,0,0,0)'] }, + colorHue: { + active: [0, 360], + inactive: [0, 0] + }, + colorSaturation: { active: [0.3, 1], inactive: [0, 0] -- GitLab