Selaa lähdekoodia

Graph: fill below to series override option not automatically adds lines=false, as overrides, if you want lines just for the fill below series just remove the overrides, #940

Torkel Ödegaard 11 vuotta sitten
vanhempi
commit
fe620d8e44

+ 2 - 2
src/app/panels/graph/module.js

@@ -342,8 +342,8 @@ function (angular, app, $, _, kbn, moment, TimeSeries) {
       $scope.render();
       $scope.render();
     };
     };
 
 
-    $scope.addSeriesOverride = function() {
-      $scope.panel.seriesOverrides.push({});
+    $scope.addSeriesOverride = function(override) {
+      $scope.panel.seriesOverrides.push(override || {});
     };
     };
 
 
     $scope.removeSeriesOverride = function(override) {
     $scope.removeSeriesOverride = function(override) {

+ 8 - 0
src/app/panels/graph/seriesOverridesCtrl.js

@@ -34,6 +34,14 @@ define([
       var option = $scope.overrideMenu[optionIndex];
       var option = $scope.overrideMenu[optionIndex];
       var value = option.values[valueIndex];
       var value = option.values[valueIndex];
       $scope.override[option.propertyName] = value;
       $scope.override[option.propertyName] = value;
+
+      // automatically disable lines for this series and the fill bellow to series
+      // can be removed by the user if they still want lines
+      if (option.propertyName === 'fillBelowTo') {
+        $scope.override['lines'] = false;
+        $scope.addSeriesOverride({ alias: value, lines: false });
+      }
+
       $scope.updateCurrentOverrides();
       $scope.updateCurrentOverrides();
       $scope.render();
       $scope.render();
     };
     };