fix(frontend): 修复公式输出展示问题并引入 KaTeX 支持 (#912)

This commit is contained in:
jw_mac
2026-04-21 23:19:22 +08:00
committed by lyingbug
parent da8191cd57
commit a121a5d636
7 changed files with 93 additions and 17 deletions
+17 -5
View File
@@ -1,12 +1,12 @@
{
"name": "knowledage-base",
"version": "0.3.6",
"version": "0.4.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "knowledage-base",
"version": "0.3.6",
"version": "0.4.0",
"dependencies": {
"@microsoft/fetch-event-source": "^2.0.1",
"@types/dompurify": "^3.0.5",
@@ -16,7 +16,9 @@
"docx-preview": "^0.3.7",
"dompurify": "^3.2.6",
"highlight.js": "^11.11.1",
"katex": "^0.16.45",
"marked": "^17.0.5",
"marked-katex-extension": "^5.1.8",
"mermaid": "^11.4.1",
"pagefind": "^1.1.1",
"papaparse": "^5.5.3",
@@ -3774,9 +3776,9 @@
}
},
"node_modules/katex": {
"version": "0.16.33",
"resolved": "https://mirrors.tencent.com/npm/katex/-/katex-0.16.33.tgz",
"integrity": "sha512-q3N5u+1sY9Bu7T4nlXoiRBXWfwSefNGoKeOwekV+gw0cAXQlz2Ww6BLcmBxVDeXBMUDQv6fK5bcNaJLxob3ZQA==",
"version": "0.16.45",
"resolved": "https://registry.npmjs.org/katex/-/katex-0.16.45.tgz",
"integrity": "sha512-pQpZbdBu7wCTmQUh7ufPmLr0pFoObnGUoL/yhtwJDgmmQpbkg/0HSVti25Fu4rmd1oCR6NGWe9vqTWuWv3GcNA==",
"funding": [
"https://opencollective.com/katex",
"https://github.com/sponsors/katex"
@@ -3961,6 +3963,16 @@
"node": ">= 20"
}
},
"node_modules/marked-katex-extension": {
"version": "5.1.8",
"resolved": "https://registry.npmjs.org/marked-katex-extension/-/marked-katex-extension-5.1.8.tgz",
"integrity": "sha512-TsV9OCHHDjVBf4IH0RSjLs4Eqsjj8HGfmVCKlimrS391EtBBxzXj2gBYdF9tY7f7oXu9tb1kHV86ExJsG3iMhw==",
"license": "MIT",
"peerDependencies": {
"katex": ">=0.16 <0.17",
"marked": ">=4 <19"
}
},
"node_modules/math-intrinsics": {
"version": "1.1.0",
"resolved": "https://mirrors.tencent.com/npm/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+2
View File
@@ -20,7 +20,9 @@
"docx-preview": "^0.3.7",
"dompurify": "^3.2.6",
"highlight.js": "^11.11.1",
"katex": "^0.16.45",
"marked": "^17.0.5",
"marked-katex-extension": "^5.1.8",
"mermaid": "^11.4.1",
"pagefind": "^1.1.1",
"papaparse": "^5.5.3",
+16 -3
View File
@@ -1,6 +1,8 @@
// @ts-nocheck
<script setup lang="ts">
import { marked } from "marked";
import markedKatex from 'marked-katex-extension';
import 'katex/dist/katex.min.css';
import hljs from "highlight.js";
import "highlight.js/styles/github.css";
@@ -53,6 +55,16 @@ marked.use({
breaks: true, // 启用单行换行转 <br>
gfm: true, // 启用 GitHub Flavored Markdown
});
marked.use(markedKatex({ throwOnError: false }));
const preprocessMathDelimiters = (rawText: string): string => {
if (!rawText || typeof rawText !== 'string') {
return '';
}
return rawText
.replace(/\\\[([\s\S]*?)\\\]/g, '$$$$$1$$$$')
.replace(/\\\(([\s\S]*?)\\\)/g, '$$$1$$');
};
const renderer = new marked.Renderer();
let page = 1;
let loadingChunks = false;
@@ -427,12 +439,13 @@ const processMarkdown = (markdownText) => {
// 保留表格单元格中的 <br>,不转成换行,避免打散表格;其他区域原样交给 marked 处理
// 安全预处理
const safeMarkdown = safeMarkdownToHTML(processedText);
// 先预处理数学定界符,再做安全预处理
const mathSafeText = preprocessMathDelimiters(processedText);
const safeMarkdown = safeMarkdownToHTML(mathSafeText);
// 使用标记渲染
marked.use({ renderer });
let html = marked.parse(safeMarkdown);
let html = marked.parse(safeMarkdown) as string;
// 还原被转义的 <br>
html = html.replace(/&lt;br\s*\/?&gt;/gi, '<br>');
+15 -2
View File
@@ -5,6 +5,8 @@ import { previewKnowledgeFile } from '@/api/knowledge-base/index';
import { MessagePlugin } from 'tdesign-vue-next';
import hljs from 'highlight.js';
import 'highlight.js/styles/github.css';
import markedKatex from 'marked-katex-extension';
import 'katex/dist/katex.min.css';
import { useI18n } from 'vue-i18n';
import { sanitizeHTML, safeMarkdownToHTML } from '@/utils/security';
@@ -104,6 +106,15 @@ function getHighlightLang(ft: string): string {
return langMap[lower] || lower;
}
const preprocessMathDelimiters = (rawText: string): string => {
if (!rawText || typeof rawText !== 'string') {
return '';
}
return rawText
.replace(/\\\[([\s\S]*?)\\\]/g, '$$$$$1$$$$')
.replace(/\\\(([\s\S]*?)\\\)/g, '$$$1$$');
};
async function renderDocx(blob: Blob) {
const { renderAsync } = await import('docx-preview');
if (docxContainer.value) {
@@ -207,6 +218,7 @@ async function renderMarkdown(blob: Blob) {
breaks: true,
gfm: true,
});
marked.use(markedKatex({ throwOnError: false }));
const renderer = new marked.Renderer();
renderer.code = function ({text, lang}) {
// 空值校验:防止 text 为 undefined 或 null
@@ -224,8 +236,9 @@ async function renderMarkdown(blob: Blob) {
return `<pre><code class="hljs">${highlighted}</code></pre>`;
};
marked.use({ renderer });
const safeText = safeMarkdownToHTML(text);
const rawHtml = marked.parse(safeText);
const mathSafeText = preprocessMathDelimiters(text);
const safeText = safeMarkdownToHTML(mathSafeText);
const rawHtml = marked.parse(safeText) as string;
markdownHtml.value = sanitizeHTML(rawHtml);
}
+7 -2
View File
@@ -19,7 +19,9 @@ const DOMPurifyConfig = {
'svg', 'g', 'path', 'rect', 'circle', 'ellipse', 'line', 'polygon',
'polyline', 'text', 'tspan', 'defs', 'marker', 'filter', 'use',
'clippath', 'lineargradient', 'radialgradient', 'stop', 'pattern',
'image', 'foreignobject', 'desc', 'title', 'switch', 'symbol', 'mask'
'image', 'foreignobject', 'desc', 'title', 'switch', 'symbol', 'mask',
// KaTeX MathML 支持的标签
'math', 'annotation', 'semantics', 'mo', 'mi', 'mn', 'msup', 'mrow', 'mfrac', 'msqrt', 'mroot', 'mstyle'
],
// 允许的属性
ALLOWED_ATTR: [
@@ -38,8 +40,11 @@ const DOMPurifyConfig = {
'patternunits', 'patterntransform', 'clippathunits', 'maskunits',
'filterunits', 'primitiveunits', 'xmlns', 'xmlns:xlink', 'xlink:href',
'version', 'baseprofile', 'enable-background', 'overflow', 'visibility',
'display', 'pointer-events', 'cursor', 'data-emit', 'direction'
'display', 'pointer-events', 'cursor', 'data-emit', 'direction',
// KaTeX MathML 支持的属性
'mathvariant', 'encoding', 'aria-hidden'
],
USE_PROFILES: { html: true, svg: true, mathMl: true },
// 允许的协议
ALLOWED_URI_REGEXP: /^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp):|(?:local|minio|cos|tos|s3|oss):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i,
// 禁止的标签和属性
@@ -341,6 +341,8 @@
import { ref, computed, watch, onMounted, onBeforeUnmount, nextTick } from 'vue';
import { useRouter } from 'vue-router';
import { marked } from 'marked';
import markedKatex from 'marked-katex-extension';
import 'katex/dist/katex.min.css';
import DOMPurify from 'dompurify';
import ToolResultRenderer from './ToolResultRenderer.vue';
import picturePreview from '@/components/picture-preview.vue';
@@ -378,7 +380,9 @@ const DOMPurifyConfig = {
'svg', 'g', 'path', 'rect', 'circle', 'ellipse', 'line', 'polygon',
'polyline', 'text', 'tspan', 'defs', 'marker', 'filter', 'use',
'clippath', 'lineargradient', 'radialgradient', 'stop', 'pattern',
'image', 'foreignobject', 'desc', 'title', 'switch', 'symbol', 'mask'
'image', 'foreignobject', 'desc', 'title', 'switch', 'symbol', 'mask',
// KaTeX MathML 支持的标签
'math', 'annotation', 'semantics', 'mo', 'mi', 'mn', 'msup', 'mrow', 'mfrac', 'msqrt', 'mroot', 'mstyle'
],
ALLOWED_ATTR: [
'href', 'title', 'target', 'rel', 'data-tooltip', 'data-url', 'data-kb-id',
@@ -397,8 +401,11 @@ const DOMPurifyConfig = {
'patternunits', 'patterntransform', 'clippathunits', 'maskunits',
'filterunits', 'primitiveunits', 'xmlns', 'xmlns:xlink', 'xlink:href',
'version', 'baseprofile', 'enable-background', 'overflow', 'visibility',
'display', 'pointer-events', 'cursor', 'data-emit', 'direction'
'display', 'pointer-events', 'cursor', 'data-emit', 'direction',
// KaTeX MathML 支持的属性
'mathvariant', 'encoding', 'aria-hidden'
],
USE_PROFILES: { html: true, svg: true, mathMl: true },
// Allow provider:// URLs so they can be hydrated later.
ALLOWED_URI_REGEXP: /^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp):|(?:local|minio|cos|tos):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i
};
@@ -586,6 +593,16 @@ const props = defineProps<{
// Configure marked for security
marked.use({});
marked.use(markedKatex({ throwOnError: false }));
const preprocessMathDelimiters = (rawText: string): string => {
if (!rawText || typeof rawText !== 'string') {
return '';
}
return rawText
.replace(/\\\[([\s\S]*?)\\\]/g, '$$$$$1$$$$')
.replace(/\\\(([\s\S]*?)\\\)/g, '$$$1$$');
};
// Event stream
const eventStream = computed(() => props.session?.agentEventStream || []);
@@ -1423,7 +1440,7 @@ const getTokens = (content: any) => {
// Restore preserved tags
sanitized = sanitized.replace(/\x00TAG(\d+)\x00/g, (_, idx) => tagPlaceholders[Number(idx)]);
const processed = preprocessMarkdown(sanitized);
const processed = preprocessMarkdown(preprocessMathDelimiters(sanitized));
return marked.lexer(processed);
};
@@ -1449,7 +1466,7 @@ const renderMarkdown = (content: any): string => {
if (!contentStr.trim()) return '';
try {
const processed = preprocessMarkdown(contentStr);
const processed = preprocessMarkdown(preprocessMathDelimiters(contentStr));
const html = marked.parse(processed, { renderer: agentRenderer }) as string;
if (!html) return '';
+15 -1
View File
@@ -62,6 +62,8 @@
<script setup>
import { onMounted, onBeforeUnmount, watch, computed, ref, reactive, defineProps, nextTick, onUpdated } from 'vue';
import { marked } from 'marked';
import markedKatex from 'marked-katex-extension';
import 'katex/dist/katex.min.css';
import docInfo from './docInfo.vue';
import deepThink from './deepThink.vue';
import AgentStreamDisplay from './AgentStreamDisplay.vue';
@@ -86,6 +88,17 @@ marked.use({
breaks: true, // 全局启用单个换行支持
});
marked.use(markedKatex({ throwOnError: false }));
const preprocessMathDelimiters = (rawText) => {
if (!rawText || typeof rawText !== 'string') {
return '';
}
return rawText
.replace(/\\\[([\s\S]*?)\\\]/g, '$$$$$1$$$$')
.replace(/\\\(([\s\S]*?)\\\)/g, '$$$1$$');
};
ensureMermaidInitialized();
const emit = defineEmits(['scroll-bottom'])
@@ -154,9 +167,10 @@ const markdownTokens = computed(() => {
}
const processed = replaceIncompleteImageWithPlaceholder(text);
const safeText = preprocessMathDelimiters(processed);
// 首先对 Markdown 内容进行安全处理
const safeMarkdown = safeMarkdownToHTML(processed);
const safeMarkdown = safeMarkdownToHTML(safeText);
// 使用 marked.lexer 分词
return marked.lexer(safeMarkdown);