Skip to content

Commit

Permalink
feat: 修复Bug tencentmusic#2029
Browse files Browse the repository at this point in the history
  • Loading branch information
Ron Zhang committed Feb 6, 2025
1 parent cc66ebd commit c9e42bc
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion webapp/packages/chat-sdk/src/common/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export type QueryDataType = {
export type ColumnType = {
authorized: boolean;
name: string;
nameEn: string;
bizName: string;
showType: string;
type: string;
dataFormatType: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
14 changes: 7 additions & 7 deletions webapp/packages/chat-sdk/src/components/ChatMsg/Table/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down Expand Up @@ -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="" />
Expand All @@ -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}>
Expand Down
4 changes: 2 additions & 2 deletions webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 =
Expand Down

0 comments on commit c9e42bc

Please sign in to comment.