From f52cfaef9933cd595acd52d0e51f7af4a9b32176 Mon Sep 17 00:00:00 2001
From: Hongyu Shi <shywzt@iCloud.com>
Date: Fri, 11 Jul 2025 09:54:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=9B=BA=E5=AE=9A=E6=A1=86=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E4=BB=A5=E4=BF=AE=E5=A4=8D=E5=B8=83=E5=B1=80=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Hongyu Shi <shywzt@iCloud.com>
---
 src/components/sessionCard/SessionCard.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/sessionCard/SessionCard.vue b/src/components/sessionCard/SessionCard.vue
index e894eb4..9384c13 100644
--- a/src/components/sessionCard/SessionCard.vue
+++ b/src/components/sessionCard/SessionCard.vue
@@ -287,6 +287,7 @@ const deleteOne = (name: string, list: string[]) => {
     &__box {
       flex: 1;
       border-radius: 8px;
+      width: 264px;
       height: 66px;
       background-color: var(--o-bg-color-light);
       padding: 0px 5px 12px 15px;
-- 
Gitee


From edff44e243528d8220eca04701d8015e0de20dac Mon Sep 17 00:00:00 2001
From: Hongyu Shi <shywzt@iCloud.com>
Date: Mon, 14 Jul 2025 17:27:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20think=20?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=BC=82=E5=B8=B8=E6=98=BE=E7=A4=BA=E5=9C=A8?=
 =?UTF-8?q?=E5=88=AB=E7=9A=84=E5=AF=B9=E8=AF=9D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Hongyu Shi <shywzt@iCloud.com>
---
 .../dialoguePanel/DialoguePanel.vue           | 232 ++++++++++--------
 .../dialoguePanel/DialogueThought.vue         |   9 +-
 2 files changed, 137 insertions(+), 104 deletions(-)

diff --git a/src/components/dialoguePanel/DialoguePanel.vue b/src/components/dialoguePanel/DialoguePanel.vue
index 9f24130..a29ae30 100644
--- a/src/components/dialoguePanel/DialoguePanel.vue
+++ b/src/components/dialoguePanel/DialoguePanel.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { DialoguePanelType } from './type';
 import marked from 'src/utils/marked.js';
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 import { writeText } from 'src/utils';
 import { useSessionStore, useChangeThemeStore, echartsObj } from '@/store';
 import { useHistorySessionStore } from 'src/store';
@@ -25,51 +25,33 @@ const echartsDraw = ref();
 const visible = ref(false);
 export interface DialoguePanelProps {
   key: number;
-  //
   cid: number;
-  // groupid
   groupId: string;
-  // 用来区分是用户还是ai的输入
   type: DialoguePanelType;
-  // 文本内容
   inputParams: object;
-  // 文本内容
   content?: string[] | string;
-  // 当前选中的第n次回答的索引，默认是最新回答
+  // 当前选中的第n次回答的索引
   currentSelected?: number;
-  // 文本内容是否生成完毕
   isFinish?: boolean;
-  // 是否在loading
   isLoading?: boolean;
-  // 创建时间
   createdAt?: string | Date;
-  // 用户头像
   avatar?: string;
-  // 是否需要重新生成
   needRegernerate?: boolean;
-  // 是否选择插件
   userSelectedApp?: any;
-  //
   recordList?: string[] | undefined;
-  // MessageList 结构
   messageArray?: MessageArray[] | undefined;
-  //
   isCommentList?: string[] | undefined;
-  //
   search_suggestions?: any;
-  //
   echartsObj?: any;
-  //
   test?: any;
-  //--时间-问题数-token
+  // 元数据：时间、问题数、token
   metadata?: Metadata;
-  // -工作流的相关数据
+  // 工作流相关数据
   flowdata?: any;
-  // 缺少的参数列表-有可能
+  // 缺少的参数列表
   paramsList?: any;
-  // 工作流调试用不到
   modeOptions: any;
-  // 新增是否是工作流调试的-用于修改调试抽屉样式
+  // 是否是工作流调试模式
   isWorkFlowDebug: boolean;
 }
 import JsonFormComponent from './JsonFormComponent.vue';
@@ -88,14 +70,132 @@ var myChart;
 const { pausedStream, reGenerateAnswer, prePage, nextPage } = useSessionStore();
 const props = withDefaults(defineProps<DialoguePanelProps>(), {
   isFinish: false,
-  // 当前选中的第n次回答的索引
-  // currentSelected: 0,
   needRegernerate: false,
 });
 const messageArray = ref<MessageArray>(props.messageArray);
 const thoughtContent = ref('');
 const index = ref(0);
 const isComment = ref('none');
+
+// 处理内容，分离 think 标签和主要内容
+const processContent = (content: string) => {
+  if (!content) {
+    thoughtContent.value = '';
+    contentAfterMark.value = '';
+    return;
+  }
+
+  const startIndex = content.indexOf('<think>');
+  const endIndex = content.indexOf('</think>');
+
+  if (startIndex !== -1 && endIndex === -1) {
+    // 未完成的 think 标签
+    const thinkContent = content.substring(startIndex + 7);
+    thoughtContent.value = thinkContent.replace(/\n/g, '<br>');
+
+    const beforeThink = content.substring(0, startIndex);
+    updateMainContent(beforeThink);
+  } else if (startIndex !== -1 && endIndex !== -1) {
+    // 完整的 think 标签
+    const thinkContent = content.substring(startIndex + 7, endIndex);
+    thoughtContent.value = thinkContent.replace(/\n/g, '<br>');
+
+    const contentWithoutThink = content
+      .replace(/<think>[\s\S]*?<\/think>/g, '')
+      .trim();
+    updateMainContent(contentWithoutThink);
+  } else {
+    // 没有 think 标签
+    thoughtContent.value = '';
+    updateMainContent(content);
+  }
+};
+
+// 更新主内容区域并进行 markdown 解析
+const updateMainContent = (newContent: string) => {
+  if (!newContent.trim()) {
+    contentAfterMark.value = '';
+    return;
+  }
+
+  // 立即显示内容，先转换换行符
+  contentAfterMark.value = newContent.replace(/\n/g, '<br>');
+
+  // 检查是否包含 markdown 语法
+  const hasMarkdownSyntax = /[*_`#[\]()!]|```|---|>=?|<=?|\n\s*[-*+]\s+/.test(
+    newContent,
+  );
+
+  if (hasMarkdownSyntax) {
+    // 异步解析 markdown
+    processMarkdownAsync(newContent)
+      .then((html) => {
+        contentAfterMark.value = html;
+      })
+      .catch((error) => {
+        console.error('Markdown parsing failed:', error);
+        contentAfterMark.value = newContent.replace(/\n/g, '<br>');
+      });
+  }
+};
+
+// 异步处理 markdown 解析和 table 包装
+const processMarkdownAsync = async (content: string): Promise<string> => {
+  if (!content.trim()) return '';
+
+  try {
+    let str = await marked.parse(
+      xss(content).replace(/&gt;/g, '>').replace(/&lt;/g, '<'),
+    );
+
+    // 处理 table 包装
+    let tableStart = str.indexOf('<table>');
+    if (tableStart !== -1) {
+      str =
+        str.slice(0, tableStart) +
+        '<div class="overflowTable">' +
+        str
+          .slice(tableStart, str.indexOf('</table>') + '</table>'.length)
+          .replace('</table>', '</table></div>') +
+        str.slice(str.indexOf('</table>') + '</table>'.length);
+    }
+
+    return str;
+  } catch (error) {
+    console.error('Markdown parsing error:', error);
+    return content;
+  }
+};
+
+// 监听 props 变化，重置状态
+watch(
+  () => [props.content, props.groupId],
+  () => {
+    thoughtContent.value = '';
+    contentAfterMark.value = '';
+    index.value = 0;
+  },
+  { immediate: false },
+);
+
+// 监听内容变化，处理内容解析
+watch(
+  () => [props.content, index.value],
+  () => {
+    if (props.content && Array.isArray(props.content)) {
+      const currentContent = props.content[index.value];
+      if (currentContent !== undefined) {
+        processContent(currentContent);
+      }
+    } else if (typeof props.content === 'string') {
+      processContent(props.content);
+    } else {
+      thoughtContent.value = '';
+      contentAfterMark.value = '';
+    }
+  },
+  { immediate: true, deep: true },
+);
 const emits = defineEmits<{
   (e: 'handleReport', qaRecordId: string, reason?: string): void;
   (
@@ -107,31 +207,7 @@ const emits = defineEmits<{
   (e: 'clearSuggestion', index: number): void;
 }>();
 
-// #region ----------------------------------------< pause and regenerate >--------------------------------------
-
-/**
- * 暂停和重新生成问答
- */
-const handlePauseAndReGenerate = (cid?: number) => {
-  if (!cid) {
-    return;
-  }
-  emits('clearSuggestion', props.key);
-  if (props.isFinish) {
-    // 重新生成
-    thoughtContent.value = '';
-    reGenerateAnswer(cid, user_selected_app.value);
-    index.value = messageArray.value.getAllItems().length - 1;
-    isComment.value = 'none';
-  } else {
-    // 停止生成
-    pausedStream(cid);
-  }
-};
-
-// #endregion
-
-// 复制
+// 复制功能
 const handleCopy = (): void => {
   if (!props.content || !Array.isArray(props.content)) {
     errorMsg(i18n.global.t('feedback.copied_failed'));
@@ -141,9 +217,8 @@ const handleCopy = (): void => {
   successMsg(i18n.global.t('feedback.copied_successfully'));
   return;
 };
-/**
- * 赞同与反对
- */
+
+// 点赞与反对
 const handleLike = async (
   type: 'liked' | 'disliked' | 'report',
 ): Promise<void> => {
@@ -188,12 +263,7 @@ const handleLike = async (
   }
 };
 
-/**
- * 反对
- * @param reason
- * @param reasionLink
- * @param reasonDescription
- */
+// 反对功能
 const handleDislike = async (
   reason: string,
   reasionLink?: string,
@@ -244,58 +314,22 @@ const handleReport = async (
   isAgainstVisible.value = false;
 };
 
-//处理举报逻辑
 const handleReportClick = () => {
   isReportVisible.value = false;
 };
 
-//处理举报逻辑
 const bindReportClick = () => {
   document.addEventListener('click', handleReportClick);
 };
 
-//处理举报逻辑
 const unbindReportClick = () => {
   document.removeEventListener('click', handleReportClick);
 };
 
 const isAgainstVisible = ref<boolean>(false);
 const isReportVisible = ref<boolean>(false);
-
 const txt2imgPathZoom = ref('');
-// 解析完成后的文本内容
-const contentAfterMark = computed(() => {
-  if (!props.content) {
-    return '';
-  }
-  //xxs将大于号转为html实体以防歧义；将< >替换为正常字符；
-  let str = marked.parse(
-    xss(props.content[index.value]).replace(/&gt;/g, '>').replace(/&lt;/g, '<'),
-  );
-  //将table提取出来中加一个<div>父节点控制溢出
-  let tableStart = str.indexOf('<table>');
-  if (tableStart !== -1) {
-    str =
-      str.slice(0, tableStart) +
-      '<div class="overflowTable">' +
-      str
-        .slice(tableStart, str.indexOf('</table>') + '</table>'.length)
-        .replace('</table>', '</table></div>') +
-      str.slice(str.indexOf('</table>') + '</table>'.length);
-  }
-  //仅获取第一个遇到的 think 标签
-  const startIndex = str.indexOf('<think>');
-  const endIndex = str.indexOf('</think>');
-  if (startIndex !== -1 && endIndex === -1) {
-    // 计算 <a> 之后的字符串
-    const contentAfterA = str.substring(startIndex + 7); // +2 是因为我们要跳过 <a> 这两个字符
-    thoughtContent.value = contentAfterA;
-    return '';
-  } else if (startIndex !== -1 && endIndex !== -1) {
-    thoughtContent.value = str.match(/<think>([\s\S]*?)<\/think>/)[1];
-  }
-  return str.replace(/<think>([\s\S]*?)<\/think>/g, '');
-});
+const contentAfterMark = ref('');
 
 const prePageHandle = (cid: number) => {
   thoughtContent.value = '';
@@ -419,8 +453,10 @@ watch(
 );
 
 onBeforeUnmount(() => {
-  isComment.value = undefined;
+  isComment.value = 'none';
   index.value = 0;
+  thoughtContent.value = '';
+  contentAfterMark.value = '';
 });
 
 const answer_zoom = ref(false);
diff --git a/src/components/dialoguePanel/DialogueThought.vue b/src/components/dialoguePanel/DialogueThought.vue
index 3dedee1..c4f5547 100644
--- a/src/components/dialoguePanel/DialogueThought.vue
+++ b/src/components/dialoguePanel/DialogueThought.vue
@@ -24,7 +24,6 @@
 <script setup>
 import { IconCaretDown } from '@computing/opendesign-icons';
 import { ref, computed } from 'vue';
-import marked from 'src/utils/marked';
 import xss from 'xss';
 const props = defineProps({
   content: {
@@ -41,11 +40,9 @@ const contentAfterMark = computed(() => {
   if (!props.content) {
     return '';
   }
-  //xxs将大于号转为html实体以防歧义；将< >替换为正常字符；
-  let str = marked.parse(
-    xss(props.content).replace(/&gt;/g, '>').replace(/&lt;/g, '<'),
-  );
-  return str;
+  // think 内容作为纯文本显示，不进行 markdown 解析
+  // 只进行 XSS 过滤，内容已经在父组件中转换了换行符
+  return xss(props.content);
 });
 </script>
 
-- 
Gitee


From 76567ea4e72ebe3b2a9e793e027ba36de6afe94d Mon Sep 17 00:00:00 2001
From: Hongyu Shi <shywzt@iCloud.com>
Date: Tue, 15 Jul 2025 10:29:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20contentAfterMar?=
 =?UTF-8?q?k=20=E5=AE=9A=E4=B9=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Hongyu Shi <shywzt@iCloud.com>
---
 src/components/dialoguePanel/DialoguePanel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/dialoguePanel/DialoguePanel.vue b/src/components/dialoguePanel/DialoguePanel.vue
index a29ae30..6bf185a 100644
--- a/src/components/dialoguePanel/DialoguePanel.vue
+++ b/src/components/dialoguePanel/DialoguePanel.vue
@@ -74,6 +74,7 @@ const props = withDefaults(defineProps<DialoguePanelProps>(), {
 });
 const messageArray = ref<MessageArray>(props.messageArray);
 const thoughtContent = ref('');
+const contentAfterMark = ref('');
 const index = ref(0);
 const isComment = ref('none');
 
@@ -329,7 +330,6 @@ const unbindReportClick = () => {
 const isAgainstVisible = ref<boolean>(false);
 const isReportVisible = ref<boolean>(false);
 const txt2imgPathZoom = ref('');
-const contentAfterMark = ref('');
 
 const prePageHandle = (cid: number) => {
   thoughtContent.value = '';
-- 
Gitee