feat: 修复Bug #2029 (#2030)

This commit is contained in:
Ron Zhang
2025-02-07 09:28:06 +08:00
committed by GitHub
parent cc66ebd684
commit 30adaa3f20
4 changed files with 11 additions and 11 deletions

View File

@@ -178,7 +178,7 @@ export type QueryDataType = {
export type ColumnType = {
authorized: boolean;
name: string;
nameEn: string;
bizName: string;
showType: string;
type: string;
dataFormatType: string;

View File

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

View File

@@ -19,16 +19,16 @@ const Table: React.FC<Props> = ({ data, size, loading, question, onApplyAuth })
const prefixCls = `${CLS_PREFIX}-table`;
const tableColumns: any[] = queryColumns.map(
({ name, nameEn, showType, dataFormatType, dataFormat, authorized }) => {
({ name, bizName, showType, dataFormatType, dataFormat, authorized }) => {
return {
dataIndex: nameEn,
key: nameEn,
title: name || nameEn,
dataIndex: bizName,
key: bizName,
title: name || bizName,
defaultSortOrder: 'descend',
sorter:
showType === 'NUMBER'
? (a, b) => {
return a[nameEn] - b[nameEn];
return a[bizName] - b[bizName];
}
: undefined,
render: (value: string | number) => {
@@ -59,7 +59,7 @@ const Table: React.FC<Props> = ({ data, size, loading, question, onApplyAuth })
</div>
);
}
if (nameEn.includes('photo')) {
if (bizName.includes('photo')) {
return (
<div className={`${prefixCls}-photo`}>
<img width={40} height={40} src={value as string} alt="" />
@@ -78,7 +78,7 @@ const Table: React.FC<Props> = ({ data, size, loading, question, onApplyAuth })
const dateColumn = queryColumns.find(column => column.type === 'DATE');
const dataSource = dateColumn
? queryResults.sort((a, b) => moment(a[dateColumn.nameEn]).diff(moment(b[dateColumn.nameEn])))
? queryResults.sort((a, b) => moment(a[dateColumn.bizName]).diff(moment(b[dateColumn.bizName])))
: queryResults;
return (
<div className={prefixCls}>

View File

@@ -114,7 +114,7 @@ const ChatMsg: React.FC<Props> = ({
metricFields.length > 0 &&
categoryField.length <= 1 &&
!(metricFields.length > 1 && categoryField.length > 0) &&
!dataSource.every(item => item[dateField.nameEn] === dataSource[0][dateField.nameEn]);
!dataSource.every(item => item[dateField.bizName] === dataSource[0][dateField.bizName]);
if (isMetricTrend) {
return MsgContentTypeEnum.METRIC_TREND;
@@ -330,7 +330,7 @@ const ChatMsg: React.FC<Props> = ({
!isEntityMode;
const recommendMetrics = chatContext?.metrics?.filter(metric =>
queryColumns.every(queryColumn => queryColumn.nameEn !== metric.bizName)
queryColumns.every(queryColumn => queryColumn.bizName !== metric.bizName)
);
const isMultipleMetric =