Fixed abnormal message rendering caused by abnormal value of indicator name field, Supplement for PR #2030 (#2031)
Some checks are pending
supersonic CentOS CI / build (21) (push) Waiting to run
supersonic mac CI / build (21) (push) Waiting to run
supersonic ubuntu CI / build (21) (push) Waiting to run
supersonic windows CI / build (21) (push) Waiting to run

This commit is contained in:
jianjun.xu
2025-02-07 10:18:52 +08:00
committed by GitHub
parent fd306db3fe
commit 4ab9cd715d
6 changed files with 9 additions and 9 deletions

View File

@@ -44,9 +44,9 @@ const BarChart: React.FC<Props> = ({
const { queryColumns, queryResults, entityInfo } = data;
const categoryColumnName =
queryColumns?.find(column => column.showType === 'CATEGORY')?.nameEn || '';
queryColumns?.find(column => column.showType === 'CATEGORY')?.bizName || '';
const metricColumn = queryColumns?.find(column => column.showType === 'NUMBER');
const metricColumnName = metricColumn?.nameEn || '';
const metricColumnName = metricColumn?.bizName || '';
const renderChart = () => {
let instanceObj: any;
@@ -158,7 +158,7 @@ const BarChart: React.FC<Props> = ({
},
},
data: data.map(item => {
return item[metricColumn?.nameEn || ''];
return item[metricColumn?.bizName || ''];
}),
},
});

View File

@@ -21,7 +21,7 @@ const MetricCard: React.FC<Props> = ({ data, question, loading, onApplyAuth }) =
const { metricInfos } = aggregateInfo || {};
const indicatorColumn = queryColumns?.find(column => column.showType === 'NUMBER');
const indicatorColumnName = indicatorColumn?.nameEn || '';
const indicatorColumnName = indicatorColumn?.bizName || '';
const { dataFormatType, dataFormat } = indicatorColumn || {};
const value = queryResults?.[0]?.[indicatorColumnName] || 0;

View File

@@ -51,7 +51,7 @@ const MetricTrendChart: React.FC<Props> = ({
instanceObj.clear();
}
const valueColumnName = metricField.nameEn;
const valueColumnName = metricField.bizName;
const dataSource = resultList.map((item: any) => {
return {
...item,

View File

@@ -121,7 +121,7 @@ const MultiMetricsTrendChart: React.FC<Props> = ({
showSymbol: resultList.length === 1,
smooth: true,
data: resultList.map((item: any) => {
const value = item[metricField.nameEn];
const value = item[metricField.bizName];
return (metricField.dataFormatType === 'percent' ||
metricField.dataFormatType === 'decimal') &&
metricField.dataFormat?.needMultiply100

View File

@@ -51,7 +51,7 @@ const MetricTrend: React.FC<Props> = ({
const dateField: any = queryColumns?.find(
(column: any) => column.showType === 'DATE' || column.type === 'DATE'
);
const dateColumnName = dateField?.nameEn || '';
const dateColumnName = dateField?.bizName || '';
const categoryColumnName =
queryColumns?.find((column: any) => column.showType === 'CATEGORY')?.bizName || '';
const metricFields = queryColumns?.filter((column: any) => column.showType === 'NUMBER');

View File

@@ -17,10 +17,10 @@ const Text: React.FC<Props> = ({ columns, referenceColumn, dataSource }) => {
const prefixCls = `${CLS_PREFIX}-text`;
const initData = () => {
let textValue = dataSource[0][columns[0].nameEn];
let textValue = dataSource[0][columns[0].bizName];
setText(textValue === undefined ? '暂无数据' : textValue);
if (referenceColumn) {
const referenceDataValue = dataSource[0][referenceColumn.nameEn];
const referenceDataValue = dataSource[0][referenceColumn.bizName];
setReferenceData(referenceDataValue || []);
}
};