An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:sparkles: Improve readability of wide tables in exported images https://github.com/siyuan-note/siyuan/issues/20000
Daniele2909b6c85a4
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.jsonindex cb1f2bf853..1b1e731325 100644--- a/app/appearance/langs/ar.json+++ b/app/appearance/langs/ar.json@@ -1,5 +1,6 @@{"renameAssetTip": "تؤدي إعادة التسمية إلى تحديث جميع الروابط التي تشير إلى هذا المورد",+ "exportImageTooLarge": "الصورة المُصدَّرة كبيرة جدًا. قلّل المحتوى أو عدد أعمدة الجدول وحاول مجددًا.","imageOCRActionTip": "انقر للنسخ/انقر مرتين لتحرير نص OCR","displayImgAltTip": "عند التفعيل يظهر نص التلميح أسفل عنوان الصورة؛ عند تعطيل هذا الخيار، يظل العنوان ونص التلميح ظاهرين عند تمرير المؤشر فوق الصورة","displayImgNameTip": "عند التفعيل تظهر أسماء الملفات فوق الصور المحلية دون المسار والمعرّف المُنشأ مع الاحتفاظ بالامتداد؛ انقر على الاسم لفتح مربع حوار إعادة التسمية",diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.jsonindex 3fbac64ff6..aa0cb9d65c 100644--- a/app/appearance/langs/de.json+++ b/app/appearance/langs/de.json@@ -1,5 +1,6 @@{"renameAssetTip": "Beim Umbenennen werden alle Links aktualisiert, die auf diese Ressource verweisen",+ "exportImageTooLarge": "Das exportierte Bild ist zu groß. Reduzieren Sie den Inhalt oder die Anzahl der Tabellenspalten und versuchen Sie es erneut.","imageOCRActionTip": "Klicken zum Kopieren/Doppelklicken zum Bearbeiten des OCR-Texts","displayImgAltTip": "Bei Aktivierung erscheint der Tooltip-Text unter dem Bildtitel; auch bei deaktivierter Option werden Titel und Tooltip-Text beim Bewegen des Mauszeigers über das Bild angezeigt","displayImgNameTip": "Bei Aktivierung erscheinen Dateinamen über lokalen Bildern, ohne Ressourcenpfad und generierte ID, aber mit Dateiendung; auf einen Namen klicken, um den Umbenennungsdialog zu öffnen",diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.jsonindex 71984a9a59..5ce629858b 100644--- a/app/appearance/langs/en.json+++ b/app/appearance/langs/en.json@@ -1,5 +1,6 @@{"renameAssetTip": "Renaming updates all links that reference this asset",+ "exportImageTooLarge": "The exported image is too large. Reduce the content or table columns and try again.","imageOCRActionTip": "Click to copy/double-click to edit OCR text","displayImgAltTip": "When enabled tooltip text appears below the image title; when disabled, hovering over the image still shows its title and tooltip text","displayImgNameTip": "When enabled file names appear above local images, hiding the asset path and generated ID while keeping the extension; click a name to open the rename dialog",diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.jsonindex 5d5a0a0883..569a351fb2 100644--- a/app/appearance/langs/es.json+++ b/app/appearance/langs/es.json@@ -1,5 +1,6 @@{"renameAssetTip": "Al renombrar se actualizan todos los enlaces que hacen referencia a este recurso",+ "exportImageTooLarge": "La imagen exportada es demasiado grande. Reduce el contenido o el número de columnas de la tabla y vuelve a intentarlo.","imageOCRActionTip": "Clic para copiar/doble clic para editar el texto OCR","displayImgAltTip": "Al activar esta opción el texto de ayuda aparece debajo del título de la imagen; al desactivarla, pasar el cursor sobre la imagen sigue mostrando su título y el texto de ayuda","displayImgNameTip": "Al activar esta opción los nombres de archivo aparecen sobre las imágenes locales, sin la ruta ni el ID generado y conservando la extensión; hacer clic en un nombre abre el diálogo para renombrar",diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.jsonindex 09ff108785..b7ded905de 100644--- a/app/appearance/langs/fr.json+++ b/app/appearance/langs/fr.json@@ -1,5 +1,6 @@{"renameAssetTip": "Le renommage met à jour tous les liens qui référencent cette ressource",+ "exportImageTooLarge": "L’image exportée est trop grande. Réduisez le contenu ou le nombre de colonnes du tableau, puis réessayez.","imageOCRActionTip": "Cliquer pour copier/double-cliquer pour modifier le texte OCR","displayImgAltTip": "Une fois cette option activée le texte de l’infobulle apparaît sous le titre de l’image ; même si cette option est désactivée, le survol de l’image affiche son titre et le texte de l’infobulle","displayImgNameTip": "Une fois cette option activée les noms de fichiers apparaissent au-dessus des images locales, sans le chemin ni l’identifiant généré, en conservant l’extension ; cliquer sur un nom ouvre la boîte de dialogue de renommage",diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.jsonindex 4fa13630ff..64332520a2 100644--- a/app/appearance/langs/he.json+++ b/app/appearance/langs/he.json@@ -1,5 +1,6 @@{"renameAssetTip": "שינוי השם מעדכן את כל הקישורים שמפנים למשאב זה",+ "exportImageTooLarge": "התמונה המיוצאת גדולה מדי. צמצמו את התוכן או את מספר העמודות בטבלה ונסו שוב.","imageOCRActionTip": "לחיצה להעתקה/לחיצה כפולה לעריכת טקסט OCR","displayImgAltTip": "לאחר ההפעלה טקסט הרמז מוצג מתחת לכותרת התמונה; גם כשהאפשרות כבויה, הכותרת וטקסט הרמז מוצגים בעת ריחוף העכבר מעל התמונה","displayImgNameTip": "כאשר האפשרות מופעלת שמות קבצים מוצגים מעל תמונות מקומיות, ללא הנתיב והמזהה שנוצר ועם הסיומת; לחיצה על שם פותחת את חלון שינוי השם",diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.jsonindex 830457db8a..1aa33b1040 100644--- a/app/appearance/langs/hi.json+++ b/app/appearance/langs/hi.json@@ -1,5 +1,6 @@{"renameAssetTip": "नाम बदलने से इस संसाधन को संदर्भित करने वाले सभी लिंक अपडेट होते हैं",+ "exportImageTooLarge": "निर्यात की जाने वाली छवि बहुत बड़ी है। सामग्री या तालिका के स्तंभों की संख्या कम करके फिर प्रयास करें।","imageOCRActionTip": "कॉपी करने के लिए क्लिक करें/OCR पाठ संपादित करने के लिए डबल-क्लिक करें","displayImgAltTip": "सक्षम होने पर चित्र के शीर्षक के नीचे टूलटिप पाठ दिखाई देता है; यह विकल्प बंद होने पर भी चित्र पर माउस ले जाने से उसका शीर्षक और टूलटिप पाठ दिखाई देते हैं","displayImgNameTip": "सक्षम होने पर स्थानीय चित्रों के ऊपर पथ और जनरेट किए गए ID के बिना, एक्सटेंशन सहित फ़ाइल नाम दिखते हैं; नाम बदलने का संवाद खोलने के लिए नाम पर क्लिक करें",diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.jsonindex adfc84bf4f..662eee18af 100644--- a/app/appearance/langs/id.json+++ b/app/appearance/langs/id.json@@ -1,5 +1,6 @@{"renameAssetTip": "Penggantian nama memperbarui semua tautan yang merujuk ke sumber daya ini",+ "exportImageTooLarge": "Gambar yang diekspor terlalu besar. Kurangi konten atau jumlah kolom tabel, lalu coba lagi.","imageOCRActionTip": "Klik untuk menyalin/klik dua kali untuk mengedit teks OCR","displayImgAltTip": "Saat diaktifkan teks petunjuk muncul di bawah judul gambar; saat opsi ini dinonaktifkan, judul dan teks petunjuk tetap muncul ketika kursor diarahkan ke gambar","displayImgNameTip": "Saat diaktifkan nama file ditampilkan di atas gambar lokal, tanpa jalur dan ID yang dibuat serta tetap menyertakan ekstensi; klik nama untuk membuka dialog penggantian nama",diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.jsonindex 5d4f799662..bc7e946c76 100644--- a/app/appearance/langs/it.json+++ b/app/appearance/langs/it.json@@ -1,5 +1,6 @@{"renameAssetTip": "La rinomina aggiorna tutti i collegamenti che fanno riferimento a questa risorsa",+ "exportImageTooLarge": "L’immagine esportata è troppo grande. Riduci il contenuto o il numero di colonne della tabella e riprova.","imageOCRActionTip": "Clic per copiare/doppio clic per modificare il testo OCR","displayImgAltTip": "Quando attivata questa opzione mostra il testo del suggerimento sotto il titolo dell’immagine; anche se disattivata, passando il mouse sull’immagine vengono mostrati il titolo e il testo del suggerimento","displayImgNameTip": "Quando attivata questa opzione mostra i nomi dei file sopra le immagini locali, senza percorso e ID generato e mantenendo l’estensione; fai clic su un nome per aprire la finestra di rinomina",diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.jsonindex d8c69f35bf..de7012ee4a 100644--- a/app/appearance/langs/ja.json+++ b/app/appearance/langs/ja.json@@ -1,5 +1,6 @@{"renameAssetTip": "名前を変更すると、このアセットを参照するすべてのリンクが更新されます",+ "exportImageTooLarge": "エクスポートする画像が大きすぎます。内容または表の列数を減らして再試行してください。","imageOCRActionTip": "クリックでコピー/ダブルクリックで OCR テキストを編集","displayImgAltTip": "有効にすると画像のタイトルの下にツールチップのテキストを表示します。無効にしても、画像にマウスを合わせるとタイトルとツールチップのテキストが表示されます","displayImgNameTip": "有効にするとローカル画像の上に、パスと生成 ID を除いたファイル名を拡張子付きで表示します。名前をクリックすると名前変更ダイアログが開きます",diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.jsonindex f0d389f196..beedf23a58 100644--- a/app/appearance/langs/ko.json+++ b/app/appearance/langs/ko.json@@ -1,5 +1,6 @@{"renameAssetTip": "이름을 변경하면 이 리소스를 참조하는 모든 링크가 업데이트됩니다",+ "exportImageTooLarge": "내보낼 이미지가 너무 큽니다. 내용이나 표의 열 수를 줄인 후 다시 시도하세요.","imageOCRActionTip": "클릭하여 복사/두 번 클릭하여 OCR 텍스트 편집","displayImgAltTip": "활성화하면 이미지 제목 아래에 도구 설명 텍스트를 표시합니다. 이 옵션을 꺼도 이미지에 마우스를 올리면 제목과 도구 설명 텍스트가 표시됩니다","displayImgNameTip": "활성화하면 로컬 이미지 위에 경로와 생성 ID를 제외하고 확장자를 포함한 파일 이름을 표시합니다. 이름을 클릭하면 이름 변경 대화 상자가 열립니다",diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.jsonindex 4720629f7a..39afadf0da 100644--- a/app/appearance/langs/nl.json+++ b/app/appearance/langs/nl.json@@ -1,5 +1,6 @@{"renameAssetTip": "Hernoemen werkt alle links bij die naar deze bron verwijzen",+ "exportImageTooLarge": "De geëxporteerde afbeelding is te groot. Verminder de inhoud of het aantal tabelkolommen en probeer het opnieuw.","imageOCRActionTip": "Klik om te kopiëren/dubbelklik om OCR-tekst te bewerken","displayImgAltTip": "Na inschakeling verschijnt tooltiptekst onder de afbeeldingstitel; ook als deze optie uitstaat, worden de titel en tooltiptekst getoond wanneer de muis boven de afbeelding staat","displayImgNameTip": "Na inschakeling verschijnen bestandsnamen boven lokale afbeeldingen, zonder het pad en de gegenereerde ID, maar met extensie; klik op een naam om het dialoogvenster voor hernoemen te openen",diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.jsonindex 33d0db4f4a..eb2bd83abb 100644--- a/app/appearance/langs/pl.json+++ b/app/appearance/langs/pl.json@@ -1,5 +1,6 @@{"renameAssetTip": "Zmiana nazwy aktualizuje wszystkie linki odwołujące się do tego zasobu",+ "exportImageTooLarge": "Eksportowany obraz jest zbyt duży. Zmniejsz ilość treści lub liczbę kolumn tabeli i spróbuj ponownie.","imageOCRActionTip": "Kliknij, aby skopiować/kliknij dwukrotnie, aby edytować tekst OCR","displayImgAltTip": "Po włączeniu tekst podpowiedzi jest wyświetlany pod tytułem obrazu; po wyłączeniu tej opcji tytuł i tekst podpowiedzi nadal są widoczne po najechaniu kursorem na obraz","displayImgNameTip": "Po włączeniu nazwy plików są wyświetlane nad obrazami lokalnymi, bez ścieżki i wygenerowanego identyfikatora, z zachowaniem rozszerzenia; kliknij nazwę, aby otworzyć okno zmiany nazwy",diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.jsonindex d6351a97fd..c0c993eeb8 100644--- a/app/appearance/langs/pt-BR.json+++ b/app/appearance/langs/pt-BR.json@@ -1,5 +1,6 @@{"renameAssetTip": "A renomeação atualiza todos os links que fazem referência a este recurso",+ "exportImageTooLarge": "A imagem exportada é muito grande. Reduza o conteúdo ou o número de colunas da tabela e tente novamente.","imageOCRActionTip": "Clique para copiar/clique duas vezes para editar o texto OCR","displayImgAltTip": "Quando ativada esta opção mostra o texto da dica abaixo do título da imagem; mesmo quando desativada, passar o mouse sobre a imagem exibe seu título e o texto da dica","displayImgNameTip": "Quando ativada esta opção mostra os nomes dos arquivos acima das imagens locais, sem o caminho nem o ID gerado e mantendo a extensão; clique em um nome para abrir a caixa de diálogo de renomeação",diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.jsonindex baf889f0b4..18020703ea 100644--- a/app/appearance/langs/ru.json+++ b/app/appearance/langs/ru.json@@ -1,5 +1,6 @@{"renameAssetTip": "Переименование обновляет все ссылки на этот ресурс",+ "exportImageTooLarge": "Экспортируемое изображение слишком велико. Уменьшите объём содержимого или количество столбцов таблицы и повторите попытку.","imageOCRActionTip": "Нажмите для копирования/дважды нажмите для редактирования текста OCR","displayImgAltTip": "При включении текст подсказки отображается под заголовком изображения; при отключении этой опции заголовок и текст подсказки по-прежнему отображаются при наведении указателя на изображение","displayImgNameTip": "При включении имена файлов отображаются над локальными изображениями без пути и сгенерированного ID, сохраняя расширение; нажмите на имя, чтобы открыть диалог переименования",diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.jsonindex a79305c706..27e4f64685 100644--- a/app/appearance/langs/sk.json+++ b/app/appearance/langs/sk.json@@ -1,5 +1,6 @@{"renameAssetTip": "Premenovanie aktualizuje všetky odkazy na tento zdroj",+ "exportImageTooLarge": "Exportovaný obrázok je príliš veľký. Zmenšite obsah alebo počet stĺpcov tabuľky a skúste to znova.","imageOCRActionTip": "Kliknutím skopírujete/dvojitým kliknutím upravíte text OCR","displayImgAltTip": "Po zapnutí sa text popisu zobrazí pod názvom obrázka; aj keď je táto možnosť vypnutá, názov a text popisu sa zobrazia pri umiestnení kurzora nad obrázok","displayImgNameTip": "Po zapnutí sa nad lokálnymi obrázkami zobrazia názvy súborov bez cesty a generovaného ID, so zachovanou príponou; kliknutím na názov otvoríte dialóg premenovania",diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.jsonindex 2a972af5f6..5cd8591c28 100644--- a/app/appearance/langs/sr.json+++ b/app/appearance/langs/sr.json@@ -1,5 +1,6 @@{"renameAssetTip": "Преименовање ажурира све везе које упућују на овај ресурс",+ "exportImageTooLarge": "Извезена слика је превелика. Смањите садржај или број колона табеле и покушајте поново.","imageOCRActionTip": "Кликните за копирање/двапут кликните за уређивање OCR текста","displayImgAltTip": "Када је укључена ова опција приказује текст објашњења испод наслова слике; када је искључена, наслов и текст објашњења се и даље приказују при преласку показивача преко слике","displayImgNameTip": "Када је омогућено, имена датотека се приказују изнад локалних слика, без путање и генерисаног ID-а, са наставком; кликните на име да отворите дијалог за преименовање",diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.jsonindex 64852d2760..790db7e9af 100644--- a/app/appearance/langs/th.json+++ b/app/appearance/langs/th.json@@ -1,5 +1,6 @@{"renameAssetTip": "การเปลี่ยนชื่อจะอัปเดตลิงก์ทั้งหมดที่อ้างอิงไฟล์ทรัพยากรนี้",+ "exportImageTooLarge": "รูปภาพที่จะส่งออกมีขนาดใหญ่เกินไป โปรดลดเนื้อหาหรือจำนวนคอลัมน์ในตารางแล้วลองอีกครั้ง","imageOCRActionTip": "คลิกเพื่อคัดลอก/ดับเบิลคลิกเพื่อแก้ไขข้อความ OCR","displayImgAltTip": "เมื่อเปิดใช้งานจะแสดงข้อความคำแนะนำใต้ชื่อรูปภาพ แม้ปิดตัวเลือกนี้ การวางเมาส์เหนือรูปภาพยังคงแสดงชื่อและข้อความคำแนะนำ","displayImgNameTip": "เมื่อเปิดใช้งานจะแสดงชื่อไฟล์พร้อมนามสกุลเหนือรูปภาพในเครื่อง โดยซ่อนเส้นทางและรหัสที่สร้างขึ้น คลิกชื่อเพื่อเปิดกล่องเปลี่ยนชื่อ",diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.jsonindex 189acd75d3..078ed0855e 100644--- a/app/appearance/langs/tr.json+++ b/app/appearance/langs/tr.json@@ -1,5 +1,6 @@{"renameAssetTip": "Yeniden adlandırma bu kaynağa başvuran tüm bağlantıları günceller",+ "exportImageTooLarge": "Dışa aktarılacak resim çok büyük. İçeriği veya tablonun sütun sayısını azaltıp tekrar deneyin.","imageOCRActionTip": "Kopyalamak için tıklayın/OCR metnini düzenlemek için çift tıklayın","displayImgAltTip": "Etkinleştirildiğinde görsel başlığının altında ipucu metni gösterilir; bu seçenek kapalıyken de fare görselin üzerine getirildiğinde başlık ve ipucu metni gösterilir","displayImgNameTip": "Etkinleştirildiğinde yerel görsellerin üzerinde dosya adları, kaynak yolu ve oluşturulan kimlik olmadan, uzantı korunarak gösterilir; yeniden adlandırma iletişim kutusunu açmak için ada tıklayın",diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.jsonindex 7f978c8b68..b8b46360e9 100644--- a/app/appearance/langs/uk.json+++ b/app/appearance/langs/uk.json@@ -1,5 +1,6 @@{"renameAssetTip": "Перейменування оновлює всі посилання на цей ресурс",+ "exportImageTooLarge": "Зображення для експорту завелике. Зменште обсяг вмісту або кількість стовпців таблиці та спробуйте ще раз.","imageOCRActionTip": "Натисніть для копіювання/двічі натисніть для редагування тексту OCR","displayImgAltTip": "Після ввімкнення текст підказки відображається під заголовком зображення; якщо цю опцію вимкнено, заголовок і текст підказки все одно відображаються при наведенні вказівника на зображення","displayImgNameTip": "Після ввімкнення імена файлів відображаються над локальними зображеннями без шляху та згенерованого ID, зберігаючи розширення; натисніть на ім’я, щоб відкрити діалог перейменування",diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.jsonindex 87133e5ac3..efcd5a491e 100644--- a/app/appearance/langs/zh-CN.json+++ b/app/appearance/langs/zh-CN.json@@ -1,5 +1,6 @@{"renameAssetTip": "重命名会更新所有引用该资源文件的链接",+ "exportImageTooLarge": "导出图片过大,请减少内容或表格列数后重试","imageOCRActionTip": "单击复制/双击编辑 OCR 文本","displayImgAltTip": "启用后在图片标题下方显示提示文本;关闭后鼠标悬浮图片时仍会显示标题和提示文本","displayImgNameTip": "启用后在本地图片上方显示文件名,隐藏资源路径和随机码并保留扩展名;单击文件名打开重命名弹窗",diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.jsonindex ae50efafdc..0dc658b540 100644--- a/app/appearance/langs/zh-TW.json+++ b/app/appearance/langs/zh-TW.json@@ -1,5 +1,6 @@{"renameAssetTip": "重新命名會更新所有引用此資源檔案的連結",+ "exportImageTooLarge": "匯出圖片過大,請減少內容或表格欄數後重試","imageOCRActionTip": "按一下複製/按兩下編輯 OCR 文字","displayImgAltTip": "啟用後在圖片標題下方顯示提示文字;關閉後滑鼠懸停圖片時仍會顯示標題和提示文字","displayImgNameTip": "啟用後在本機圖片上方顯示檔名,隱藏資源路徑和隨機碼並保留副檔名;按一下檔名開啟重新命名對話框",diff --git a/app/src/assets/scss/business/_export.scss b/app/src/assets/scss/business/_export.scssindex 9962611c46..a825a53779 100644--- a/app/src/assets/scss/business/_export.scss+++ b/app/src/assets/scss/business/_export.scss@@ -1,4 +1,5 @@.export-img {+ box-sizing: border-box;position: relative;border: 1px solid var(--b3-border-color);border-radius: var(--b3-border-radius-b);@@ -30,6 +31,19 @@.protyle-wysiwyg {position: relative;z-index: 1;+ overflow-x: visible;++ .table,+ [data-node-id].table[custom-pinthead="true"] {+ > div:first-child {+ overflow: visible;+ max-height: none;+ }+ }++ .sb[data-sb-layout="col"] > [data-node-id] {+ min-width: min-content;+ }[data-node-id].li[fold="1"] > .protyle-action::after {background-color: transparent;diff --git a/app/src/protyle/export/imageLayout.test.ts b/app/src/protyle/export/imageLayout.test.tsnew file mode 100644index 0000000000..f0e5945c95--- /dev/null+++ b/app/src/protyle/export/imageLayout.test.ts@@ -0,0 +1,292 @@+import * as assert from "node:assert/strict";+import {execFile} from "node:child_process";+import {mkdtempSync, readFileSync, rmSync, writeFileSync} from "node:fs";+import {tmpdir} from "node:os";+import * as path from "node:path";+import {promisify} from "node:util";+import test from "node:test";+import {ModuleKind, ScriptTarget, transpileModule} from "typescript";+import {getExportImageSize, isExportImageSizeSupported, updateExportImageLayout} from "./imageLayout";++test("image limits account for device pixels, side length and bitmap area", () => {+ assert.equal(isExportImageSizeSupported({width: 8192, height: 2048}, 2), true);+ assert.equal(isExportImageSizeSupported({width: 8193, height: 100}, 2), false);+ assert.equal(isExportImageSizeSupported({width: 100, height: 8193}, 2), false);+ assert.equal(isExportImageSizeSupported({width: 4097, height: 4096}, 2), false);+ assert.equal(isExportImageSizeSupported({width: 0, height: 100}, 1), false);+ assert.equal(isExportImageSizeSupported({width: Infinity, height: 100}, 1), false);+ assert.equal(isExportImageSizeSupported({width: 100, height: 100}, NaN), false);+});++const browserCases = async (layoutSource: string, exportSource: string, mobile: boolean) => {+ const check = require("node:assert/strict");+ const layout: {+ updateExportImageLayout: typeof updateExportImageLayout,+ getExportImageSize: typeof getExportImageSize,+ isExportImageSizeSupported: typeof isExportImageSizeSupported,+ } = new Function("exports", `${layoutSource}; return exports;`)({});+ let engine = "html";+ let content = "";+ let dialog: {element: HTMLElement, resize: () => void};+ let captured: {blob: Blob, width: number, height: number, x: number, y: number};+ const messages: string[] = [];+ let watermarkWidth = 0;+ class ExportDialog {+ element: HTMLElement;+ resize: () => void;+ constructor(options: {content: string, width: string, height: string, resizeCallback: () => void}) {+ this.element = document.createElement("div");+ this.element.classList.add("b3-dialog--open");+ this.element.innerHTML = `<div class="b3-dialog"><div class="b3-dialog__container" style="width:${options.width};height:${options.height}">+<div class="b3-dialog__body">${options.content}</div></div></div>`;+ document.body.append(this.element);+ this.resize = options.resizeCallback;+ dialog = {element: this.element, resize: options.resizeCallback};+ }+ destroy() {+ this.element.remove();+ }+ }+ window.siyuan = {+ config: {editor: {}, export: {addTitle: false}, system: {}},+ languages: {exportImageTooLarge: "Image too large", exportFileSaveFailed: "Export failed"},+ storage: {image: {keepFold: false, watermark: false}},+ } as unknown as ISiyuan;+ Object.defineProperty(window, "devicePixelRatio", {value: 2, configurable: true});+ const htmlCanvas = window.htmlToImage.toCanvas;+ window.htmlToImage.toCanvas = async (element, options) => {+ watermarkWidth = element.clientWidth;+ return htmlCanvas(element, options);+ };+ const rememberBlob = (blob: Blob) => {+ const element = dialog.element.querySelector<HTMLElement>(".b3-dialog__content");+ const size = layout.getExportImageSize(element);+ const markers = element.querySelectorAll<HTMLElement>(".marker");+ const marker = markers[markers.length - 1].getBoundingClientRect();+ const rect = element.getBoundingClientRect();+ captured = {blob, ...size, x: marker.left - rect.left + element.scrollLeft + marker.width / 2,+ y: marker.top - rect.top + element.scrollTop + marker.height / 2};+ };+ const dependencies: Record<string, unknown> = {+ "./imageLayout": layout,+ "../../dialog": {Dialog: ExportDialog},+ "../../dialog/message": {showMessage: (message: string) => messages.push(message), hideMessage: () => {}},+ "../../util/fetch": {fetchPost: (url: string, data: {file: File}, callback: (response: unknown) => void) => {+ if (url === "/api/export/exportPreviewHTML") {+ callback({data: {content, attrs: {}, type: "NodeDocument", name: "image"}});+ } else {+ check.equal(url, "/api/export/exportAsFile");+ rememberBlob(data.file);+ callback({code: 0, data: {file: "image.png"}});+ }+ }},+ "../../util/contractFormData": {ContractFormData: class {+ file: File;+ constructor(data: {file: File}) {+ this.file = data.file;+ }+ }},+ "./jsEmbed": {renderExportJSEmbeds: async () => {}},+ "../util/addScript": {addScript: async () => {}},+ "../../util/functions": {isMobile: () => mobile},+ "../../constants": {Constants: {LOCAL_EXPORTIMG: "image", DIALOG_EXPORTIMAGE: "image", TIMEOUT_LOAD: 0}},+ "../render/highlightRender": {highlightRender: () => {}, lineNumberRender: () => {}},+ "../util/processCode": {processRender: () => {}},+ "../util/compatibility": {isIPhone: () => mobile && engine === "modern", isIPad: () => false,+ isSafari: () => engine === "modern", isInAndroid: () => false, setStorageVal: () => {},+ saveExportFile: async () => {}},+ "../../util/hostCapabilities": {getHostCapabilities: () => ({documentImportExport: true}),+ sanitizeKernelHTML: (value: string) => value},+ "../../menus/util": {writePNGBlob: async (blob: Blob) => {+ rememberBlob(blob);+ return false;+ }},+ };+ const exported: {exportImage: (id: string, copyOnly?: boolean) => void} = new Function("exports", "require",+ `${exportSource}; return exports;`)({}, (name: string) => dependencies[name] || {});+ const waitForActions = async () => {+ for (let i = 0; i < 500; i++) {+ if (!document.body.contains(dialog.element) ||+ !(dialog.element.querySelector('[data-type="copy"]') as HTMLButtonElement).disabled) {+ return;+ }+ await new Promise(resolve => setTimeout(resolve, 10));+ }+ check.fail("Export actions did not become available");+ };+ const table = (columns: number, wide = true) => `<div class="table" data-node-id="table"><div><table><tbody><tr>${+ Array.from({length: columns}, (_, index) => `<td${wide ? ' style="min-width:400px"' : ""}>column ${index}+${index === columns - 1 ? '<span class="marker" style="display:block;width:20px;height:20px;background:red"></span>' : ""}</td>`).join("")+ }</tr></tbody></table></div></div>`;+ const open = async (html: string, copyOnly = false) => {+ document.body.replaceChildren();+ content = html;+ captured = undefined;+ messages.length = 0;+ exported.exportImage("root", copyOnly);+ await waitForActions();+ return dialog.element.querySelector<HTMLElement>(".b3-dialog__content");+ };+ const verifyCaptured = async () => {+ check.ok(captured, "No PNG captured: " + messages.join("\n"));+ const image = new Image();+ const url = URL.createObjectURL(captured.blob);+ try {+ image.src = url;+ await image.decode();+ check.equal(image.naturalWidth, captured.width * window.devicePixelRatio);+ check.equal(image.naturalHeight, captured.height * window.devicePixelRatio);+ const canvas = document.createElement("canvas");+ canvas.width = image.naturalWidth;+ canvas.height = image.naturalHeight;+ const context = canvas.getContext("2d");+ context.drawImage(image, 0, 0);+ const pixel = context.getImageData(Math.floor(captured.x * 2), Math.floor(captured.y * 2), 1, 1).data;+ check.deepEqual(Array.from(pixel), [255, 0, 0, 255], `Last column was clipped (${engine}, mobile=${mobile})`);+ } finally {+ URL.revokeObjectURL(url);+ }+ };+ const capture = async (type = "copy") => {+ (dialog.element.querySelector(`[data-type="${type}"]`) as HTMLButtonElement).click();+ await waitForActions();+ await verifyCaptured();+ };+ for (const renderer of ["html", "modern"]) {+ engine = renderer;+ const narrow = await open(table(2, false));+ check.equal(narrow.querySelector<HTMLElement>(".export-img").style.minWidth, "");+ check.equal(narrow.scrollWidth, narrow.clientWidth);+ await capture();++ const wide = await open(table(4));+ const imageElement = wide.querySelector<HTMLElement>(".export-img");+ const cell = wide.querySelector("td");+ check.ok(wide.scrollWidth > wide.clientWidth, "Wide preview must scroll horizontally");+ check.equal(getComputedStyle(cell).fontSize, "16px");+ check.equal(getComputedStyle(wide.querySelector("table")).transform, "none");+ check.ok(wide.querySelector("table").getBoundingClientRect().right <= imageElement.getBoundingClientRect().right,+ "Image must cover the whole table");+ wide.scrollLeft = wide.scrollWidth - wide.clientWidth;+ const oldScroll = wide.scrollLeft;+ await capture();+ check.equal(wide.scrollLeft, oldScroll);+ check.equal(wide.style.overflow, "");+ imageElement.querySelector(".protyle-wysiwyg").innerHTML = table(1, false);+ dialog.resize();+ check.equal(imageElement.style.minWidth, "");++ const nested = await open(`<div class="sb" data-node-id="columns" data-sb-layout="col">${table(2)}${table(2)}</div>`);+ const nestedTables = nested.querySelectorAll("table");+ const firstTable = nestedTables[0].getBoundingClientRect();+ const secondTable = nestedTables[1].getBoundingClientRect();+ check.ok(firstTable.right <= secondTable.left || firstTable.bottom <= secondTable.top,+ "Tables in a super block must not overlap");+ await capture();++ const rtl = await open(table(4));+ rtl.querySelector<HTMLElement>(".protyle-wysiwyg").style.direction = "rtl";+ dialog.resize();+ const rtlTable = rtl.querySelector("table").getBoundingClientRect();+ const rtlImage = rtl.querySelector(".export-img").getBoundingClientRect();+ check.ok(rtlTable.left >= rtlImage.left && rtlTable.right <= rtlImage.right, "RTL table must fit inside the image");+ await capture();++ const large = await open(table(4));+ large.querySelector<HTMLElement>("table").style.width = "20000px";+ dialog.resize();+ (dialog.element.querySelector('[data-type="copy"]') as HTMLButtonElement).click();+ await waitForActions();+ check.equal(captured, undefined);+ check.ok(messages.includes("Image too large"), "Oversized image must show a size error");+ check.equal(large.style.overflow, "");+ large.querySelector<HTMLElement>("table").style.width = "";+ await capture();++ await open(table(4), true);+ await verifyCaptured();+ await open(table(4));+ await capture("export");++ const tall = await open(table(4).replace('class="table"', 'class="table" custom-pinthead="true"')+ .replace("<tr>", "<tr><td colspan=\"4\" style=\"height:1200px\">long content</td></tr><tr>"));+ check.equal(getComputedStyle(tall.querySelector(".table > div")).maxHeight, "none");+ tall.scrollTop = 200;+ const oldTop = tall.scrollTop;+ await capture();+ check.equal(tall.scrollTop, oldTop);+ }+ window.siyuan.storage.image.watermark = true;+ window.siyuan.config.export.imageWatermarkStr = "Watermark";+ const watermarked = await open(table(4));+ check.ok(watermarkWidth < watermarked.querySelector<HTMLElement>(".export-img").clientWidth / 3,+ "Watermark tiles must be bounded by the viewport");+ await capture();+ document.body.replaceChildren();+ return `Image exports passed (mobile=${mobile})`;+};++test("wide PNG exports preserve text and all columns in both screenshot engines and viewport sizes", {+ skip: process.platform === "linux" && !process.env.DISPLAY && !process.env.WAYLAND_DISPLAY,+ timeout: 60000,+}, async () => {+ const sass = require("sass");+ const css = sass.compileString('@use "component/dialog"; @use "protyle/wysiwyg"; ' ++ '@use "component/typography"; @use "business/export";', {+ loadPaths: [path.resolve("src/assets/scss")], logger: sass.Logger.silent,+ }).css + " .protyle-wysiwyg {font-size:16px;font-family:Arial} .b3-dialog__container {border:1px solid #ccc}";+ const compile = (file: string) => transpileModule(readFileSync(path.join(__dirname, file), "utf8"), {+ compilerOptions: {target: ScriptTarget.ES2021, module: ModuleKind.CommonJS},+ }).outputText;+ const layoutSource = compile("imageLayout.ts");+ const exportSource = compile("util.ts");+ const libraries = ["html-to-image.min.js", "modern-screenshot.min.js"].map(file =>+ readFileSync(path.resolve("stage/protyle/js", file), "utf8"));+ const mobileCSS = sass.compileString('@use "main/mobile";', {+ loadPaths: [path.resolve("src/assets/scss")], logger: sass.Logger.silent,+ }).css;+ const temporary = mkdtempSync(path.join(tmpdir(), "siyuan-export-image-"));+ const script = path.join(temporary, "run.cjs");+ writeFileSync(script, `const {app, BrowserWindow} = require("electron");+app.setPath("userData", ${JSON.stringify(path.join(temporary, "profile"))});+app.commandLine.appendSwitch("disable-gpu");+app.on("window-all-closed", () => {});+app.whenReady().then(async () => {+ let win;+ let phase;+ try {+ for (const mobile of [false, true]) {+ phase = "load viewport " + mobile;+ win = new BrowserWindow({show:false,width:mobile ? 390 : 1000,height:850,+ webPreferences:{nodeIntegration:true,contextIsolation:false}});+ await win.loadURL("data:text/html,<html><head></head><body></body></html>");+ await win.webContents.executeJavaScript(${JSON.stringify(`const style = document.createElement("style");+style.textContent = ${JSON.stringify(css)}; document.head.append(style);+${libraries.map(source => `new Function("module", "exports", ${JSON.stringify(source)})(undefined, undefined);`).join("\n")}`)});+ if (mobile) {+ phase = "mobile styles";+ await win.webContents.executeJavaScript(${JSON.stringify(`style.textContent += ${JSON.stringify(mobileCSS)};`)});+ }+ phase = "export cases " + mobile;+ console.log(await win.webContents.executeJavaScript(+ "const __name = value => value; (" + ${JSON.stringify(browserCases.toString())} + ")(" ++ ${JSON.stringify(JSON.stringify(layoutSource) + "," + JSON.stringify(exportSource))} + "," + mobile + ")"));+ win.destroy();+ }+ app.exit(0);+ } catch (error) {+ console.error(phase, error); if (win && !win.isDestroyed()) win.destroy(); app.exit(1);+ }+});`, "utf8");+ const env = {...process.env};+ delete env.ELECTRON_RUN_AS_NODE;+ try {+ const result = await promisify(execFile)(require("electron") as unknown as string, [script], {+ env, timeout: 55000, windowsHide: true,+ });+ assert.match(result.stdout, /Image exports passed \(mobile=false\)/);+ assert.match(result.stdout, /Image exports passed \(mobile=true\)/);+ } finally {+ rmSync(temporary, {recursive: true, force: true});+ }+});diff --git a/app/src/protyle/export/imageLayout.ts b/app/src/protyle/export/imageLayout.tsnew file mode 100644index 0000000000..f0d7416618--- /dev/null+++ b/app/src/protyle/export/imageLayout.ts@@ -0,0 +1,38 @@+const MAX_IMAGE_SIZE = 16384;+// 限制位图面积,避免单个 RGBA 画布占用超过 256 MiB。+const MAX_IMAGE_PIXELS = 64 * 1024 * 1024;++export const updateExportImageLayout = (imageElement: HTMLElement) => {+ const scrollElement = imageElement.parentElement;+ const scrollLeft = scrollElement.scrollLeft;+ imageElement.style.minWidth = "";+ const previewElement = imageElement.querySelector<HTMLElement>(".protyle-wysiwyg");+ const overflowWidth = Math.max(0, previewElement.scrollWidth - previewElement.clientWidth);+ if (overflowWidth > 0) {+ imageElement.style.minWidth = `${Math.ceil(imageElement.getBoundingClientRect().width + overflowWidth)}px`;+ }+ scrollElement.scrollLeft = scrollLeft;+};++export const getExportImageSize = (contentElement: HTMLElement) => {+ const imageElement = contentElement.querySelector<HTMLElement>(".export-img");+ const style = getComputedStyle(contentElement);+ const imageStyle = getComputedStyle(imageElement);+ const borderWidth = parseFloat(style.borderLeftWidth) + parseFloat(style.borderRightWidth);+ const borderHeight = parseFloat(style.borderTopWidth) + parseFloat(style.borderBottomWidth);+ return {+ width: Math.ceil(Math.max(contentElement.clientWidth, imageElement.getBoundingClientRect().width ++ parseFloat(imageStyle.marginLeft) + parseFloat(imageStyle.marginRight) ++ parseFloat(style.paddingLeft) + parseFloat(style.paddingRight)) + borderWidth),+ height: Math.ceil(imageElement.getBoundingClientRect().height ++ parseFloat(imageStyle.marginTop) + parseFloat(imageStyle.marginBottom) ++ parseFloat(style.paddingTop) + parseFloat(style.paddingBottom) + borderHeight),+ };+};++export const isExportImageSizeSupported = (size: {width: number, height: number}, pixelRatio: number) => {+ const width = Math.ceil(size.width * pixelRatio);+ const height = Math.ceil(size.height * pixelRatio);+ return Number.isFinite(width) && Number.isFinite(height) && width > 0 && height > 0 &&+ width <= MAX_IMAGE_SIZE && height <= MAX_IMAGE_SIZE && width * height <= MAX_IMAGE_PIXELS;+};diff --git a/app/src/protyle/export/util.ts b/app/src/protyle/export/util.tsindex 20d2dc27ab..1bebc86b6d 100644--- a/app/src/protyle/export/util.ts+++ b/app/src/protyle/export/util.ts@@ -16,11 +16,7 @@ import {isInAndroid, isIPad, isIPhone, isSafari, saveExportFile, setStorageVal}import {useShell} from "../../util/pathName";import {getHostCapabilities, sanitizeKernelHTML} from "../../util/hostCapabilities";import {copyPNGByLink, writePNGBlob} from "../../menus/util";--// WebKit/Chromium 会拒绝宽度或高度超过此限制的 canvas,导致生成空白图像。-// html-to-image 默认会进行限制,而 modern-screenshot 不会(maximumCanvasSize-// 默认为 0,即无限制),因此处理长文档时需要显式传入该参数。-const MAX_CANVAS_SIZE = 16384;+import {getExportImageSize, isExportImageSizeSupported, updateExportImageLayout} from "./imageLayout";const IMAGE_PLACEHOLDER = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=";@@ -78,6 +74,7 @@ export const exportImage = (id: string, copyOnly = false) => {width: isMobile() ? "92vw" : "990px",height: "70vh",resizeCallback() {+ updateExportImageLayout(exportDialog.element.querySelector(".export-img"));previewElement.querySelectorAll(".code-block .protyle-linenumber__rows").forEach((item: HTMLElement) => {if ((item.nextElementSibling as HTMLElement).style.wordBreak === "break-word") {lineNumberRender(item.parentElement);@@ -133,21 +130,38 @@ export const exportImage = (id: string, copyOnly = false) => {await new Promise((resolve) => {setTimeout(resolve, Constants.TIMEOUT_LOAD);});+ await document.fonts.ready;+ await Promise.all(Array.from(previewElement.querySelectorAll("img")).map(item => {+ item.loading = "eager";+ return item.decode().catch(() => {});+ }));+ updateExportImageLayout(exportDialog.element.querySelector(".export-img"));+ const contentElement = exportDialog.element.querySelector<HTMLElement>(".b3-dialog__content");+ const size = getExportImageSize(contentElement);+ const pixelRatio = window.devicePixelRatio || 1;+ if (!isExportImageSizeSupported(size, pixelRatio)) {+ throw new Error(window.siyuan.languages.exportImageTooLarge);+ }+ // 截图克隆完整内容区,预览窗口保持原有宽度和滚动位置。+ const style = {boxSizing: "border-box", overflow: "hidden"};if (isIPhone() || isIPad() || isSafari()) {// modern-screenshot 通过缓存默认样式提高 WebKit/WKWebView 环境下的导出性能。await addScript(`${Constants.PROTYLE_CDN}/js/modern-screenshot.min.js?v=4.6.6`, "protyleModernScreenshot");return window.modernScreenshot.domToBlob(- exportDialog.element.querySelector(".b3-dialog__content") as HTMLElement, {+ contentElement, {+ ...size,+ style,type: "image/png",- // 默认为 1,会导致高清屏上导出的图片比 html-to-image 模糊- scale: window.devicePixelRatio || 1,- maximumCanvasSize: MAX_CANVAS_SIZE,+ scale: pixelRatio,fetch: {placeholderImage: IMAGE_PLACEHOLDER}});}await addScript(`${Constants.PROTYLE_CDN}/js/html-to-image.min.js?v=1.11.13`, "protyleHtml2image");return window.htmlToImage.toBlob(- exportDialog.element.querySelector(".b3-dialog__content") as HTMLElement, {+ contentElement, {+ ...size,+ style,+ pixelRatio,imagePlaceholder: IMAGE_PLACEHOLDER,onImageErrorHandler: (event: Event) => {(event.target as HTMLImageElement).src = IMAGE_PLACEHOLDER;@@ -161,19 +175,6 @@ export const exportImage = (id: string, copyOnly = false) => {outputting = true;setActionDisabled(true);const msgId = showMessage(window.siyuan.languages.exporting, 0);- const containerElement = exportDialog.element.querySelector(".b3-dialog__container") as HTMLElement;- const oldHeight = containerElement.style.height;- const oldMaxHeight = containerElement.style.maxHeight;- const oldWidth = containerElement.style.width;- // 导出时让内容完整展开,避免移动端对话框的最大高度限制截断长图。- containerElement.style.height = "";- containerElement.style.maxHeight = "none";- /// #if MOBILE- containerElement.style.width = "100vw";- /// #endif- const contentElement = exportDialog.element.querySelector(".b3-dialog__content") as HTMLElement;- const oldOverflow = contentElement.style.overflow;- contentElement.style.overflow = "hidden";if (!copyOnly) {setStorageVal(Constants.LOCAL_EXPORTIMG, window.siyuan.storage[Constants.LOCAL_EXPORTIMG]);}@@ -213,10 +214,6 @@ export const exportImage = (id: string, copyOnly = false) => {} finally {outputting = false;if (document.body.contains(exportDialog.element)) {- containerElement.style.height = oldHeight;- containerElement.style.maxHeight = oldMaxHeight;- containerElement.style.width = oldWidth;- contentElement.style.overflow = oldOverflow;setActionDisabled(false);}}@@ -288,7 +285,9 @@ export const exportImage = (id: string, copyOnly = false) => {watermarkPreviewElement.setAttribute("style", `background-image: url(${window.siyuan.config.export.imageWatermarkStr});background-repeat: repeat;position: absolute;top: 0;left: 0;width: 100%;height: 100%;border-radius: var(--b3-border-radius-b);`);} else {await addScript(`${Constants.PROTYLE_CDN}/js/html-to-image.min.js?v=1.11.13`, "protyleHtml2image");- const width = Math.max(exportDialog.element.querySelector(".export-img").clientWidth / 3, 150);+ const imageElement = exportDialog.element.querySelector(".export-img");+ const contentElement = exportDialog.element.querySelector(".b3-dialog__content");+ const width = Math.max(Math.min(imageElement.clientWidth, contentElement.clientWidth) / 3, 150);watermarkPreviewElement.setAttribute("style", `width: ${width}px;height: ${width}px;display: flex;justify-content: center;align-items: center;color: var(--b3-border-color);font-size: 14px;`);watermarkPreviewElement.innerHTML = sanitizeKernelHTML(`<div style="transform: rotate(-45deg)">${window.siyuan.config.export.imageWatermarkStr}</div>`);const canvas = await window.htmlToImage.toCanvas(watermarkPreviewElement);@@ -326,12 +325,7 @@ export const exportImage = (id: string, copyOnly = false) => {});processRender(previewElement);highlightRender(previewElement);- previewElement.querySelectorAll("table").forEach((item: HTMLElement) => {- if (item.clientWidth > item.parentElement.clientWidth) {- item.setAttribute("style", `margin-bottom:${item.parentElement.clientWidth * item.clientHeight / item.clientWidth - item.parentElement.clientHeight + 1}px;transform: scale(${item.parentElement.clientWidth / item.clientWidth});transform-origin: top left;`);- item.parentElement.style.overflow = "hidden";- }- });+ updateExportImageLayout(exportDialog.element.querySelector(".export-img"));await updateWatermark();if (revision !== previewRevision) {