diff --git a/frontend/src/utils/mermaidShared.ts b/frontend/src/utils/mermaidShared.ts
index 04efaf43..470bb1f3 100644
--- a/frontend/src/utils/mermaidShared.ts
+++ b/frontend/src/utils/mermaidShared.ts
@@ -1,5 +1,10 @@
import mermaid from 'mermaid';
import type {Tokens} from 'marked';
+import {openMermaidFullscreen} from "@/utils/mermaidViewer.ts";
+import hljs from "highlight.js";
+import "highlight.js/styles/github.css";
+
+hljs.registerAliases("mermaid", { languageName: "plaintext" });
let mermaidInitialized = false;
@@ -37,73 +42,55 @@ export const ensureMermaidInitialized = () => {
mermaidInitialized = true;
};
+let mermaidCount = 0;
export const createMermaidCodeRenderer = (idPrefix: string) => {
- let mermaidCount = 0;
-
return ({text, lang}: Tokens.Code) => {
+ let highlighted = '';
+ let highlightLang: string = lang || 'Code';
+ if (highlightLang && hljs.getLanguage(highlightLang)) {
+ try {
+ highlighted = hljs.highlight(text, { language: lang }).value;
+ } catch {
+ let ret = hljs.highlightAuto(text);
+ highlighted = ret.value;
+ highlightLang = ret.language || "Code";
+ }
+ } else {
+ let ret = hljs.highlightAuto(text);
+ highlighted = ret.value;
+ highlightLang = ret.language || "Code";
+ }
if (lang === 'mermaid') {
const id = `${idPrefix}-${++mermaidCount}`;
- return `
${text}
`;
+ return `${highlighted}
`;
}
-
- const displayLang = lang || 'Code';
- const escapedCode = text
- .replace(/&/g, '&')
- .replace(//g, '>');
- return `${escapedCode}
`;
+ return `${highlighted}
`;
};
};
export const renderMermaidInContainer = async (
rootElement: HTMLElement | null | undefined,
- renderedMermaidIds: Set,
) => {
if (!rootElement) return 0;
-
- const mermaidElements = rootElement.querySelectorAll('.mermaid');
- const unrenderedElements: HTMLElement[] = [];
-
- mermaidElements.forEach((el) => {
- const id = el.id || `mermaid-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
- if (!el.id) {
- el.id = id;
+ const mermaidElements = rootElement.querySelectorAll('pre[data-mermaid="false"]');
+ for (const el of mermaidElements) {
+ try{
+ const code = el.innerText;
+ // 验证
+ await mermaid.parse(code);
+ // 渲染
+ let {svg} = await mermaid.render(`${el.id}-svg`, code);
+ el.classList.add('mermaid')
+ el.innerHTML = svg;
+ el.addEventListener('click', (event) => {
+ event.stopPropagation();
+ openMermaidFullscreen(svg);
+ })
+ } catch(e){
+ console.error("Mermaid rendering error:", e);
}
- if (!renderedMermaidIds.has(el.id) && !el.querySelector('svg')) {
- renderedMermaidIds.add(el.id);
- unrenderedElements.push(el);
- }
- });
-
- if (unrenderedElements.length === 0) return 0;
-
- await mermaid.run({ nodes: unrenderedElements });
- return unrenderedElements.length;
-};
-
-export const bindMermaidFullscreenEvents = (
- rootElement: HTMLElement | null | undefined,
- onOpenFullscreen: (svgOuterHTML: string) => void,
-) => {
- if (!rootElement) return;
-
- const mermaidDivs = rootElement.querySelectorAll('.mermaid');
- mermaidDivs.forEach((div) => {
- div.style.cursor = 'pointer';
- const oldHandler = (div as any).__mermaidClickHandler as EventListener | undefined;
- if (oldHandler) {
- div.removeEventListener('click', oldHandler);
- }
- const handler: EventListener = (e: Event) => {
- e.stopPropagation();
- const target = e.currentTarget as HTMLElement;
- const svg = target.querySelector('svg');
- if (svg) {
- onOpenFullscreen(svg.outerHTML);
- }
- };
- (div as any).__mermaidClickHandler = handler;
- div.addEventListener('click', handler);
- });
-};
+ // 标记为已渲染
+ el.setAttribute('data-mermaid', 'true');
+ }
+};
\ No newline at end of file
diff --git a/frontend/src/views/chat/components/AgentStreamDisplay.vue b/frontend/src/views/chat/components/AgentStreamDisplay.vue
index 106fc033..8fbbc3c1 100644
--- a/frontend/src/views/chat/components/AgentStreamDisplay.vue
+++ b/frontend/src/views/chat/components/AgentStreamDisplay.vue
@@ -349,7 +349,6 @@ import { MessagePlugin } from 'tdesign-vue-next';
import { useUIStore } from '@/stores/ui';
import { useI18n } from 'vue-i18n';
import i18n from '@/i18n';
-import { openMermaidFullscreen } from '@/utils/mermaidViewer';
import { hydrateProtectedFileImages } from '@/utils/security';
import {
buildManualMarkdown,
@@ -358,7 +357,6 @@ import {
replaceIncompleteImageWithPlaceholder,
} from '@/utils/chatMessageShared';
import {
- bindMermaidFullscreenEvents,
createMermaidCodeRenderer,
ensureMermaidInitialized,
renderMermaidInContainer,
@@ -1466,28 +1464,9 @@ const protectProviderImageSrcInHTML = (html: string): string => {
);
};
-// 已渲染的 mermaid 元素 ID 集合
-const renderedMermaidIds = new Set();
-
// 渲染 Mermaid 图表的函数
const renderMermaidDiagrams = async () => {
- try {
- const renderedCount = await renderMermaidInContainer(rootElement.value, renderedMermaidIds);
- if (renderedCount > 0) {
- nextTick(() => {
- bindMermaidClickEvents();
- });
- }
- } catch (error) {
- console.error('Mermaid rendering error:', error);
- }
-};
-
-// 为 Mermaid 容器绑定点击全屏事件(绑定在 div 上,不是 SVG 上)
-const bindMermaidClickEvents = () => {
- bindMermaidFullscreenEvents(rootElement.value, (svgOuterHTML: string) => {
- openMermaidFullscreen(svgOuterHTML);
- });
+ await renderMermaidInContainer(rootElement.value);
};
// Tool summary - extract key info to display externally
diff --git a/frontend/src/views/chat/components/botmsg.vue b/frontend/src/views/chat/components/botmsg.vue
index 8f01f5d0..059eea8a 100644
--- a/frontend/src/views/chat/components/botmsg.vue
+++ b/frontend/src/views/chat/components/botmsg.vue
@@ -60,14 +60,13 @@