mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-12 20:51:48 +00:00
Fixed abnormal message rendering caused by abnormal value of indicator name field, Supplement for PR #2030 (#2031)
This commit is contained in:
@@ -44,9 +44,9 @@ const BarChart: React.FC<Props> = ({
|
|||||||
const { queryColumns, queryResults, entityInfo } = data;
|
const { queryColumns, queryResults, entityInfo } = data;
|
||||||
|
|
||||||
const categoryColumnName =
|
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 metricColumn = queryColumns?.find(column => column.showType === 'NUMBER');
|
||||||
const metricColumnName = metricColumn?.nameEn || '';
|
const metricColumnName = metricColumn?.bizName || '';
|
||||||
|
|
||||||
const renderChart = () => {
|
const renderChart = () => {
|
||||||
let instanceObj: any;
|
let instanceObj: any;
|
||||||
@@ -158,7 +158,7 @@ const BarChart: React.FC<Props> = ({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
data: data.map(item => {
|
data: data.map(item => {
|
||||||
return item[metricColumn?.nameEn || ''];
|
return item[metricColumn?.bizName || ''];
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ const MetricCard: React.FC<Props> = ({ data, question, loading, onApplyAuth }) =
|
|||||||
const { metricInfos } = aggregateInfo || {};
|
const { metricInfos } = aggregateInfo || {};
|
||||||
|
|
||||||
const indicatorColumn = queryColumns?.find(column => column.showType === 'NUMBER');
|
const indicatorColumn = queryColumns?.find(column => column.showType === 'NUMBER');
|
||||||
const indicatorColumnName = indicatorColumn?.nameEn || '';
|
const indicatorColumnName = indicatorColumn?.bizName || '';
|
||||||
|
|
||||||
const { dataFormatType, dataFormat } = indicatorColumn || {};
|
const { dataFormatType, dataFormat } = indicatorColumn || {};
|
||||||
const value = queryResults?.[0]?.[indicatorColumnName] || 0;
|
const value = queryResults?.[0]?.[indicatorColumnName] || 0;
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ const MetricTrendChart: React.FC<Props> = ({
|
|||||||
instanceObj.clear();
|
instanceObj.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
const valueColumnName = metricField.nameEn;
|
const valueColumnName = metricField.bizName;
|
||||||
const dataSource = resultList.map((item: any) => {
|
const dataSource = resultList.map((item: any) => {
|
||||||
return {
|
return {
|
||||||
...item,
|
...item,
|
||||||
|
|||||||
@@ -121,7 +121,7 @@ const MultiMetricsTrendChart: React.FC<Props> = ({
|
|||||||
showSymbol: resultList.length === 1,
|
showSymbol: resultList.length === 1,
|
||||||
smooth: true,
|
smooth: true,
|
||||||
data: resultList.map((item: any) => {
|
data: resultList.map((item: any) => {
|
||||||
const value = item[metricField.nameEn];
|
const value = item[metricField.bizName];
|
||||||
return (metricField.dataFormatType === 'percent' ||
|
return (metricField.dataFormatType === 'percent' ||
|
||||||
metricField.dataFormatType === 'decimal') &&
|
metricField.dataFormatType === 'decimal') &&
|
||||||
metricField.dataFormat?.needMultiply100
|
metricField.dataFormat?.needMultiply100
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ const MetricTrend: React.FC<Props> = ({
|
|||||||
const dateField: any = queryColumns?.find(
|
const dateField: any = queryColumns?.find(
|
||||||
(column: any) => column.showType === 'DATE' || column.type === 'DATE'
|
(column: any) => column.showType === 'DATE' || column.type === 'DATE'
|
||||||
);
|
);
|
||||||
const dateColumnName = dateField?.nameEn || '';
|
const dateColumnName = dateField?.bizName || '';
|
||||||
const categoryColumnName =
|
const categoryColumnName =
|
||||||
queryColumns?.find((column: any) => column.showType === 'CATEGORY')?.bizName || '';
|
queryColumns?.find((column: any) => column.showType === 'CATEGORY')?.bizName || '';
|
||||||
const metricFields = queryColumns?.filter((column: any) => column.showType === 'NUMBER');
|
const metricFields = queryColumns?.filter((column: any) => column.showType === 'NUMBER');
|
||||||
|
|||||||
@@ -17,10 +17,10 @@ const Text: React.FC<Props> = ({ columns, referenceColumn, dataSource }) => {
|
|||||||
const prefixCls = `${CLS_PREFIX}-text`;
|
const prefixCls = `${CLS_PREFIX}-text`;
|
||||||
|
|
||||||
const initData = () => {
|
const initData = () => {
|
||||||
let textValue = dataSource[0][columns[0].nameEn];
|
let textValue = dataSource[0][columns[0].bizName];
|
||||||
setText(textValue === undefined ? '暂无数据' : textValue);
|
setText(textValue === undefined ? '暂无数据' : textValue);
|
||||||
if (referenceColumn) {
|
if (referenceColumn) {
|
||||||
const referenceDataValue = dataSource[0][referenceColumn.nameEn];
|
const referenceDataValue = dataSource[0][referenceColumn.bizName];
|
||||||
setReferenceData(referenceDataValue || []);
|
setReferenceData(referenceDataValue || []);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user