'commit'

2026-01-21 08:41:47 +08:00
parent 306a3a4127
commit e51dc18d06
40 changed files with 1309 additions and 965 deletions
--- a/static/js/query.js
+++ b/static/js/query.js
@@ -168,34 +168,104 @@ createApp({

        // Configure Marked
        if (typeof marked !== 'undefined') {
-            marked.use({
-                gfm: true,
-                breaks: true,
-                renderer: {
-                    code(code, language) {
-                        if (language === 'echarts') {
-                            const id = 'chart-' + Math.random().toString(36).substr(2, 9);
-                            return `<div class="echarts-container" id="${id}" style="width: 100%; height: 400px; margin: 20px 0; background: rgba(30, 41, 59, 0.5); border: 1px solid rgba(148, 163, 184, 0.1); border-radius: 12px; padding: 20px;" data-config="${encodeURIComponent(code)}"></div>`;
-                        }
-                        return false; 
-                    }
+            const renderer = new marked.Renderer();
+            const oldCode = renderer.code.bind(renderer);
+            renderer.code = function(code, language) {
+                if (language === 'echarts') {
+                    const id = 'chart-' + Math.random().toString(36).substr(2, 9);
+                    return `<div class="echarts-container" id="${id}" style="width: 100%; height: 400px; margin: 20px 0; background: rgba(30, 41, 59, 0.5); border: 1px solid rgba(148, 163, 184, 0.1); border-radius: 12px; padding: 20px;" data-config="${encodeURIComponent(code)}"></div>`;
                }
+                return oldCode(code, language);
+            };
+            marked.setOptions({
+                renderer: renderer,
+                gfm: true,
+                breaks: true
            });
        }

-        const renderedResult = computed(() => {
-            if (!queryResult.value) return '';
-            try {
-                // Remove escapes that might break markdown
-                const cleanText = queryResult.value.replace(/\\([\*_`#\[\]\(\)!>-])/g, '$1');
-                if (typeof marked !== 'undefined') {
-                    return marked.parse(cleanText);
+        // 降级用的简易 Markdown 解析器
+        const simpleMarkdown = (text) => {
+            if (!text) return '';
+            let lines = text.split('\n');
+            let html = '';
+            let inList = false;
+            const parseInline = (str) => {
+                return str
+                    .replace(/\*\*(.*?)\*\*/g, '<strong>$1</strong>')
+                    .replace(/`(.*?)`/g, '<code style="background:rgba(148, 163, 184, 0.1); padding:2px 4px; border-radius:4px;">$1</code>');
+            };
+            for (let line of lines) {
+                let trimmed = line.trim();
+                if (!trimmed) {
+                    if (inList) { html += '</ul>'; inList = false; }
+                    html += '<br>';
+                    continue;
+                }
+                if (trimmed.startsWith('### ')) {
+                    if (inList) { html += '</ul>'; inList = false; }
+                    html += `<h3>${parseInline(trimmed.substring(4))}</h3>`;
+                } else if (trimmed.startsWith('- ') || /^\d+\./.test(trimmed)) {
+                    if (!inList) { html += '<ul>'; inList = true; }
+                    let content = trimmed.replace(/^(- |\d+\. )/, '');
+                    html += `<li>${parseInline(content)}</li>`;
+                } else {
+                    if (inList) { html += '</ul>'; inList = false; }
+                    html += `<p>${parseInline(trimmed)}</p>`;
                }
-                return cleanText;
-            } catch (e) {
-                console.error('Markdown parsing error:', e);
-                return queryResult.value;
            }
+            if (inList) html += '</ul>';
+            return html;
+        };
+
+        // 增强的 Markdown & LaTeX 解析器
+        const renderMarkdownAndLatex = (text) => {
+            if (!text) return '';
+            
+            try {
+                // 1. 处理 LaTeX (简单替换，先处理 $$ 再处理 $)
+                let processedText = text;
+                
+                // 处理块级 LaTeX: $$ ... $$
+                processedText = processedText.replace(/\$\$\s*([\s\S]*?)\s*\$\$/g, (match, formula) => {
+                    try {
+                        if (typeof katex !== 'undefined') {
+                            return '<div class="katex-block">' + katex.renderToString(formula, { displayMode: true, throwOnError: false }) + '</div>';
+                        }
+                        return match;
+                    } catch (e) {
+                        return match;
+                    }
+                });
+                
+                // 处理行内 LaTeX: $ ... $
+                processedText = processedText.replace(/\$([^\$\n]+?)\$/g, (match, formula) => {
+                    try {
+                        if (typeof katex !== 'undefined') {
+                            return katex.renderToString(formula, { displayMode: false, throwOnError: false });
+                        }
+                        return match;
+                    } catch (e) {
+                        return match;
+                    }
+                });
+
+                // 2. 使用 marked 解析 Markdown
+                if (typeof marked !== 'undefined') {
+                    // 直接解析处理后的文本，marked 会处理 Markdown 转义
+                    return marked.parse(processedText);
+                } else {
+                    // 降级使用之前的 simpleMarkdown
+                    return simpleMarkdown(processedText);
+                }
+            } catch (e) {
+                console.error('Markdown/LaTeX rendering error:', e);
+                return text;
+            }
+        };
+
+        const renderedResult = computed(() => {
+            return renderMarkdownAndLatex(queryResult.value);
        });

        watch(queryResult, () => {