Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:sparkles: Support document layout editing in fullscreen mind maps https://github.com/siyuan-note/siyuan/issues/20694

Daniel982404cbfa90
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.json
index d5dc725b13..69cf2e928f 100644
--- a/app/appearance/langs/ar.json
+++ b/app/appearance/langs/ar.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "تخطيط المستند",
"fullCheckSnapshot": "فحص المحتوى بالكامل",
"fullCheckSnapshotTip": "قراءة جميع الملفات المحلية لاكتشاف تغييرات المحتوى حتى مع ثبات الحجم ووقت التعديل، وإنشاء لقطة عند الحاجة؛ لن تُنزّل الموارد لهذا الفحص، وقد تستغرق مساحات العمل الكبيرة وقتًا أطول",
- "listMindmapDocumentViewport": "نافذة عرض المستند",
"listMindmapNodeColor": "لون العقدة",
"listMindmapPaletteWaves": "أمواج",
"listMindmapPaletteDream": "حلم",
diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.json
index bd71fb7c25..e3d1d7ff00 100644
--- a/app/appearance/langs/de.json
+++ b/app/appearance/langs/de.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Dokumentlayout",
"fullCheckSnapshot": "Vollständige Inhaltsprüfung",
"fullCheckSnapshotTip": "Alle lokalen Dateien lesen, um Inhaltsänderungen auch bei unveränderter Größe und Änderungszeit zu erkennen und bei Bedarf einen Schnappschuss zu erstellen; Ressourcen werden dafür nicht heruntergeladen, große Arbeitsbereiche können mehr Zeit benötigen",
- "listMindmapDocumentViewport": "Dokumentausschnitt",
"listMindmapNodeColor": "Knotenfarbe",
"listMindmapPaletteWaves": "Wellen",
"listMindmapPaletteDream": "Traum",
diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.json
index f39956e656..4066980482 100644
--- a/app/appearance/langs/en.json
+++ b/app/appearance/langs/en.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Document layout",
"fullCheckSnapshot": "Full content check",
"fullCheckSnapshotTip": "Read all local files to detect content changes even when size and modification time are unchanged, and create a snapshot if needed; resources are not downloaded for this check, and large workspaces may take longer",
- "listMindmapDocumentViewport": "Document viewport",
"listMindmapNodeColor": "Node color",
"listMindmapPaletteWaves": "Waves",
"listMindmapPaletteDream": "Dream",
diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.json
index 8f1771a4c7..1aa8c13aff 100644
--- a/app/appearance/langs/es.json
+++ b/app/appearance/langs/es.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Diseño del documento",
"fullCheckSnapshot": "Comprobación completa del contenido",
"fullCheckSnapshotTip": "Leer todos los archivos locales para detectar cambios de contenido aunque no cambien el tamaño ni la fecha de modificación, y crear una instantánea si es necesario; no se descargan recursos para esta comprobación y los espacios de trabajo grandes pueden tardar más",
- "listMindmapDocumentViewport": "Área visible del documento",
"listMindmapNodeColor": "Color del nodo",
"listMindmapPaletteWaves": "Olas",
"listMindmapPaletteDream": "Sueño",
diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.json
index 2f50c2e7d4..a3cff138ed 100644
--- a/app/appearance/langs/fr.json
+++ b/app/appearance/langs/fr.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Disposition du document",
"fullCheckSnapshot": "Vérification complète du contenu",
"fullCheckSnapshotTip": "Lire tous les fichiers locaux pour détecter les changements de contenu même si leur taille et leur date de modification restent identiques, puis créer un instantané si nécessaire ; aucune ressource n’est téléchargée pour cette vérification et les grands espaces de travail peuvent demander plus de temps",
- "listMindmapDocumentViewport": "Zone visible du document",
"listMindmapNodeColor": "Couleur du nœud",
"listMindmapPaletteWaves": "Vagues",
"listMindmapPaletteDream": "Rêve",
diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.json
index c17d3bb61b..1c21a08e2d 100644
--- a/app/appearance/langs/he.json
+++ b/app/appearance/langs/he.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "פריסת המסמך",
"fullCheckSnapshot": "בדיקת תוכן מלאה",
"fullCheckSnapshotTip": "קריאת כל הקבצים המקומיים לזיהוי שינויי תוכן גם כשהגודל וזמן השינוי נשארו זהים, ויצירת תמונת מצב לפי הצורך; משאבים לא יורדו לצורך הבדיקה, וסביבות עבודה גדולות עשויות לדרוש זמן רב יותר",
- "listMindmapDocumentViewport": "אזור התצוגה של המסמך",
"listMindmapNodeColor": "צבע הצומת",
"listMindmapPaletteWaves": "גלים",
"listMindmapPaletteDream": "חלום",
diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.json
index 34c0593f21..fddd1e7064 100644
--- a/app/appearance/langs/hi.json
+++ b/app/appearance/langs/hi.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "दस्तावेज़ का लेआउट",
"fullCheckSnapshot": "सामग्री की पूरी जाँच",
"fullCheckSnapshotTip": "आकार और संशोधन समय समान रहने पर भी सामग्री में बदलाव खोजने के लिए सभी स्थानीय फ़ाइलें पढ़ें और ज़रूरत होने पर स्नैपशॉट बनाएँ; इस जाँच के लिए संसाधन डाउनलोड नहीं होंगे और बड़े कार्यक्षेत्रों में अधिक समय लग सकता है",
- "listMindmapDocumentViewport": "दस्तावेज़ का दृश्य क्षेत्र",
"listMindmapNodeColor": "नोड का रंग",
"listMindmapPaletteWaves": "लहरें",
"listMindmapPaletteDream": "स्वप्न",
diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.json
index 2c8ea5a98c..73e4b55657 100644
--- a/app/appearance/langs/id.json
+++ b/app/appearance/langs/id.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Tata letak dokumen",
"fullCheckSnapshot": "Pemeriksaan isi menyeluruh",
"fullCheckSnapshotTip": "Baca semua berkas lokal untuk mendeteksi perubahan isi meskipun ukuran dan waktu modifikasi tetap sama, lalu buat snapshot jika diperlukan; sumber daya tidak diunduh untuk pemeriksaan ini dan ruang kerja besar dapat memerlukan waktu lebih lama",
- "listMindmapDocumentViewport": "Area pandang dokumen",
"listMindmapNodeColor": "Warna simpul",
"listMindmapPaletteWaves": "Ombak",
"listMindmapPaletteDream": "Mimpi",
diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.json
index 49203dc77a..624bcb03c1 100644
--- a/app/appearance/langs/it.json
+++ b/app/appearance/langs/it.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Layout del documento",
"fullCheckSnapshot": "Verifica completa del contenuto",
"fullCheckSnapshotTip": "Legge tutti i file locali per rilevare modifiche al contenuto anche se dimensioni e data di modifica restano invariate, creando un’istantanea se necessario; non vengono scaricate risorse per questa verifica e gli spazi di lavoro grandi possono richiedere più tempo",
- "listMindmapDocumentViewport": "Area visibile del documento",
"listMindmapNodeColor": "Colore del nodo",
"listMindmapPaletteWaves": "Onde",
"listMindmapPaletteDream": "Sogno",
diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.json
index dcccef12c8..37787165ac 100644
--- a/app/appearance/langs/ja.json
+++ b/app/appearance/langs/ja.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "ドキュメントのレイアウト",
"fullCheckSnapshot": "内容の完全チェック",
"fullCheckSnapshotTip": "ローカルの全ファイルを読み取り、サイズと更新日時が変わらない内容の変更も検出し、必要ならスナップショットを作成します。チェックのためのリソースのダウンロードは行わず、大きなワークスペースでは時間がかかる場合があります",
- "listMindmapDocumentViewport": "ドキュメントの表示範囲",
"listMindmapNodeColor": "ノードの色",
"listMindmapPaletteWaves": "波",
"listMindmapPaletteDream": "夢",
diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.json
index 86cb042780..5930a94319 100644
--- a/app/appearance/langs/ko.json
+++ b/app/appearance/langs/ko.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "문서 레이아웃",
"fullCheckSnapshot": "전체 내용 검사",
"fullCheckSnapshotTip": "모든 로컬 파일을 읽어 크기와 수정 시간이 같아도 내용 변경을 감지하고 필요하면 스냅샷을 만듭니다. 검사를 위해 리소스를 다운로드하지 않으며 큰 작업 공간에서는 시간이 더 걸릴 수 있습니다",
- "listMindmapDocumentViewport": "문서 보기 영역",
"listMindmapNodeColor": "노드 색상",
"listMindmapPaletteWaves": "물결",
"listMindmapPaletteDream": "꿈",
diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.json
index adf9fa1a23..d4d956cfef 100644
--- a/app/appearance/langs/nl.json
+++ b/app/appearance/langs/nl.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Documentindeling",
"fullCheckSnapshot": "Volledige inhoudscontrole",
"fullCheckSnapshotTip": "Lees alle lokale bestanden om inhoudswijzigingen te vinden, ook als grootte en wijzigingstijd gelijk blijven, en maak zo nodig een momentopname; bronnen worden hiervoor niet gedownload en grote werkruimten kunnen meer tijd kosten",
- "listMindmapDocumentViewport": "Documentvenster",
"listMindmapNodeColor": "Knooppuntkleur",
"listMindmapPaletteWaves": "Golven",
"listMindmapPaletteDream": "Droom",
diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.json
index 1569e8936c..3894f2201d 100644
--- a/app/appearance/langs/pl.json
+++ b/app/appearance/langs/pl.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Układ dokumentu",
"fullCheckSnapshot": "Pełna kontrola zawartości",
"fullCheckSnapshotTip": "Odczytaj wszystkie pliki lokalne, aby wykryć zmiany zawartości mimo niezmienionego rozmiaru i czasu modyfikacji, i w razie potrzeby utwórz migawkę; zasoby nie są pobierane na potrzeby tej kontroli, a duże obszary robocze mogą wymagać więcej czasu",
- "listMindmapDocumentViewport": "Obszar widoku dokumentu",
"listMindmapNodeColor": "Kolor węzła",
"listMindmapPaletteWaves": "Fale",
"listMindmapPaletteDream": "Sen",
diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.json
index bb9765c70e..7f56b29a33 100644
--- a/app/appearance/langs/pt-BR.json
+++ b/app/appearance/langs/pt-BR.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Layout do documento",
"fullCheckSnapshot": "Verificação completa do conteúdo",
"fullCheckSnapshotTip": "Ler todos os arquivos locais para detectar alterações no conteúdo mesmo com tamanho e data de modificação inalterados, e criar um instantâneo se necessário; recursos não são baixados para esta verificação e espaços de trabalho grandes podem demorar mais",
- "listMindmapDocumentViewport": "Área visível do documento",
"listMindmapNodeColor": "Cor do nó",
"listMindmapPaletteWaves": "Ondas",
"listMindmapPaletteDream": "Sonho",
diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.json
index eb186e7b98..3c5b1aa6ba 100644
--- a/app/appearance/langs/ru.json
+++ b/app/appearance/langs/ru.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Макет документа",
"fullCheckSnapshot": "Полная проверка содержимого",
"fullCheckSnapshotTip": "Прочитать все локальные файлы, чтобы найти изменения содержимого даже при неизменных размере и времени изменения, и при необходимости создать снимок; ресурсы для проверки не загружаются, а большие рабочие пространства могут потребовать больше времени",
- "listMindmapDocumentViewport": "Область просмотра документа",
"listMindmapNodeColor": "Цвет узла",
"listMindmapPaletteWaves": "Волны",
"listMindmapPaletteDream": "Мечта",
diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.json
index 91a7c283ce..fd8d5703cd 100644
--- a/app/appearance/langs/sk.json
+++ b/app/appearance/langs/sk.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Rozloženie dokumentu",
"fullCheckSnapshot": "Úplná kontrola obsahu",
"fullCheckSnapshotTip": "Prečítať všetky lokálne súbory na zistenie zmien obsahu aj pri nezmenenej veľkosti a čase úpravy a podľa potreby vytvoriť snímku; zdroje sa na túto kontrolu nesťahujú a veľké pracovné priestory môžu vyžadovať viac času",
- "listMindmapDocumentViewport": "Oblasť zobrazenia dokumentu",
"listMindmapNodeColor": "Farba uzla",
"listMindmapPaletteWaves": "Vlny",
"listMindmapPaletteDream": "Sen",
diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.json
index f29db7b25c..01bed930d1 100644
--- a/app/appearance/langs/sr.json
+++ b/app/appearance/langs/sr.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Распоред документа",
"fullCheckSnapshot": "Потпуна провера садржаја",
"fullCheckSnapshotTip": "Прочитајте све локалне датотеке да бисте открили промене садржаја и када су величина и време измене исти и по потреби направите снимак; ресурси се не преузимају ради ове провере, а велики радни простори могу захтевати више времена",
- "listMindmapDocumentViewport": "Област приказа документа",
"listMindmapNodeColor": "Боја чвора",
"listMindmapPaletteWaves": "Talasi",
"listMindmapPaletteDream": "San",
diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.json
index 6ffc1b552a..8d4731c38d 100644
--- a/app/appearance/langs/th.json
+++ b/app/appearance/langs/th.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "เค้าโครงเอกสาร",
"fullCheckSnapshot": "ตรวจสอบเนื้อหาทั้งหมด",
"fullCheckSnapshotTip": "อ่านไฟล์ภายในเครื่องทั้งหมดเพื่อตรวจหาการเปลี่ยนแปลงของเนื้อหา แม้ขนาดและเวลาแก้ไขจะเท่าเดิม และสร้างสแนปช็อตเมื่อจำเป็น โดยจะไม่ดาวน์โหลดทรัพยากรเพื่อการตรวจสอบนี้ และพื้นที่ทำงานขนาดใหญ่อาจใช้เวลานานขึ้น",
- "listMindmapDocumentViewport": "ขอบเขตมุมมองเอกสาร",
"listMindmapNodeColor": "สีโหนด",
"listMindmapPaletteWaves": "คลื่น",
"listMindmapPaletteDream": "ความฝัน",
diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.json
index ba1590e961..ec9b86967b 100644
--- a/app/appearance/langs/tr.json
+++ b/app/appearance/langs/tr.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Belge düzeni",
"fullCheckSnapshot": "Tam içerik denetimi",
"fullCheckSnapshotTip": "Boyut ve değiştirilme zamanı aynı kalsa bile içerik değişikliklerini bulmak için tüm yerel dosyaları okuyun ve gerekirse anlık görüntü oluşturun; bu denetim için kaynaklar indirilmez ve büyük çalışma alanlarında daha uzun sürebilir",
- "listMindmapDocumentViewport": "Belge görünüm alanı",
"listMindmapNodeColor": "Düğüm rengi",
"listMindmapPaletteWaves": "Dalgalar",
"listMindmapPaletteDream": "Rüya",
diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.json
index ffbd6ba117..fc2f9d0963 100644
--- a/app/appearance/langs/uk.json
+++ b/app/appearance/langs/uk.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "Макет документа",
"fullCheckSnapshot": "Повна перевірка вмісту",
"fullCheckSnapshotTip": "Прочитати всі локальні файли, щоб виявити зміни вмісту навіть за незмінних розміру та часу зміни, і за потреби створити знімок; ресурси для перевірки не завантажуються, а великі робочі простори можуть потребувати більше часу",
- "listMindmapDocumentViewport": "Область перегляду документа",
"listMindmapNodeColor": "Колір вузла",
"listMindmapPaletteWaves": "Хвилі",
"listMindmapPaletteDream": "Мрія",
diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.json
index 5da37d0b0b..b2c575997e 100644
--- a/app/appearance/langs/zh-CN.json
+++ b/app/appearance/langs/zh-CN.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "文档布局",
"fullCheckSnapshot": "完整校验",
"fullCheckSnapshotTip": "读取所有本地文件,检查大小和修改时间未变的内容变化,必要时创建快照;不会为校验主动下载资源,大型工作空间可能耗时较长",
- "listMindmapDocumentViewport": "文档视口",
"listMindmapNodeColor": "节点颜色",
"listMindmapPaletteWaves": "浪潮",
"listMindmapPaletteDream": "梦境",
diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.json
index 65519d41dd..07f369016f 100644
--- a/app/appearance/langs/zh-TW.json
+++ b/app/appearance/langs/zh-TW.json
@@ -1,7 +1,7 @@
{
+ "listMindmapDocumentLayout": "文件版面配置",
"fullCheckSnapshot": "完整校驗",
"fullCheckSnapshotTip": "讀取所有本機檔案,檢查大小與修改時間未變的內容變更,必要時建立快照;不會為校驗主動下載資源,大型工作空間可能耗時較長",
- "listMindmapDocumentViewport": "文件視口",
"listMindmapNodeColor": "節點顏色",
"listMindmapPaletteWaves": "浪潮",
"listMindmapPaletteDream": "夢境",
diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy
index d7586a3a78..a7f6dec062 100644
--- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy
+++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy
@@ -8,7 +8,7 @@
"title": "Formatting elements",
"title-img": "background-color:#269;background-image: linear-gradient(white 2px, transparent 2px),linear-gradient(90deg, white 2px, transparent 2px),linear-gradient(rgba(255,255,255,.3) 1px, transparent 1px),linear-gradient(90deg, rgba(255,255,255,.3) 1px, transparent 1px);background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;background-position:-2px -2px, -2px -2px, -1px -1px, -1px -1px;",
"type": "doc",
- "updated": "20261024195223"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2052,7 +2052,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20210104091509-v1x69oc",
- "updated": "20261024195223"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2168,7 +2168,7 @@
"Type": "NodeHeading",
"Properties": {
"id": "20261024161816-f51bzy4",
- "updated": "20261024194010"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2225,12 +2225,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20261019142953-4rt40w7",
- "updated": "20261024164212"
+ "updated": "20261024212002"
},
"Children": [
{
"Type": "NodeText",
- "Data": "Resizing the document canvas preserves its center and zoom. Full-screen entry keeps the zoom and centers the view when the document canvas is shorter than the full-screen viewport; otherwise it preserves the visible top edge, accounting for document scrolling."
+ "Data": "Resizing the document canvas preserves its center and zoom. Full-screen entry keeps the zoom and centers the view when the document canvas is shorter than the full-screen viewport; otherwise it preserves the visible top edge, accounting for document scrolling. By default, leaving fullscreen restores the document view and reading position saved on entry; node content edits are retained."
}
]
},
@@ -2239,7 +2239,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20261024194010-0bhyie7",
- "updated": "20261024194010"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2249,11 +2249,11 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
- "TextMarkTextContent": "Document viewport"
+ "TextMarkTextContent": "Document layout"
},
{
"Type": "NodeText",
- "Data": " to show or hide the document viewport area saved on entry. The frame follows fullscreen panning and zooming as a preview; exiting fullscreen still restores the original document view."
+ "Data": " to edit the document view. The fixed frame has the same size as the document viewport on entry. It is centered when the fullscreen viewport is taller, or aligned to the top center otherwise, and follows window resizing. Pan and zoom the map beneath the frame, then exit fullscreen with this mode still enabled to apply the framed view to the document. Click the button again to cancel the pending view change. Locking the canvas also cancels an unapplied view change."
}
]
},
diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20200825162036-4dx365o.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20200825162036-4dx365o.sy
index 7bde58cb6c..7ef417c56c 100644
--- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20200825162036-4dx365o.sy
+++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20200825162036-4dx365o.sy
@@ -8,7 +8,7 @@
"title": "排版元素",
"title-img": "background-color: hsl(2, 57%, 40%);background-image: repeating-linear-gradient(transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(270deg, transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(125deg, transparent, transparent 2px, rgba(0,0,0,.2) 2px, rgba(0,0,0,.2) 3px, transparent 3px, transparent 5px, rgba(0,0,0,.2) 5px);",
"type": "doc",
- "updated": "20261024195223"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2055,7 +2055,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20210104091228-wdpx6ev",
- "updated": "20261024195223"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2094,7 +2094,7 @@
"Type": "NodeHeading",
"Properties": {
"id": "20261024161816-k1vwtue",
- "updated": "20261024194010"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2151,12 +2151,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20261019142953-m439ybs",
- "updated": "20261024124505"
+ "updated": "20261024212002"
},
"Children": [
{
"Type": "NodeText",
- "Data": "调整文档内画布尺寸时保留中心点和缩放比例。进入全屏时保留缩放比例:文档画布低于全屏视口时居中,否则按当前可见区域的顶边对齐,并随窗口高度变化实时调整。全屏中的平移和缩放仅影响本次全屏浏览,退出后恢复进入前的文档视角和阅读位置。节点内容编辑仍正常生效。"
+ "Data": "调整文档内画布尺寸时保留中心点和缩放比例。进入全屏时保留缩放比例:文档画布低于全屏视口时居中,否则按当前可见区域的顶边对齐,并随窗口高度变化实时调整。默认情况下,全屏中的平移和缩放仅影响本次全屏浏览,退出后恢复进入前的文档视角和阅读位置。节点内容编辑仍正常生效。"
}
]
},
@@ -2165,7 +2165,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20261024194010-bf2m0k7",
- "updated": "20261024194010"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2175,11 +2175,11 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
- "TextMarkTextContent": "文档视口"
+ "TextMarkTextContent": "文档布局"
},
{
"Type": "NodeText",
- "Data": " 可显示或隐藏进入全屏前的文档视口范围。指示框随全屏平移和缩放更新,仅用于预览;退出全屏仍恢复原文档视角。"
+ "Data": " 开启布局调整。取景框与进入全屏前的文档视口等大,全屏视口更高时居中,否则按顶部中点对齐,并随窗口尺寸变化更新位置。参照固定取景框平移或缩放导图,保持此模式开启并退出全屏,即可将框内视角应用到文档;再次点击按钮关闭则取消本次视角调整。锁定画布也会取消尚未应用的视角调整。"
}
]
},
diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy
index 6481e919bd..821f605810 100644
--- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy
+++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy
@@ -8,7 +8,7 @@
"title": "排版元素",
"title-img": "background-color: hsl(2, 57%, 40%);background-image: repeating-linear-gradient(transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(270deg, transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(125deg, transparent, transparent 2px, rgba(0,0,0,.2) 2px, rgba(0,0,0,.2) 3px, transparent 3px, transparent 5px, rgba(0,0,0,.2) 5px);",
"type": "doc",
- "updated": "20261024195223"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2053,7 +2053,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20211226122008-731sqd6",
- "updated": "20261024195223"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2092,7 +2092,7 @@
"Type": "NodeHeading",
"Properties": {
"id": "20261024161816-xvhal7o",
- "updated": "20261024194010"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2149,12 +2149,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20261019142953-9ypjmtz",
- "updated": "20261024124505"
+ "updated": "20261024212002"
},
"Children": [
{
"Type": "NodeText",
- "Data": "調整文件內畫布尺寸時保留中心點和縮放比例。進入全螢幕時保留縮放比例:文件畫布低於全螢幕視口時置中,否則依目前可見區域的頂邊對齊,並隨視窗高度變化即時調整。全螢幕中的平移和縮放僅影響本次全螢幕瀏覽,離開後恢復進入前的文件視角和閱讀位置。節點內容編輯仍正常生效。"
+ "Data": "調整文件內畫布尺寸時保留中心點和縮放比例。進入全螢幕時保留縮放比例:文件畫布低於全螢幕視口時置中,否則依目前可見區域的頂邊對齊,並隨視窗高度變化即時調整。預設情況下,全螢幕中的平移和縮放僅影響本次全螢幕瀏覽,離開後恢復進入前的文件視角和閱讀位置。節點內容編輯仍正常生效。"
}
]
},
@@ -2163,7 +2163,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20261024194010-jykxx0r",
- "updated": "20261024194010"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2173,11 +2173,11 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
- "TextMarkTextContent": "文件視口"
+ "TextMarkTextContent": "文件版面配置"
},
{
"Type": "NodeText",
- "Data": " 可顯示或隱藏進入全螢幕前的文件視口範圍。指示框隨全螢幕平移和縮放更新,僅用於預覽;退出全螢幕仍恢復原文件視角。"
+ "Data": " 開啟版面配置調整。取景框與進入全螢幕前的文件視口等大,全螢幕視口較高時置中,否則依頂部中點對齊,並隨視窗尺寸變化更新位置。參照固定取景框平移或縮放導圖,保持此模式開啟並離開全螢幕,即可將框內視角套用至文件;再次點擊按鈕關閉則取消本次視角調整。鎖定畫布也會取消尚未套用的視角調整。"
}
]
},
diff --git a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-hnu6o79/20240530101000-3qhz7br.sy b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-hnu6o79/20240530101000-3qhz7br.sy
index be17d9649f..bc3d29b336 100644
--- a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-hnu6o79/20240530101000-3qhz7br.sy
+++ b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-hnu6o79/20240530101000-3qhz7br.sy
@@ -9,7 +9,7 @@
"title": "書式要素",
"title-img": "background-color:#269;background-image: linear-gradient(white 2px, transparent 2px),linear-gradient(90deg, white 2px, transparent 2px),linear-gradient(rgba(255,255,255,.3) 1px, transparent 1px),linear-gradient(90deg, rgba(255,255,255,.3) 1px, transparent 1px);background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;background-position:-2px -2px, -2px -2px, -1px -1px, -1px -1px;",
"type": "doc",
- "updated": "20261024195223"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2177,7 +2177,7 @@
"Properties": {
"ID": "20240530101000-ch5e4vh",
"id": "20240530101000-1ev7xub",
- "updated": "20261024195223"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2216,7 +2216,7 @@
"Type": "NodeHeading",
"Properties": {
"id": "20261024161816-8fr1gcz",
- "updated": "20261024194010"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2305,12 +2305,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20261019142953-j4zhvo2",
- "updated": "20261024124505"
+ "updated": "20261024212002"
},
"Children": [
{
"Type": "NodeText",
- "Data": "文書内のキャンバスをリサイズしても、中心と拡大率は維持されます。全画面表示に切り替える際も拡大率を維持し、文書内のキャンバスが全画面の表示領域より低い場合は中央に、同じ高さ以上の場合は現在見えている領域の上端に合わせます。この位置合わせはウィンドウの高さに応じて更新されます。全画面表示中の移動と拡大・縮小は一時的なもので、終了すると文書内の表示範囲とスクロール位置が切り替え前に戻ります。ノードの編集内容は引き続き反映されます。"
+ "Data": "文書内のキャンバスをリサイズしても、中心と拡大率は維持されます。全画面表示に切り替える際も拡大率を維持し、文書内のキャンバスが全画面の表示領域より低い場合は中央に、同じ高さ以上の場合は現在見えている領域の上端に合わせます。この位置合わせはウィンドウの高さに応じて更新されます。通常、全画面表示中の移動と拡大・縮小は一時的なもので、終了すると文書内の表示範囲とスクロール位置が切り替え前に戻ります。ノードの編集内容は引き続き反映されます。"
}
]
},
@@ -2319,7 +2319,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20261024194010-7e94tir",
- "updated": "20261024194010"
+ "updated": "20261024212002"
},
"Children": [
{
@@ -2329,11 +2329,11 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
- "TextMarkTextContent": "ドキュメントの表示範囲"
+ "TextMarkTextContent": "ドキュメントのレイアウト"
},
{
"Type": "NodeText",
- "Data": " をクリックすると、全画面表示に入る前のドキュメントの表示範囲の枠を表示・非表示にできます。枠は全画面表示での移動やズームに追従するプレビューであり、全画面表示を終了すると元のドキュメントの表示位置と倍率に戻ります。"
+ "Data": " をクリックすると、レイアウトの調整を開始できます。固定枠の大きさは全画面表示に入る前の文書の表示領域と同じです。全画面の表示領域のほうが高い場合は中央に、それ以外は上端中央に揃い、ウィンドウのサイズに応じて位置が更新されます。枠を基準に導図を移動・拡大縮小し、このモードを有効にしたまま全画面表示を終了すると、枠内の表示位置と倍率が文書に適用されます。ボタンをもう一度クリックすると、未適用の表示位置の調整を取り消します。キャンバスをロックした場合も未適用の調整は取り消されます。"
}
]
},
diff --git a/app/src/protyle/render/listMindmap/fullscreen.test.ts b/app/src/protyle/render/listMindmap/fullscreen.test.ts
index fe5f9b2679..3850c8f3ff 100644
--- a/app/src/protyle/render/listMindmap/fullscreen.test.ts
+++ b/app/src/protyle/render/listMindmap/fullscreen.test.ts
@@ -54,7 +54,7 @@ const browserCases = async (source: string, css: string) => {
const button = (label: string) => host.querySelector<HTMLButtonElement>(`[aria-label="${label}"]`);
const preview = host.querySelector<HTMLElement>(".mindmap-view__document-viewport");
check.ok(preview.hidden);
- check.ok(button("listMindmapDocumentViewport").hidden, "the preview control is fullscreen-only");
+ check.ok(button("listMindmapDocumentLayout").hidden, "the layout control is fullscreen-only");
const initialStyle = host.style.cssText;
for (const scale of [.75, 1.25]) {
view.zoomAt(scale);
@@ -122,65 +122,148 @@ const browserCases = async (source: string, css: string) => {
equalDocumentView();
}
- // 指示框标记原文档范围,平移缩放时跟随内容,不将预览变成布局编辑。
- const previewCenter = center();
- const previewScale = view.scale;
+ // 只有主动开启文档布局,才将固定取景框内的视角应用到文档。
+ const layoutCenter = center();
+ const layoutScale = view.scale;
const root = host.querySelector<HTMLElement>(".mindmap-view__node");
- const documentRect = viewport.getBoundingClientRect();
- const nodeRect = root.getBoundingClientRect();
- const relativeNode = [(nodeRect.left - documentRect.left) / viewport.clientWidth,
- (nodeRect.top - documentRect.top) / viewport.clientHeight];
- const sourceSize = [viewport.clientWidth, viewport.clientHeight];
- const checkPreview = () => {
+ const checkFrame = () => {
const rect = preview.getBoundingClientRect();
- const node = root.getBoundingClientRect();
- check.ok(Math.abs(rect.width - sourceSize[0] * view.scale / previewScale) < .1);
- check.ok(Math.abs(rect.height - sourceSize[1] * view.scale / previewScale) < .1);
- [(node.left - rect.left) / rect.width, (node.top - rect.top) / rect.height]
- .forEach((value, index) => check.ok(Math.abs(value - relativeNode[index]) < .001,
- "the same document content remains at the same relative position within the preview"));
+ const viewportRect = viewport.getBoundingClientRect();
+ check.ok(Math.abs(rect.width - view.documentView.width) < .1);
+ check.ok(Math.abs(rect.height - view.documentView.height) < .1);
+ check.ok(Math.abs(rect.left - viewportRect.left -
+ (viewport.clientWidth - rect.width) / 2) < .1);
+ check.ok(Math.abs(rect.top - viewportRect.top -
+ Math.max(0, (viewport.clientHeight - rect.height) / 2)) < .1);
check.equal(getComputedStyle(preview).pointerEvents, "none", "the frame does not intercept gestures");
check.equal(getComputedStyle(preview).borderTopStyle, "dashed");
- check.equal(button("listMindmapDocumentViewport").getAttribute("aria-pressed"), "true");
+ check.equal(button("listMindmapDocumentLayout").getAttribute("aria-pressed"), "true");
+ };
+ const captureLayout = () => {
+ const rect = preview.getBoundingClientRect();
+ const node = root.getBoundingClientRect();
+ return {scale: view.scale, width: rect.width, height: rect.height,
+ x: node.left - rect.left, y: node.top - rect.top};
+ };
+ const checkApplied = (expected: ReturnType<typeof captureLayout>) => {
+ const rect = viewport.getBoundingClientRect();
+ const node = root.getBoundingClientRect();
+ check.equal(view.scale, expected.scale);
+ check.ok(Math.abs(node.left - rect.left - expected.x -
+ (viewport.clientWidth - expected.width) / 2) < .2,
+ "the document shows the horizontal position framed in fullscreen");
+ check.ok(Math.abs(node.top - rect.top - expected.y -
+ (viewport.clientHeight - expected.height) / 2) < .2,
+ "the document shows the vertical position framed in fullscreen");
+ check.ok(preview.hidden);
+ check.ok(button("listMindmapDocumentLayout").hidden);
};
button("fullscreen").click();
await settle();
- check.equal(button("listMindmapDocumentViewport").hidden, false);
- check.equal(button("listMindmapDocumentViewport").getAttribute("aria-pressed"), "false");
- button("listMindmapDocumentViewport").click();
+ check.equal(button("listMindmapDocumentLayout").hidden, false);
+ check.equal(button("listMindmapDocumentLayout").getAttribute("aria-pressed"), "false");
+ button("listMindmapDocumentLayout").click();
check.equal(preview.hidden, false);
- checkPreview();
- await require("electron").ipcRenderer.invoke("mindmap-fullscreen-media", "print");
- check.equal(getComputedStyle(preview).display, "none", "viewport guides are excluded from printing");
- await require("electron").ipcRenderer.invoke("mindmap-fullscreen-media", "");
- checkPreview();
- const savedPreview = JSON.stringify(view.documentView);
+ checkFrame();
+ const savedLayout = JSON.stringify(view.documentView);
+ const fixedFrame = preview.getBoundingClientRect().toJSON();
view.zoomAt(1.9);
viewport.dispatchEvent(new WheelEvent("wheel", {deltaX: 90, deltaY: 40, bubbles: true, cancelable: true}));
await settle();
- checkPreview();
- button("listMindmapDocumentViewport").click();
- check.ok(preview.hidden);
- check.equal(button("listMindmapDocumentViewport").getAttribute("aria-pressed"), "false");
- button("listMindmapDocumentViewport").click();
+ checkFrame();
+ check.deepEqual(preview.getBoundingClientRect().toJSON(), fixedFrame,
+ "panning and zooming move the map beneath a fixed, unscaled frame");
view.setReadOnly(true);
- checkPreview();
- view.setLocked(true);
- checkPreview();
- view.setLocked(false);
+ checkFrame();
view.setReadOnly(false);
- check.equal(JSON.stringify(view.documentView), savedPreview, "preview operations never replace the saved view");
+ check.equal(JSON.stringify(view.documentView), savedLayout,
+ "layout edits keep the original snapshot available for cancellation");
+ button("listMindmapDocumentLayout").click();
+ check.ok(preview.hidden);
+ check.equal(button("listMindmapDocumentLayout").getAttribute("aria-pressed"), "false");
button("exitFullscreen").click();
await settle();
- equalCenter(previewCenter);
- check.equal(view.scale, previewScale);
- check.ok(preview.hidden);
- check.ok(button("listMindmapDocumentViewport").hidden);
+ equalCenter(layoutCenter);
+ check.equal(view.scale, layoutScale, "closing the layout toggle cancels its pending view change");
+ check.equal(list.outerHTML, originalSource);
+
+ // 开启后无需继续移动,也能主动采用开启时的全屏取景。
+ button("fullscreen").click();
+ await settle();
+ check.ok(preview.hidden, "each fullscreen session starts with layout editing off");
+ view.zoomAt(1.7);
+ viewport.dispatchEvent(new WheelEvent("wheel", {deltaX: 24, deltaY: 16, bubbles: true, cancelable: true}));
+ await settle();
+ const positionBeforeEnable = root.getBoundingClientRect().toJSON();
+ button("listMindmapDocumentLayout").click();
+ check.deepEqual(root.getBoundingClientRect().toJSON(), positionBeforeEnable,
+ "enabling layout editing does not jump the canvas");
+ const immediateLayout = captureLayout();
+ host.dispatchEvent(new KeyboardEvent("keydown", {key: "Escape", bubbles: true}));
+ await settle();
+ checkApplied(immediateLayout);
+ const appliedCenter = center();
+ button("fullscreen").click();
+ await settle();
+ view.zoomAt(.8);
+ button("exitFullscreen").click();
+ await settle();
+ equalCenter(appliedCenter);
+ check.equal(view.scale, immediateLayout.scale, "ordinary fullscreen restores the most recently applied view");
+
+ // 实际桌面缩放与双指手势修改框内取景,内容更新和打印不丢失布局状态。
+ button("fullscreen").click();
+ await settle();
+ button("listMindmapDocumentLayout").click();
+ if (mobile) {
+ const full = viewport.getBoundingClientRect();
+ const touches = (distance: number) => [0, 1].map(index => new Touch({identifier: index,
+ target: viewport, clientX: full.left + full.width / 2 + (index ? distance : -distance),
+ clientY: full.top + full.height / 2}));
+ viewport.dispatchEvent(new TouchEvent("touchstart", {touches: touches(50), cancelable: true}));
+ viewport.dispatchEvent(new TouchEvent("touchmove", {touches: touches(60), cancelable: true}));
+ viewport.dispatchEvent(new TouchEvent("touchend", {touches: [], cancelable: true}));
+ } else {
+ const slider = host.querySelector<HTMLInputElement>(".mindmap-view__zoom-actions input");
+ slider.value = "180";
+ slider.dispatchEvent(new Event("input", {bubbles: true}));
+ }
+ viewport.dispatchEvent(new WheelEvent("wheel", {deltaX: -50, deltaY: 30, bubbles: true, cancelable: true}));
+ const layoutContent = view.model.root.contentBlocks[0].querySelector('[contenteditable="true"]');
+ layoutContent.textContent = "Edited in document layout";
+ view.update(api.readListMindmap(list));
+ await settle();
+ checkFrame();
+ const beforePrint = [view.scale, view.offsetX, view.offsetY];
+ window.dispatchEvent(new Event("beforeprint"));
+ await require("electron").ipcRenderer.invoke("mindmap-fullscreen-media", "print");
+ check.equal(getComputedStyle(preview).display, "none", "layout guides are excluded from printing");
+ await require("electron").ipcRenderer.invoke("mindmap-fullscreen-media", "");
+ window.dispatchEvent(new Event("afterprint"));
+ await settle();
+ check.deepEqual([view.scale, view.offsetX, view.offsetY], beforePrint);
+ checkFrame();
+ const editedLayout = captureLayout();
+ button("exitFullscreen").click();
+ await settle();
+ checkApplied(editedLayout);
+ check.equal(view.getContentHost(view.model.root.id).textContent, "Edited in document layout");
+
+ // 画布锁定会取消未应用的布局,不能借助模式切换改写锁定视角。
+ const beforeLockLayout = center();
+ const beforeLockLayoutScale = view.scale;
button("fullscreen").click();
await settle();
- check.ok(preview.hidden, "each fullscreen session starts without the optional frame");
+ button("listMindmapDocumentLayout").click();
+ view.zoomAt(.7);
+ view.setLocked(true);
+ check.ok(preview.hidden);
+ check.ok(button("listMindmapDocumentLayout").hidden);
button("exitFullscreen").click();
await settle();
+ equalCenter(beforeLockLayout);
+ check.equal(view.scale, beforeLockLayoutScale);
+ view.setLocked(false);
const rapid = center();
button("fullscreen").click();
@@ -254,8 +337,6 @@ const browserCases = async (source: string, css: string) => {
const reference = () => [(viewport.clientWidth / 2 - view.offsetX) / view.scale,
(Math.max(viewport.clientHeight, documentHeight) / 2 - view.offsetY) / view.scale];
const fullReference = reference();
- button("listMindmapDocumentViewport").click();
- const savedWidth = view.documentView.width;
for (const height of [520, 480, 479, 320, 479, 480, 520, 700]) {
const oldHeight = viewport.clientHeight;
const oldOffset = view.offsetY;
@@ -271,15 +352,38 @@ const browserCases = async (source: string, css: string) => {
check.equal(view.scale, 1.6);
check.equal(view.documentView.scale, savedScale);
check.deepEqual([view.documentView.center.x, view.documentView.center.y], beforeHeightChanges);
- check.ok(Math.abs(preview.getBoundingClientRect().width - savedWidth * 1.6 / savedScale) < .1);
- check.ok(Math.abs(preview.getBoundingClientRect().height - documentHeight * 1.6 / savedScale) < .1,
- "height anchor changes do not stretch or rebase the document frame");
}
button("exitFullscreen").click();
await settle();
equalCenter(beforeHeightChanges);
check.equal(view.scale, savedScale);
+ // 布局模式下跨越高矮视口边界,框固定尺寸并实时切换中心或顶部对齐。
+ button("fullscreen").click();
+ await settle();
+ button("listMindmapDocumentLayout").click();
+ view.zoomAt(1.3);
+ for (const height of [520, 480, 479, 320, 479, 480, 700]) {
+ await resizeWindow(900, height);
+ checkFrame();
+ }
+ const afterHeightLayout = captureLayout();
+ button("exitFullscreen").click();
+ await settle();
+ checkApplied(afterHeightLayout);
+
+ // 全屏窗口宽度改变后,应用取景中心并适应返回文档的实际宽度。
+ button("fullscreen").click();
+ await settle();
+ button("listMindmapDocumentLayout").click();
+ await resizeWindow(780, 700);
+ checkFrame();
+ const afterWidthLayout = captureLayout();
+ button("exitFullscreen").click();
+ await settle();
+ checkApplied(afterWidthLayout);
+ await resizeWindow(900, 700);
+
// 滚动容器只露出高画布的一部分时,把正在看的节点保留在全屏顶部内。
await resizeWindow(900, 600);
host.style.setProperty("--mindmap-view-height", "1100px");
@@ -384,9 +488,9 @@ const browserCases = async (source: string, css: string) => {
return "Mindmap fullscreen cases passed";
};
-test("fullscreen preserves entry focus across viewport resizing and clipping without reverting content updates", {
+test("fullscreen restores entry focus or applies explicit document layout across resizing, clipping and content updates", {
skip: process.platform === "linux" && !process.env.DISPLAY && !process.env.WAYLAND_DISPLAY,
- timeout: 30000,
+ timeout: 45000,
}, async () => {
const source = ["../av/richTextValue.ts", "summary.ts", "connectors.ts", "appearance.ts", "model.ts", "fold.ts", "routing.ts", "pan.ts", "view.ts"]
.map(file => transpileModule(readFileSync(path.join(__dirname, file), "utf8")
@@ -430,7 +534,7 @@ app.whenReady().then(async () => {
delete env.ELECTRON_RUN_AS_NODE;
try {
const result = await promisify(execFile)(require("electron") as unknown as string, [script], {
- env, timeout: 25000, windowsHide: true,
+ env, timeout: 40000, windowsHide: true,
});
assert.match(result.stdout, /Mindmap fullscreen cases passed/);
} finally {
diff --git a/app/src/protyle/render/listMindmap/view.ts b/app/src/protyle/render/listMindmap/view.ts
index 4d81c41401..09a0e18ec9 100644
--- a/app/src/protyle/render/listMindmap/view.ts
+++ b/app/src/protyle/render/listMindmap/view.ts
@@ -562,6 +562,9 @@ export class ListMindmapView {
private setLocked(value: boolean) {
this.locked = value;
+ if (value) {
+ this.documentViewport.hidden = true;
+ }
this.setInteractionActive(false);
this.pinching = false;
this.pinch = undefined;
@@ -608,15 +611,19 @@ export class ListMindmapView {
}
};
const addFullscreen = () => {
- add("documentViewport", "listMindmapDocumentViewport", "iconSelectAll", () => {
+ add("documentLayout", "listMindmapDocumentLayout", "iconSelectAll", () => {
+ if (!this.fullscreenMarker || !this.documentView || this.locked) {
+ return;
+ }
+ this.stopFoldAnimation?.();
this.documentViewport.hidden = !this.documentViewport.hidden;
- const button = this.buttons.get("documentViewport");
+ const button = this.buttons.get("documentLayout");
button.setAttribute("aria-pressed", String(!this.documentViewport.hidden));
button.classList.toggle("block__icon--active", !this.documentViewport.hidden);
this.updateDocumentViewport();
});
- const preview = this.buttons.get("documentViewport");
- preview.hidden = !this.fullscreenMarker || !this.documentView;
+ const preview = this.buttons.get("documentLayout");
+ preview.hidden = !this.fullscreenMarker || !this.documentView || this.locked;
preview.setAttribute("aria-pressed", String(!this.documentViewport.hidden));
preview.classList.toggle("block__icon--active", !this.documentViewport.hidden);
add("fullscreen", "fullscreen", "iconFullscreen", () => this.toggleFullscreen());
@@ -3997,8 +4004,17 @@ export class ListMindmapView {
return;
}
if (this.documentView) {
- this.scale = this.documentView.scale;
- this.viewportCenter = this.documentView.center;
+ if (!this.documentViewport.hidden && !this.destroyed && !this.locked) {
+ // 主动布局时,将固定取景框内的视角应用到文档;关闭布局模式则保留原快照。
+ this.resizeViewport();
+ this.viewportCenter ||= {
+ x: (this.viewport.clientWidth / 2 - this.offsetX) / this.scale,
+ y: (this.getViewportAnchorY(this.viewport.clientHeight) - this.offsetY) / this.scale,
+ };
+ } else {
+ this.scale = this.documentView.scale;
+ this.viewportCenter = this.documentView.center;
+ }
this.documentView = undefined;
}
this.options.onFullscreen?.(false, this.buttons.get("fullscreen"));
@@ -4024,8 +4040,8 @@ export class ListMindmapView {
if (!active) {
this.documentViewport.hidden = true;
}
- const preview = this.buttons.get("documentViewport");
- preview.hidden = !active || !this.documentView;
+ const preview = this.buttons.get("documentLayout");
+ preview.hidden = !active || !this.documentView || this.locked;
preview.setAttribute("aria-pressed", String(!this.documentViewport.hidden));
preview.classList.toggle("block__icon--active", !this.documentViewport.hidden);
const button = this.buttons.get("fullscreen");
@@ -4039,11 +4055,11 @@ export class ListMindmapView {
if (!saved || this.documentViewport.hidden) {
return;
}
- // 文档视口映射到当前全屏坐标,仅作预览,不改变退出时恢复的视角。
- const width = saved.width * this.scale / saved.scale;
- const height = saved.height * this.scale / saved.scale;
- const x = this.offsetX + saved.center.x * this.scale - width / 2;
- const y = this.offsetY + saved.center.y * this.scale - height / 2;
+ // 取景框与进入全屏前的文档视口等大,平移缩放只调整框下的导图。
+ const width = saved.width;
+ const height = saved.height;
+ const x = (this.viewport.clientWidth - width) / 2;
+ const y = Math.max(0, (this.viewport.clientHeight - height) / 2);
this.documentViewport.style.width = `${width}px`;
this.documentViewport.style.height = `${height}px`;
this.documentViewport.style.transform = `translate(${x}px, ${y}px)`;