diff --git a/webapp/packages/chat-sdk/src/components/ChatItem/SqlItem.tsx b/webapp/packages/chat-sdk/src/components/ChatItem/SqlItem.tsx index 8aa911055..7c898a610 100644 --- a/webapp/packages/chat-sdk/src/components/ChatItem/SqlItem.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatItem/SqlItem.tsx @@ -96,7 +96,7 @@ const SqlItem: React.FC = ({ setSqlType(sqlType === 's2SQL' ? '' : 's2SQL'); }} > - {queryMode === 'LLM_S2SQL' ? 'LLM' : 'Rule'}解析S2SQL + {queryMode === 'LLM_S2SQL' || queryMode === 'PLAIN_TEXT' ? 'LLM' : 'Rule'}解析S2SQL )} {sqlInfo.correctS2SQL && ( diff --git a/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx b/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx index f3b19b938..ee1a76c0e 100644 --- a/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatItem/index.tsx @@ -123,7 +123,7 @@ const ChatItem: React.FC = ({ setExecuteLoading(true); } try { - const res: any = await chatExecute(msg, conversationId!, parseInfoValue); + const res: any = await chatExecute(msg, conversationId!, parseInfoValue, agentId); const valid = updateData(res); onMsgDataLoaded?.( { diff --git a/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx b/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx index 6ba6ce51b..8faaac0d7 100644 --- a/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx +++ b/webapp/packages/chat-sdk/src/components/ChatMsg/index.tsx @@ -86,11 +86,13 @@ const ChatMsg: React.FC = ({ const isMetricCard = (queryMode.includes('METRIC') || isDslMetricCard) && singleData; const isText = - columns.length === 1 && - columns[0].showType === 'CATEGORY' && - ((!queryMode.includes('METRIC') && !queryMode.includes('ENTITY')) || - queryMode === 'METRIC_INTERPRET') && - singleData; + queryMode === 'PLAIN_TEXT' || + (columns.length === 1 && + columns[0].showType === 'CATEGORY' && + ((!queryMode.includes('METRIC') && !queryMode.includes('ENTITY')) || + queryMode === 'METRIC_INTERPRET') && + singleData); + if (isText) { return MsgContentTypeEnum.TEXT; } diff --git a/webapp/packages/chat-sdk/src/service/index.ts b/webapp/packages/chat-sdk/src/service/index.ts index 60cf22cba..a00f84abd 100644 --- a/webapp/packages/chat-sdk/src/service/index.ts +++ b/webapp/packages/chat-sdk/src/service/index.ts @@ -61,9 +61,15 @@ export function chatParse( }); } -export function chatExecute(queryText: string, chatId: number, parseInfo: ChatContextType) { +export function chatExecute( + queryText: string, + chatId: number, + parseInfo: ChatContextType, + agentId?: number +) { return axios.post(`${prefix}/chat/query/execute`, { queryText, + agentId, chatId: chatId || DEFAULT_CHAT_ID, queryId: parseInfo.queryId, parseId: parseInfo.id,