Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ import { describe, expect, it } from 'vitest';
import { buildReportHtml } from './report-html-template';

describe('buildReportHtml', () => {
it('recognizes common ECharts fence language aliases', () => {
const html = buildReportHtml('```javascript\n{"series":[]}\n```');

expect(html).toContain("'echarts', 'json', 'javascript', 'js'");
expect(html).toContain('toLowerCase()');
});

it('reserves separate space for chart titles and legends', () => {
const html = buildReportHtml('```echarts\n{"title":{"text":"趋势"},"legend":{},"series":[]}\n```');

Expand Down
5 changes: 3 additions & 2 deletions data-agent-frontend-nuxt/app/utils/report-html-template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,12 @@ window.onload = function() {
var rawText = rawDiv.innerText;
var renderer = new marked.Renderer();
renderer.code = function(code, language) {
if (language === 'echarts' || language === 'json') {
var normalizedLanguage = (language || '').trim().toLowerCase();
if (['echarts', 'json', 'javascript', 'js'].includes(normalizedLanguage)) {
var id = 'chart_' + Math.random().toString(36).substr(2, 9);
return '<div id="' + id + '" class="chart-box" data-option="' + encodeURIComponent(code) + '"></div>';
}
return '<pre><code class="language-' + language + '">' + code.replace(/</g, '&lt;').replace(/>/g, '&gt;') + '</code></pre>';
return '<pre><code class="language-' + normalizedLanguage + '">' + code.replace(/</g, '&lt;').replace(/>/g, '&gt;') + '</code></pre>';
};
document.getElementById('render-target').innerHTML = marked.parse(rawText, { renderer: renderer });
if (typeof echarts !== 'undefined') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,13 @@ function normalizeChartLayout(option) {
const renderer = new marked.Renderer();

renderer.code = function(code, language) {
if (language === 'echarts' || language === 'json') {
const normalizedLanguage = (language || '').trim().toLowerCase();
if (['echarts', 'json', 'javascript', 'js'].includes(normalizedLanguage)) {
const id = 'chart_' + Math.random().toString(36).substr(2, 9);
// 使用 encodeURIComponent 保存原始代码串
return '<div id="' + id + '" class="chart-box" data-option="' + encodeURIComponent(code) + '"></div>';
}
return '<pre><code class="language-' + language + '">' + code + '</code></pre>';
return '<pre><code class="language-' + normalizedLanguage + '">' + code + '</code></pre>';
};

document.getElementById('render-target').innerHTML = marked.parse(rawText, { renderer: renderer });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ void testGetFooter_containsScript() {
assertTrue(footer.contains("echarts"));
}

@Test
void testGetFooter_recognizesCommonEchartsFenceLanguages() {
ReportTemplateUtil footerUtil = new ReportTemplateUtil(dataAgentProperties);
String footer = footerUtil.getFooter();
assertTrue(footer.contains("'javascript'"));
assertTrue(footer.contains("'js'"));
assertTrue(footer.contains("toLowerCase()"));
}

@Test
void testGetFooter_preventsDefaultTitleLegendOverlap() {
ReportTemplateUtil footerUtil = new ReportTemplateUtil(dataAgentProperties);
Expand Down
Loading