Skip to content

Commit 30adaa3

Browse files
authored
1 parent cc66ebd commit 30adaa3

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

webapp/packages/chat-sdk/src/common/type.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ export type QueryDataType = {
178178
export type ColumnType = {
179179
authorized: boolean;
180180
name: string;
181-
nameEn: string;
181+
bizName: string;
182182
showType: string;
183183
type: string;
184184
dataFormatType: string;

webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const MetricTrend: React.FC<Props> = ({
5353
);
5454
const dateColumnName = dateField?.nameEn || '';
5555
const categoryColumnName =
56-
queryColumns?.find((column: any) => column.showType === 'CATEGORY')?.nameEn || '';
56+
queryColumns?.find((column: any) => column.showType === 'CATEGORY')?.bizName || '';
5757
const metricFields = queryColumns?.filter((column: any) => column.showType === 'NUMBER');
5858

5959
const currentMetricField = queryColumns?.find((column: any) => column.showType === 'NUMBER');

webapp/packages/chat-sdk/src/components/ChatMsg/Table/index.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ const Table: React.FC<Props> = ({ data, size, loading, question, onApplyAuth })
1919

2020
const prefixCls = `${CLS_PREFIX}-table`;
2121
const tableColumns: any[] = queryColumns.map(
22-
({ name, nameEn, showType, dataFormatType, dataFormat, authorized }) => {
22+
({ name, bizName, showType, dataFormatType, dataFormat, authorized }) => {
2323
return {
24-
dataIndex: nameEn,
25-
key: nameEn,
26-
title: name || nameEn,
24+
dataIndex: bizName,
25+
key: bizName,
26+
title: name || bizName,
2727
defaultSortOrder: 'descend',
2828
sorter:
2929
showType === 'NUMBER'
3030
? (a, b) => {
31-
return a[nameEn] - b[nameEn];
31+
return a[bizName] - b[bizName];
3232
}
3333
: undefined,
3434
render: (value: string | number) => {
@@ -59,7 +59,7 @@ const Table: React.FC<Props> = ({ data, size, loading, question, onApplyAuth })
5959
</div>
6060
);
6161
}
62-
if (nameEn.includes('photo')) {
62+
if (bizName.includes('photo')) {
6363
return (
6464
<div className={`${prefixCls}-photo`}>
6565
<img width={40} height={40} src={value as string} alt="" />
@@ -78,7 +78,7 @@ const Table: React.FC<Props> = ({ data, size, loading, question, onApplyAuth })
7878

7979
const dateColumn = queryColumns.find(column => column.type === 'DATE');
8080
const dataSource = dateColumn
81-
? queryResults.sort((a, b) => moment(a[dateColumn.nameEn]).diff(moment(b[dateColumn.nameEn])))
81+
? queryResults.sort((a, b) => moment(a[dateColumn.bizName]).diff(moment(b[dateColumn.bizName])))
8282
: queryResults;
8383
return (
8484
<div className={prefixCls}>

webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ const ChatMsg: React.FC<Props> = ({
114114
metricFields.length > 0 &&
115115
categoryField.length <= 1 &&
116116
!(metricFields.length > 1 && categoryField.length > 0) &&
117-
!dataSource.every(item => item[dateField.nameEn] === dataSource[0][dateField.nameEn]);
117+
!dataSource.every(item => item[dateField.bizName] === dataSource[0][dateField.bizName]);
118118

119119
if (isMetricTrend) {
120120
return MsgContentTypeEnum.METRIC_TREND;
@@ -330,7 +330,7 @@ const ChatMsg: React.FC<Props> = ({
330330
!isEntityMode;
331331

332332
const recommendMetrics = chatContext?.metrics?.filter(metric =>
333-
queryColumns.every(queryColumn => queryColumn.nameEn !== metric.bizName)
333+
queryColumns.every(queryColumn => queryColumn.bizName !== metric.bizName)
334334
);
335335

336336
const isMultipleMetric =

0 commit comments

Comments
 (0)