From 30adaa3f20df0549dbe77116f0fee272397d1ec4 Mon Sep 17 00:00:00 2001 From: Ron Zhang Date: Fri, 7 Feb 2025 09:28:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8DBug=20#2029=20(#2030)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/packages/chat-sdk/src/common/type.ts | 2 +- .../src/components/ChatMsg/MetricTrend/index.tsx | 2 +- .../src/components/ChatMsg/Table/index.tsx | 14 +++++++------- .../chat-sdk/src/components/ChatMsg/index.tsx | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/webapp/packages/chat-sdk/src/common/type.ts b/webapp/packages/chat-sdk/src/common/type.ts index 19c1d0955..38ebbc98a 100644 --- a/webapp/packages/chat-sdk/src/common/type.ts +++ b/webapp/packages/chat-sdk/src/common/type.ts @@ -178,7 +178,7 @@ export type QueryDataType = { export type ColumnType = { authorized: boolean; name: string; - nameEn: string; + bizName: string; showType: string; type: string; dataFormatType: string; diff --git a/webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx b/webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx index f75f1b3c5..8fe1ce946 100644 --- a/webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx @@ -53,7 +53,7 @@ const MetricTrend: React.FC = ({ ); 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'); diff --git a/webapp/packages/chat-sdk/src/components/ChatMsg/Table/index.tsx b/webapp/packages/chat-sdk/src/components/ChatMsg/Table/index.tsx index 76cada80c..1cf1aeda6 100644 --- a/webapp/packages/chat-sdk/src/components/ChatMsg/Table/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatMsg/Table/index.tsx @@ -19,16 +19,16 @@ const Table: React.FC = ({ 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 = ({ data, size, loading, question, onApplyAuth }) ); } - if (nameEn.includes('photo')) { + if (bizName.includes('photo')) { return (
@@ -78,7 +78,7 @@ const Table: React.FC = ({ 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 (
diff --git a/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx b/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx index d1145ed4a..166b653d6 100644 --- a/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx @@ -114,7 +114,7 @@ const ChatMsg: React.FC = ({ 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 = ({ !isEntityMode; const recommendMetrics = chatContext?.metrics?.filter(metric => - queryColumns.every(queryColumn => queryColumn.nameEn !== metric.bizName) + queryColumns.every(queryColumn => queryColumn.bizName !== metric.bizName) ); const isMultipleMetric =