fix: upgrade marked dependency to version 17.0.5 to fix code block rendering
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
"docx-preview": "^0.3.7",
|
||||
"dompurify": "^3.2.6",
|
||||
"highlight.js": "^11.11.1",
|
||||
"marked": "^5.1.2",
|
||||
"marked": "^17.0.5",
|
||||
"mermaid": "^11.4.1",
|
||||
"pagefind": "^1.1.1",
|
||||
"papaparse": "^5.5.3",
|
||||
@@ -37,7 +37,6 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tsconfig/node22": "^22.0.1",
|
||||
"@types/marked": "^5.0.2",
|
||||
"@types/node": "^22.14.0",
|
||||
"@vitejs/plugin-vue": "6.0.0",
|
||||
"@vitejs/plugin-vue-jsx": "5.0.1",
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
// @ts-nocheck
|
||||
<script setup lang="ts">
|
||||
import { marked } from "marked";
|
||||
import type { Tokens } from 'marked';
|
||||
import hljs from "highlight.js";
|
||||
import "highlight.js/styles/github.css";
|
||||
import mermaid from "mermaid";
|
||||
@@ -49,8 +50,6 @@ const props = defineProps(["visible", "details", "knowledgeType", "sourceInfo"])
|
||||
const emit = defineEmits(["closeDoc", "getDoc", "questionDeleted"]);
|
||||
|
||||
marked.use({
|
||||
mangle: false,
|
||||
headerIds: false,
|
||||
breaks: true, // 启用单行换行转 <br>
|
||||
gfm: true, // 启用 GitHub Flavored Markdown
|
||||
});
|
||||
@@ -173,7 +172,7 @@ const checkImage = (url) => {
|
||||
img.src = url;
|
||||
});
|
||||
};
|
||||
renderer.image = function (href, title, text) {
|
||||
renderer.image = function ({href, title, text}: Tokens.Image) {
|
||||
// 安全地处理图片链接
|
||||
if (!isValidImageURL(href)) {
|
||||
return `<p>${t('error.invalidImageLink')}</p>`;
|
||||
@@ -188,28 +187,26 @@ renderer.image = function (href, title, text) {
|
||||
};
|
||||
|
||||
// 自定义代码块渲染器,只显示语言标签
|
||||
renderer.code = function (code, infostring) {
|
||||
const lang = (infostring || '').trim();
|
||||
|
||||
renderer.code = function ({text, lang}: Tokens.Code) {
|
||||
// Mermaid 图表处理
|
||||
if (lang === 'mermaid') {
|
||||
// 生成唯一ID
|
||||
const id = `mermaid-${++mermaidRenderCount}`;
|
||||
// 返回带有 mermaid 类的 div,后续由 mermaid.run() 处理
|
||||
return `<div class="mermaid" id="${id}">${code}</div>`;
|
||||
return `<div class="mermaid" id="${id}">${text}</div>`;
|
||||
}
|
||||
|
||||
let detectedLang = lang;
|
||||
let highlighted = '';
|
||||
if (lang && hljs.getLanguage(lang)) {
|
||||
try {
|
||||
highlighted = hljs.highlight(code, { language: lang }).value;
|
||||
highlighted = hljs.highlight(text, { language: lang }).value;
|
||||
} catch (e) {
|
||||
highlighted = hljs.highlightAuto(code).value;
|
||||
detectedLang = hljs.highlightAuto(code).language || lang;
|
||||
highlighted = hljs.highlightAuto(text).value;
|
||||
detectedLang = hljs.highlightAuto(text).language || lang;
|
||||
}
|
||||
} else {
|
||||
const auto = hljs.highlightAuto(code);
|
||||
const auto = hljs.highlightAuto(text);
|
||||
highlighted = auto.value;
|
||||
detectedLang = auto.language || lang;
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import { MessagePlugin } from 'tdesign-vue-next';
|
||||
import hljs from 'highlight.js';
|
||||
import 'highlight.js/styles/github.css';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import type {Tokens} from 'marked';
|
||||
|
||||
const VueOfficePptx = defineAsyncComponent(() => import('@vue-office/pptx'));
|
||||
|
||||
@@ -196,14 +197,13 @@ async function renderMarkdown(blob: Blob) {
|
||||
gfm: true,
|
||||
});
|
||||
const renderer = new marked.Renderer();
|
||||
renderer.code = function (code, infostring) {
|
||||
const lang = (infostring || '').trim();
|
||||
renderer.code = function ({lang, text}: Tokens.Code) {
|
||||
let highlighted = '';
|
||||
if (lang && hljs.getLanguage(lang)) {
|
||||
try { highlighted = hljs.highlight(code, { language: lang }).value; }
|
||||
catch { highlighted = hljs.highlightAuto(code).value; }
|
||||
try { highlighted = hljs.highlight(text, { language: lang }).value; }
|
||||
catch { highlighted = hljs.highlightAuto(text).value; }
|
||||
} else {
|
||||
highlighted = hljs.highlightAuto(code).value;
|
||||
highlighted = hljs.highlightAuto(text).value;
|
||||
}
|
||||
return `<pre><code class="hljs">${highlighted}</code></pre>`;
|
||||
};
|
||||
|
||||
@@ -377,10 +377,7 @@ const toggleEditorView = () => {
|
||||
activeTab.value = isPreviewMode.value ? 'edit' : 'preview'
|
||||
}
|
||||
|
||||
marked.use({
|
||||
mangle: false,
|
||||
headerIds: false,
|
||||
})
|
||||
marked.use({})
|
||||
|
||||
const previewHTML = computed(() => {
|
||||
if (!form.content) {
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
import mermaid from 'mermaid';
|
||||
import 'marked';
|
||||
import type {Tokens} from "marked";
|
||||
|
||||
let mermaidInitialized = false;
|
||||
|
||||
@@ -36,18 +38,18 @@ export const ensureMermaidInitialized = () => {
|
||||
mermaidInitialized = true;
|
||||
};
|
||||
|
||||
|
||||
export const createMermaidCodeRenderer = (idPrefix: string) => {
|
||||
let mermaidCount = 0;
|
||||
|
||||
return (code: string, infostring?: string) => {
|
||||
const lang = (infostring || '').trim();
|
||||
return ({lang, text}: Tokens.Code) => {
|
||||
if (lang === 'mermaid') {
|
||||
const id = `${idPrefix}-${++mermaidCount}`;
|
||||
return `<div class="mermaid" id="${id}">${code}</div>`;
|
||||
return `<div class="mermaid" id="${id}">${text}</div>`;
|
||||
}
|
||||
|
||||
const displayLang = lang || 'Code';
|
||||
const escapedCode = code
|
||||
const escapedCode = text
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>');
|
||||
|
||||
@@ -136,7 +136,7 @@ const closePreImg = () => {
|
||||
// 创建自定义渲染器实例
|
||||
const customRenderer = new marked.Renderer();
|
||||
// 覆盖图片渲染方法
|
||||
customRenderer.image = function(href, title, text) {
|
||||
customRenderer.image = function({href, title, text}) {
|
||||
// 验证图片 URL 是否安全
|
||||
if (!isValidImageURL(href)) {
|
||||
return `<p>${t('error.invalidImageLink')}</p>`;
|
||||
|
||||
Reference in New Issue
Block a user