fix(chart): all kind of bar chart should not show aggrete name but fo…

…rmatted content issue running-elephant#196 and running-elephant#197
Cuiyansong · Nov 11, 2021 · c91232c · c91232c
1 parent 32a79e0
commit c91232c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...Page/components/ChartOperationPanel/components/ChartGraph/BasicBarChart/BasicBarChart.tsx b/...Page/components/ChartOperationPanel/components/ChartGraph/BasicBarChart/BasicBarChart.tsx
@@ -27,6 +27,7 @@ import {
   getColorizeGroupSeriesColumns,
   getColumnRenderName,
   getCustomSortableColumns,
+  getExtraSeriesDataFormat,
   getExtraSeriesRowData,
   getReference,
   getSeriesTooltips4Rectangular2,
@@ -216,6 +217,7 @@ class BasicBarChart extends Chart {
           name: getColumnRenderName(aggConfig),
           data: dataColumns.map(dc => ({
             ...getExtraSeriesRowData(dc),
+            ...getExtraSeriesDataFormat(aggConfig?.format),
             name: getColumnRenderName(aggConfig),
             value: dc[getValueByColumnKey(aggConfig)],
           })),
@@ -253,6 +255,7 @@ class BasicBarChart extends Chart {
             const dc = v.find(col => col[xAxisColumnName] === d);
             return {
               ...getExtraSeriesRowData(dc),
+              ...getExtraSeriesDataFormat(aggConfig?.format),
               name: getColumnRenderName(aggConfig),
               value: dc?.[getValueByColumnKey(aggConfig)] || 0,
             };
@@ -524,10 +527,10 @@ class BasicBarChart extends Chart {
         position,
         ...font,
         formatter: params => {
-          const { name, value, data } = params;
+          const { value, data } = params;
           const formattedValue = toFormattedValue(value, data.format);
           const labels: string[] = [];
-          labels.push(`${name}: ${formattedValue}`);
+          labels.push(formattedValue);
           return labels.join('\n');
         },
       },

diff --git a/frontend/src/app/utils/chart.ts b/frontend/src/app/utils/chart.ts
@@ -21,6 +21,7 @@ import ChartConfig, {
   ChartDataSectionType,
   ChartI18NSectionConfig,
   ChartStyleSectionConfig,
+  IFieldFormatConfig,
   SortActionType,
 } from 'app/pages/ChartWorkbenchPage/models/ChartConfig';
 import { ChartDatasetMeta } from 'app/pages/ChartWorkbenchPage/models/ChartDataset';
@@ -691,6 +692,12 @@ export function getExtraSeriesRowData(data) {
   };
 }
 
+export function getExtraSeriesDataFormat(format?: IFieldFormatConfig) {
+  return {
+    format,
+  };
+}
+
 export function getColorizeGroupSeriesColumns(
   dataColumns: any[],
   groupByKey: string,