update dist and lib

DataV-Team · Nov 26, 2019 · 1edab03 · 1edab03
1 parent 7bc73fe
commit 1edab03
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 4 deletions.
diff --git a/dist/charts.map.js b/dist/charts.map.js
diff --git a/dist/charts.min.js b/dist/charts.min.js
diff --git a/lib/config/bar.js b/lib/config/bar.js
@@ -203,6 +203,25 @@ var barConfig = {
    */
   barStyle: {},
 
+  /**
+   * @description Independent color mode
+   * When set to true, independent color mode is enabled
+   * @type {Boolean}
+   * @default independentColor = false
+   */
+  independentColor: false,
+
+  /**
+   * @description Independent colors
+   * Only effective when independent color mode is enabled
+   * Default value is the same as the color in the root configuration
+   * Two-dimensional color array can produce gradient colors
+   * @type {Array}
+   * @example independentColor = ['#fff', '#000']
+   * @example independentColor = [['#fff', '#000'], '#000']
+   */
+  independentColors: [],
+
   /**
    * @description Bar chart render level
    * Priority rendering high level

diff --git a/lib/core/bar.js b/lib/core/bar.js
@@ -577,9 +577,17 @@ function getNormalBarShape(barItem, i) {
 function getBarStyle(barItem, i) {
   var barStyle = barItem.barStyle,
       gradient = barItem.gradient,
-      color = barItem.color;
+      color = barItem.color,
+      independentColor = barItem.independentColor,
+      independentColors = barItem.independentColors;
   var fillColor = [barStyle.fill || color];
   var gradientColor = (0, _util2.deepMerge)(fillColor, gradient.color);
+
+  if (independentColor) {
+    var idtColor = independentColors[i % independentColors.length];
+    gradientColor = idtColor instanceof Array ? idtColor : [idtColor];
+  }
+
   if (gradientColor.length === 1) gradientColor.push(gradientColor[0]);
   var gradientParams = getGradientParams(barItem, i);
   return (0, _util2.deepMerge)({

diff --git a/lib/core/mergeColor.js b/lib/core/mergeColor.js
@@ -43,4 +43,13 @@ function mergeColor(chart) {
       return di.color = color[i % colorNum];
     });
   });
+  var barWithIndependentColor = series.filter(function (_ref3) {
+    var type = _ref3.type,
+        independentColor = _ref3.independentColor;
+    return type === 'bar' && independentColor;
+  });
+  barWithIndependentColor.forEach(function (bar) {
+    if (bar.independentColors) return;
+    bar.independentColors = color;
+  });
 }