diff --git a/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx b/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx index a04120940..3996562c2 100644 --- a/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx @@ -420,7 +420,7 @@ const ChatItem: React.FC = ({ if (!!queryResults) { const exportData = queryResults.map(item => { return Object.keys(item).reduce((result, key) => { - const columnName = queryColumns?.find(column => column.nameEn === key)?.name || key; + const columnName = queryColumns?.find(column => column.name === key)?.name || key; result[columnName] = item[key]; return result; }, {}); 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 8d0b7d4f1..a05c9f866 100644 --- a/webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx @@ -48,12 +48,13 @@ const MetricTrend: React.FC = ({ const { queryColumns, queryResults, aggregateInfo, entityInfo, chatContext } = data; const [chartType, setChartType] = useState('line'); - const dateField: any = queryColumns?.find( + const dateField = queryColumns?.find( (column: any) => column.showType === 'DATE' || column.type === 'DATE' ); const dateColumnName = dateField?.bizName || ''; - const categoryColumnName = - queryColumns?.find((column: any) => column.showType === 'CATEGORY')?.bizName || ''; + let categoryColumnName = + queryColumns?.find((column: any) => column.showType === 'CATEGORY')?.bizName || ''; + categoryColumnName = categoryColumnName === dateColumnName ? '' : categoryColumnName; const metricFields = queryColumns?.filter((column: any) => column.showType === 'NUMBER'); const currentMetricField = queryColumns?.find((column: any) => column.showType === 'NUMBER'); @@ -80,11 +81,11 @@ const MetricTrend: React.FC = ({ )}
- + {/**/}
{ - handleFieldChange(record, 'timeGranularity', value); - }} - defaultValue={timeGranularity === '' ? undefined : DATE_OPTIONS[0]} - style={{ minWidth: 180 }} - allowClear - > - {DATE_OPTIONS.map((item) => ( - - ))} - - + {/**/} + {/* 时间粒度:*/} + {/* {*/} + {/* handleFieldChange(record, 'timeGranularity', value);*/} + {/* }}*/} + {/* defaultValue={timeGranularity === '' ? undefined : DATE_OPTIONS[0]}*/} + {/* style={{ minWidth: 180 }}*/} + {/* allowClear*/} + {/* >*/} + {/* {DATE_OPTIONS.map((item) => (*/} + {/* */} + {/* ))}*/} + {/* */} + {/**/} ); }