From 1414ded4f6ae6a26cad2fcf9902b602c3d524825 Mon Sep 17 00:00:00 2001 From: Fine Date: Thu, 13 Apr 2023 15:50:39 +0800 Subject: [PATCH] feat: exclude empty data --- src/hooks/data.ts | 4 ++-- src/hooks/useMetricsProcessor.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/hooks/data.ts b/src/hooks/data.ts index 02e63215..195483f9 100644 --- a/src/hooks/data.ts +++ b/src/hooks/data.ts @@ -71,7 +71,7 @@ export const RespFields: Indexable = { readMetricsValues: `{ label values { - values {value} + values {value isEmptyValue} } }`, readMetricsValue: ``, @@ -88,7 +88,7 @@ export const RespFields: Indexable = { readLabeledMetricsValues: `{ label values { - values {value} + values {value isEmptyValue} } }`, readHeatMap: `{ diff --git a/src/hooks/useMetricsProcessor.ts b/src/hooks/useMetricsProcessor.ts index bca29a44..f9d01ea9 100644 --- a/src/hooks/useMetricsProcessor.ts +++ b/src/hooks/useMetricsProcessor.ts @@ -361,7 +361,8 @@ export function useQueryTopologyMetrics(metrics: string[], ids: string[]) { return { queryStr, conditions }; } -function calculateExp(arr: { value: number }[], config: { calculation?: string }): (number | string)[] { +function calculateExp(list: { value: number }[], config: { calculation?: string }): (number | string)[] { + const arr = list.filter((d: any) => !d.isEmptyValue); const sum = arr.map((d: { value: number }) => d.value).reduce((a, b) => a + b); let data: (number | string)[] = []; switch (config.calculation) {