Complete phase two benchmarks, plot previews and static export workflow

2026-09-07 02:54:52 +08:00
parent 95095197df
commit 89df10bc4e
59 changed files with 2535 additions and 83 deletions
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { useEditorStore } from '@/stores/editor'
 import { useWorkspaceStore } from '@/stores/workspace'
+import ExportDialog from './ExportDialog.vue'
 import { computed, ref } from 'vue'
 import ActionDialog from '@/components/common/ActionDialog.vue'
 import { useActionDialog } from '@/composables/useActionDialog'
@@ -10,6 +11,7 @@ const editorStore = useEditorStore()
 const workspaceStore = useWorkspaceStore()
 const { actionDialog, resolveAction, askConfirm } = useActionDialog()
 const reloadError = ref('')
+const exportOpen = ref(false)
 const needsRecovery = computed(() => ['conflict', 'external_changed'].includes(editorStore.saveStatus))
 const missingFile = computed(() => needsRecovery.value && editorStore.currentFilePath === workspaceStore.activeFilePath && !workspaceStore.activeFile && !workspaceStore.treeRefreshError)
 function downloadCopy() {
@@ -43,9 +45,11 @@ const statusText = computed<Record<string, string>>(() => ({

 <template>
  <header class="editor-header">
+    <ExportDialog v-if="exportOpen" @close="exportOpen = false" />
    <ActionDialog v-if="actionDialog" v-bind="actionDialog" @resolve="resolveAction" />
    <div class="file-identity"><strong>{{ workspaceStore.activeFile?.name ?? t('未命名笔记', 'Untitled note') }}</strong><small>{{ workspaceStore.activeFilePath }}</small></div>
    <div class="editor-actions">
+      <button class="button-secondary" @click="exportOpen = true">{{ t('导出', 'Export') }}</button>
      <span class="save-status" :class="editorStore.saveStatus">{{ statusText[editorStore.saveStatus] }}</span>
      <button v-if="needsRecovery && !missingFile" class="button-secondary" @click="reload">{{ t('重新加载外部版本', 'Reload external version') }}</button>
      <span v-if="missingFile" class="save-status conflict">{{ t('原文件已删除或移动', 'Original file deleted or moved') }}</span>
@@ -0,0 +1,56 @@
+<script setup lang="ts">
+import { ref, onMounted, onBeforeUnmount } from 'vue'
+import AppDialog from '@/components/common/AppDialog.vue'
+import { useEditorStore } from '@/stores/editor'
+import { useThemeStore } from '@/stores/theme'
+import { exportService, type ExportFormat, type ExportJob } from '@/services/exportService'
+const emit = defineEmits<{ close: [] }>()
+const editor = useEditorStore(), theme = useThemeStore()
+const format = ref<ExportFormat>('html'), page = ref('A4'), title = ref(true)
+const jobs = ref<ExportJob[]>([]), error = ref(''), preparing = ref(false)
+let timer: ReturnType<typeof setTimeout> | undefined, disposed = false
+let controller: AbortController | undefined
+const labels = { queued: '排队中', running: '渲染中', completed: '已完成', failed: '失败', cancelled: '已取消' }
+async function refresh() {
+  try { const value = await exportService.list(); if (!disposed) jobs.value = value } catch (e) { error.value = String(e) }
+  if (!disposed) timer = setTimeout(refresh, 1500)
+}
+async function start() {
+  preparing.value = true; error.value = ''; controller = new AbortController()
+  const snapshot = editor.content, name = editor.currentFilePath?.split('/').pop()?.replace(/\.md$/i, '') ?? '笔记'
+  try {
+    const job = await exportService.create(snapshot, name, format.value, { theme_id: theme.currentThemeId, include_title: title.value, page_size: page.value }, controller.signal, editor.currentFilePath ?? undefined)
+    if (!disposed) jobs.value.unshift(job)
+  } catch (e) { error.value = controller.signal.aborted ? '已取消图表准备' : String(e) }
+  finally { preparing.value = false }
+}
+async function action(job: ExportJob, download = false) {
+  try { if (download) await exportService.download(job); else await exportService.cancel(job.id) } catch (e) { error.value = String(e) }
+}
+onMounted(refresh)
+onBeforeUnmount(() => { disposed = true; clearTimeout(timer); controller?.abort() })
+</script>
+<template>
+  <AppDialog label="导出笔记" @close="emit('close')"><section class="modal export-modal">
+    <h2>导出笔记</h2><p>导出点击时的编辑器快照，包含未保存修改。关闭窗口后后台任务继续运行。</p>
+    <label for="export-format">格式</label><select id="export-format" v-model="format"><option value="html">HTML</option><option value="pdf">PDF</option><option value="docx">DOCX</option></select>
+    <label>纸张 <select v-model="page"><option>A4</option><option>Letter</option></select></label>
+    <label><input v-model="title" type="checkbox">包含标题</label>
+    <p v-if="format !== 'html'">PDF / DOCX 使用浅色打印样式。</p>
+    <button class="button-primary" :disabled="preparing || !editor.content.trim()" @click="start">{{ preparing ? '准备图表…' : '开始导出' }}</button>
+    <button v-if="preparing" @click="controller?.abort()">取消准备</button>
+    <p v-if="error" role="alert">{{ error }}</p>
+    <ul><li v-for="job in jobs" :key="job.id">
+      <strong>{{ job.fileName ?? job.id }}</strong> · {{ labels[job.status] }}
+      <button v-if="job.status === 'completed'" @click="action(job, true)">下载</button>
+      <button v-if="['queued','running'].includes(job.status)" @click="action(job)">取消</button>
+      <p v-if="job.error" role="alert">{{ job.error }}</p>
+      <ul v-if="job.warnings.length" class="export-warnings" aria-label="导出警告"><li v-for="warning in job.warnings" :key="warning">{{ warning }}</li></ul>
+    </li></ul>
+    <button class="button-secondary" @click="emit('close')">关闭</button>
+  </section></AppDialog>
+</template>
+<style scoped>
+.export-modal { width: min(640px, 100%); padding: 24px; background: var(--color-surface-primary); border: 1px solid var(--color-border-default); border-radius: 12px; }
+label { display: inline-flex; align-items:center; gap: 8px; margin: 8px; } li { margin-block: 12px; overflow-wrap: anywhere; } button { margin: 6px; } .export-warnings { color: var(--color-warning); } [role=alert] { color:var(--color-error); }
+</style>
@@ -156,20 +156,20 @@ function foldHeadings(action: 'toggle' | 'all' | 'none') {
    }
  })
 }
-const diagramPreviews = new Map<string, { source: string; apply: (value: HTMLElement) => void }>()
-function renderDiagram(source: string, apply: (value: HTMLElement) => void) {
+const diagramPreviews = new Map<string, { source: string; kind: string; apply: (value: HTMLElement) => void }>()
+function renderDiagram(source: string, apply: (value: HTMLElement) => void, kind = 'mermaid') {
  for (const [id, entry] of diagramPreviews) {
    if (entry.apply === apply) diagramPreviews.delete(id)
  }
-  const element = createMermaidPreview(source, themeStore.isDark, apply)
-  diagramPreviews.set(element.dataset.previewId!, { source, apply })
+  const element = createMermaidPreview(source, themeStore.isDark, apply, kind, themeStore.currentThemeId)
+  diagramPreviews.set(element.dataset.previewId!, { source, apply, kind })
  return element
 }
 watch(() => themeStore.currentThemeId, () => {
  const current = [...diagramPreviews.entries()]
  diagramPreviews.clear()
  for (const [id, entry] of current) {
-    if (editorRoot.value?.querySelector(`[id="${id}"]`)) entry.apply(renderDiagram(entry.source, entry.apply))
+    if (editorRoot.value?.querySelector(`[id="${id}"]`)) entry.apply(renderDiagram(entry.source, entry.apply, entry.kind))
  }
 }, { flush: 'post' })

@@ -333,8 +333,8 @@ onMounted(async () => {
    ...config,
    languages: shikiLanguages(themeStore.resolvedCodeBlockTheme),
    renderLanguage: renderCodeLanguage,
-    renderPreview: (language, content, applyPreview) => language.trim().toLowerCase() === 'mermaid'
-      ? markdownPreferences.diagrams ? renderDiagram(content, applyPreview) : null
+    renderPreview: (language, content, applyPreview) => ['mermaid', 'function-plot'].includes(language.trim().toLowerCase())
+      ? markdownPreferences.diagrams ? renderDiagram(content, applyPreview, language.trim().toLowerCase()) : null
      : config.renderPreview(language, content, applyPreview),
    extensions: [basicSetup, keymap.of([indentWithTab]), shikiEditorTheme(themeStore.resolvedCodeBlockTheme),
      indentUnit.of(' '.repeat(markdownPreferences.indent)), CodeEditorState.tabSize.of(markdownPreferences.indent),
@@ -1,17 +1,18 @@
+import { renderFunctionPlot } from '@/services/functionPlotService'
 import { nextTick } from 'vue'
 import { renderMermaid } from '@/services/mermaidService'
 import { t } from '@/i18n'
 import { appendDiagramControls } from '@/utils/diagramControls'

 let previewId = 0
-export function createMermaidPreview(source: string, dark: boolean, applyPreview: (value: HTMLElement) => void): HTMLElement {
+export function createMermaidPreview(source: string, dark: boolean, applyPreview: (value: HTMLElement) => void, kind = 'mermaid', themeId = 'light'): HTMLElement {
  // Each revision owns its element, so a slow render cannot replace newer content.
  // Milkdown sanitizes Element input to its inner HTML; retain the revision
  // marker and controls inside an otherwise disposable envelope.
  const envelope = document.createElement('div')
  const container = document.createElement('div')
  envelope.append(container)
-  container.className = 'editor-mermaid-preview'
+  container.className = 'editor-mermaid-preview' + (kind === 'function-plot' ? ' function-plot-preview' : '')
  container.id = `editor-mermaid-preview-${++previewId}`
  envelope.dataset.previewId = container.id
  container.setAttribute('aria-live', 'polite')
@@ -27,8 +28,11 @@ export function createMermaidPreview(source: string, dark: boolean, applyPreview
      applyPreview(envelope.cloneNode(true) as HTMLElement)
    }
  }
-  void renderMermaid(source, { theme: dark ? 'dark' : 'light' }).then(result => {
-    if (result.warnings.length) {
+  void (kind === 'function-plot' ? new Promise<void>(resolve => setTimeout(resolve, 180)) : Promise.resolve()).then<{ svg: string; warnings: string[] }>(() => {
+    if (kind === 'function-plot' && !document.getElementById(container.id)) throw new Error('stale preview')
+    return kind === 'function-plot' ? renderFunctionPlot(source, themeId) : renderMermaid(source, { theme: dark ? 'dark' : 'light' })
+  }).then(result => {
+    if (result.warnings.length && (kind === 'mermaid' || !result.svg)) {
      container.classList.add('has-error')
      container.textContent = `${t('图表语法有误，可点击编辑修改：', 'Diagram syntax error. Choose Edit to fix:')} ${result.warnings.join('\n')}`
      void publish()
@@ -37,6 +41,7 @@ export function createMermaidPreview(source: string, dark: boolean, applyPreview
    // Mermaid runs in strict mode; Milkdown sanitizes the preview before insertion.
    container.innerHTML = result.svg
    appendDiagramControls(container)
+    if (result.warnings.length) { const warning = document.createElement('p'); warning.textContent = result.warnings.join('\n'); warning.setAttribute('role', 'status'); container.append(warning) }
    void publish()
  }).catch(() => {
    container.textContent = t('图表渲染失败，请点击编辑检查源码。', 'Unable to render diagram. Choose Edit to inspect the source.')
@@ -69,7 +69,7 @@ it('offers fenced-code aliases and retains the LaTeX selector', () => {

 it('offers every bundled Shiki language and alias', () => {
  const languages = shikiLanguages('github-light')
-  expect(languages).toHaveLength(bundledLanguagesInfo.length + 1)
+  expect(languages).toHaveLength(bundledLanguagesInfo.length + 2)
  for (const info of bundledLanguagesInfo) {
    const language = languages.find(item => item.alias.includes(info.id))!
    expect(language, info.id).toBeDefined()
@@ -60,6 +60,7 @@ export async function shikiLanguage(language: string, theme: CodeTheme): Promise

 export function shikiLanguages(theme: CodeTheme): LanguageDescription[] {
  return [
+    LanguageDescription.of({ name: 'function-plot', alias: ['Function Plot'], load: () => shikiLanguage('text', theme) }),
    ...bundledLanguagesInfo.map(info => LanguageDescription.of({
      name: info.id,
      alias: [info.name, ...(info.aliases ?? [])],