From 2b8b2cac4fe3f05474459a034bc4034f2d7aa0cb Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期三, 09 四月 2025 10:14:06 +0800
Subject: [PATCH] Merge branch 'test' into huishui_iframe

---
 src/components/chat/hooks/useAssistantContentOpt.ts |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/chat/hooks/useAssistantContentOpt.ts b/src/components/chat/hooks/useAssistantContentOpt.ts
index 22df671..5678b93 100644
--- a/src/components/chat/hooks/useAssistantContentOpt.ts
+++ b/src/components/chat/hooks/useAssistantContentOpt.ts
@@ -26,11 +26,12 @@
 	};
 
 	const checkIsText = (item) => {
-		const isText = item?.content?.values?.some((item) => item?.content?.type === AnswerType.Knowledge);
+		const isText = item?.content?.values?.some((item) => item?.content?.type === AnswerType.Knowledge)  || item?.conclusion?.length > 0;
 		return isText;
 	};
 
 	const getPlainText = (item) => {
+		let result = '';
 		const knowledgeText = item.content.values
 			.filter((item) => {
 				const type = item?.content?.type;
@@ -49,7 +50,14 @@
 					.join('\n\n');
 				return acc + answer;
 			}, '');
-		return markdownToTxt(knowledgeText);
+
+		const conclusionText =
+			item.conclusion
+				?.filter((item) => !!item.report)
+				.map((item) => item.report)
+				.join('\n\n') ?? '';
+		result += knowledgeText + conclusionText;
+		return markdownToTxt(result);
 	};
 
 	const likeClick = async (item) => {
@@ -143,6 +151,7 @@
 		isEnterStop = false;
 		const instance = BrowserSpeechSynthesis.getInstance();
 		instance.cancel();
+		activeSpeakItem.value = null;
 	};
 
 	const speechClick = (item) => {
@@ -162,6 +171,9 @@
 		activeSpeakItem.value = item;
 
 		const instance = BrowserSpeechSynthesis.getInstance();
+		instance.onEnd(() => {
+			resetSpeak();
+		});
 		if (isEnterStop) {
 			instance.resume();
 		} else {

--
Gitblit v1.9.3