ソースを参照

Merge pull request #16105 from grafana/graphite-fix-0-arg

Graphite: fixed nonNegativeDerivative argument hidden if 0
Torkel Ödegaard 6 年 前
コミット
3884ac855e
1 ファイル変更3 行追加2 行削除
  1. 3 2
      public/app/plugins/datasource/graphite/func_editor.ts

+ 3 - 2
public/app/plugins/datasource/graphite/func_editor.ts

@@ -183,8 +183,9 @@ export function graphiteFuncEditor($compile, templateSrv, popoverSrv) {
           }
           }
 
 
           let paramValue = templateSrv.highlightVariablesAsHtml(func.params[index]);
           let paramValue = templateSrv.highlightVariablesAsHtml(func.params[index]);
+          const hasValue = paramValue !== null && paramValue !== undefined;
 
 
-          const last = index >= func.params.length - 1 && param.optional && !paramValue;
+          const last = index >= func.params.length - 1 && param.optional && !hasValue;
           if (last && param.multiple) {
           if (last && param.multiple) {
             paramValue = '+';
             paramValue = '+';
           }
           }
@@ -197,7 +198,7 @@ export function graphiteFuncEditor($compile, templateSrv, popoverSrv) {
             '<a ng-click="" class="graphite-func-param-link' +
             '<a ng-click="" class="graphite-func-param-link' +
               (last ? ' query-part__last' : '') +
               (last ? ' query-part__last' : '') +
               '">' +
               '">' +
-              (paramValue || '&nbsp;') +
+              (hasValue ? paramValue : '&nbsp;') +
               '</a>'
               '</a>'
           );
           );
           const $input = $(paramTemplate);
           const $input = $(paramTemplate);