fix: protect editor content and harden document exports

Protect pending edits on window close, keep save-as paths and drafts consistent,
copy relative image resources, reject oversized table imports without truncation,
and preserve independent preview scrolling during refresh.

Archive rendered MHTML resources with portable references and embedded local
fonts. Preserve existing outputs on export cancellation or failure. Convert
editor match positions and filter directory results in linear passes.

Include the previously completed editor image/table/history improvements,
undoable replacement, export snapshots, shared page settings, and cancellable
PDF/Word export workflow. Update documentation and version to 0.3.1.

Validation: 142 pytest cases passed; GUI smoke, improvements integration, and
offline MHTML/scroll reliability smoke checks passed.
This commit is contained in:
2026-10-29 18:22:42 +08:00
parent fac5cbb011
commit 8dae91c2ca
26 changed files with 2722 additions and 385 deletions
+45 -8
View File
@@ -10,15 +10,20 @@ from PySide6.QtCore import QMarginsF
from PySide6.QtGui import QPageLayout, QPageSize
from PySide6.QtWidgets import (
QDialog,
QCheckBox,
QComboBox,
QDialogButtonBox,
QDoubleSpinBox,
QFormLayout,
QLabel,
QLineEdit,
QSpinBox,
QVBoxLayout,
QWidget,
)
from .markdown_utils import Heading
from .export_settings import PageSettings
PDF_BODY_MARKER = "MDHELPER_PDF_BODY_START_7A61"
@@ -33,23 +38,24 @@ class PdfMargins:
right: float = 15.0
def build_pdf_page_layout(margins: PdfMargins | None = None) -> QPageLayout:
def build_pdf_page_layout(margins: PdfMargins | PageSettings | None = None) -> QPageLayout:
selected = margins or PdfMargins()
return QPageLayout(
QPageSize(QPageSize.PageSizeId.A4),
QPageLayout.Orientation.Portrait,
QPageSize(getattr(QPageSize.PageSizeId, getattr(selected, "paper", "A4"))),
QPageLayout.Orientation.Landscape if getattr(selected, "landscape", False) else QPageLayout.Orientation.Portrait,
QMarginsF(selected.left, selected.top, selected.right, selected.bottom),
QPageLayout.Unit.Millimeter,
)
class PdfExportSettingsDialog(QDialog):
def __init__(self, margins: PdfMargins, parent: QWidget | None = None) -> None:
def __init__(self, margins: PdfMargins | PageSettings, parent: QWidget | None = None) -> None:
super().__init__(parent)
self.setWindowTitle("PDF 导出设置")
self.setWindowTitle("导出页面设置(PDF / Word)")
self.setModal(True)
self.setMinimumWidth(480)
note = QLabel("纸张:A4;导出背景:白色;正文前自动生成带页码目录。")
note = QLabel("PDF 与 Word 共用这些设置。Word 目录页码由 Word 更新域后生成。\n启用页眉或页脚时,相应页边距至少为 12 mm,以免遮挡正文。")
note.setWordWrap(True)
self.top_spin = self._margin_spin(margins.top)
@@ -58,10 +64,24 @@ class PdfExportSettingsDialog(QDialog):
self.right_spin = self._margin_spin(margins.right)
form = QFormLayout()
defaults = margins if isinstance(margins, PageSettings) else PageSettings()
self.paper_combo = QComboBox(); self.paper_combo.addItems(["A4", "A3", "Letter"])
self.paper_combo.setCurrentText(defaults.paper)
self.landscape_check = QCheckBox("横向"); self.landscape_check.setChecked(defaults.landscape)
self.toc_check = QCheckBox("在正文前生成目录"); self.toc_check.setChecked(defaults.include_toc)
self.depth_spin = QSpinBox(); self.depth_spin.setRange(1, 6); self.depth_spin.setValue(defaults.toc_depth)
self.depth_spin.setEnabled(defaults.include_toc); self.toc_check.toggled.connect(self.depth_spin.setEnabled)
self.header_edit = QLineEdit(defaults.header); self.header_edit.setMaxLength(100)
self.footer_edit = QLineEdit(defaults.footer); self.footer_edit.setMaxLength(100)
self.numbers_check = QCheckBox("显示页码和总页数"); self.numbers_check.setChecked(defaults.page_numbers)
form.addRow("纸张", self.paper_combo); form.addRow("方向", self.landscape_check)
form.addRow("上边距", self.top_spin)
form.addRow("下边距", self.bottom_spin)
form.addRow("左边距", self.left_spin)
form.addRow("右边距", self.right_spin)
form.addRow("目录", self.toc_check); form.addRow("目录层级", self.depth_spin)
form.addRow("页眉", self.header_edit); form.addRow("页脚", self.footer_edit)
form.addRow("页码", self.numbers_check)
buttons = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel)
buttons.accepted.connect(self.accept)
@@ -80,6 +100,14 @@ class PdfExportSettingsDialog(QDialog):
right=float(self.right_spin.value()),
)
def page_settings(self) -> PageSettings:
margins = self.margins()
return PageSettings(paper=self.paper_combo.currentText(), landscape=self.landscape_check.isChecked(),
top=margins.top, bottom=margins.bottom, left=margins.left, right=margins.right,
include_toc=self.toc_check.isChecked(), toc_depth=self.depth_spin.value(),
header=self.header_edit.text(), footer=self.footer_edit.text(),
page_numbers=self.numbers_check.isChecked()).normalized()
def _margin_spin(self, value: float) -> QDoubleSpinBox:
spin = QDoubleSpinBox()
spin.setRange(0.0, 50.0)
@@ -96,11 +124,17 @@ def build_pdf_export_html(
page_numbers: dict[int, int] | None = None,
*,
include_page_markers: bool = True,
settings: PageSettings | None = None,
) -> str:
printable_headings = [heading for heading in headings if heading.level <= 3]
selected = settings or PageSettings()
# Export uses light paper independently of the application's reading theme.
html_document = html_document.replace('data-theme="dark"', 'data-theme="light"', 1)
printable_headings = [heading for heading in headings if heading.level <= selected.toc_depth] if selected.include_toc else []
marked_document = _insert_heading_markers(html_document, printable_headings) if include_page_markers else html_document
toc_html = _toc_html(printable_headings, page_numbers or {})
toc_html = _toc_html(printable_headings, page_numbers or {}) if selected.include_toc else ""
print_css = _print_css(len(printable_headings))
usable_height = max(20, selected.size_mm()[1] - selected.top - selected.bottom - 2)
print_css += f"\n@media print {{ html {{ color-scheme: light !important; }} .reader img {{ max-height: {usable_height:g}mm; object-fit: contain; }} }}\n"
marked_document = marked_document.replace("</style>", f"{print_css}\n </style>", 1)
body_class = ' class="pdf-export"'
@@ -277,6 +311,9 @@ def _print_css(heading_count: int) -> str:
}}
.pdf-toc__item--level-2 {{ padding-left: 5mm; }}
.pdf-toc__item--level-3 {{ padding-left: 10mm; }}
.pdf-toc__item--level-4 {{ padding-left: 15mm; }}
.pdf-toc__item--level-5 {{ padding-left: 20mm; }}
.pdf-toc__item--level-6 {{ padding-left: 25mm; }}
.pdf-toc__text {{ max-width: 78%; }}
.pdf-toc__dots {{
min-width: 8mm;