Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-29 04:48:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 fix https://github.com/siyuan-note/siyuan/issues/10186

Browse source
This commit is contained in:
Vanessa 2024-01-15 23:44:28 +08:00
parent 7d57bd07e7
commit 7c613e5798
3 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/assets/scss/component/_typography.scss
View file

@ -386,6 +386,9 @@
[data-subtype="mermaid"] {
overflow: auto;
// https://github.com/siyuan-note/siyuan/issues/10186
min-height: 32px;
display: table;
}
[data-subtype="plantuml"] img {

33
app/src/protyle/export/index.ts
View file

@ -129,6 +129,7 @@ const renderPDF = (id: string) => {
position: absolute;
right: 232px;
left: 0;
box-sizing: border-box;
}
#preview.exporting {
@ -256,8 +257,7 @@ const renderPDF = (id: string) => {
<button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
</div>
</div>
<div style="zoom:${localData.scale || 1}" class="protyle-wysiwyg${window.siyuan.config.editor.displayBookmarkIcon ? " protyle-wysiwyg--attr" : ""}"
id="preview">
<div style="zoom:${localData.scale || 1}" id="preview">
<div class="fn__loading" style="left:0"><img width="48px" src="${servePath}/stage/loading-pure.svg"></div>
</div>
<script src="${servePath}/appearance/icons/${window.siyuan.config.appearance.icon}/icon.js?${Constants.SIYUAN_VERSION}"></script>
@ -372,28 +372,29 @@ id="preview">
})
}
const renderPreview = (data) => {
previewElement.innerHTML = data.content;
previewElement.setAttribute("data-doc-type", data.type || "NodeDocument");
previewElement.innerHTML = '<div style="padding:0" class="protyle-wysiwyg${window.siyuan.config.editor.displayBookmarkIcon ? " protyle-wysiwyg--attr" : ""}">' + data.content + '</div>';
const wysElement = previewElement.querySelector(".protyle-wysiwyg");
wysElement.setAttribute("data-doc-type", data.type || "NodeDocument");
if (data.attrs.memo) {
previewElement.setAttribute("memo", data.attrs.memo);
wysElement.setAttribute("memo", data.attrs.memo);
}
if (data.attrs.name) {
previewElement.setAttribute("name", data.attrs.name);
wysElement.setAttribute("name", data.attrs.name);
}
if (data.attrs.bookmark) {
previewElement.setAttribute("bookmark", data.attrs.bookmark);
wysElement.setAttribute("bookmark", data.attrs.bookmark);
}
if (data.attrs.alias) {
previewElement.setAttribute("alias", data.attrs.alias);
wysElement.setAttribute("alias", data.attrs.alias);
}
Protyle.mermaidRender(previewElement, "${servePath}/stage/protyle");
Protyle.flowchartRender(previewElement, "${servePath}/stage/protyle");
Protyle.graphvizRender(previewElement, "${servePath}/stage/protyle");
Protyle.chartRender(previewElement, "${servePath}/stage/protyle");
Protyle.mindmapRender(previewElement, "${servePath}/stage/protyle");
Protyle.abcRender(previewElement, "${servePath}/stage/protyle");
Protyle.htmlRender(previewElement);
Protyle.plantumlRender(previewElement, "${servePath}/stage/protyle");
Protyle.mermaidRender(wysElement, "${servePath}/stage/protyle");
Protyle.flowchartRender(wysElement, "${servePath}/stage/protyle");
Protyle.graphvizRender(wysElement, "${servePath}/stage/protyle");
Protyle.chartRender(wysElement, "${servePath}/stage/protyle");
Protyle.mindmapRender(wysElement, "${servePath}/stage/protyle");
Protyle.abcRender(wysElement, "${servePath}/stage/protyle");
Protyle.htmlRender(wysElement);
Protyle.plantumlRender(wysElement, "${servePath}/stage/protyle");
}
fetchPost("/api/export/exportPreviewHTML", {
id: "${id}",

2
app/src/protyle/scroll/index.ts
View file

@ -97,7 +97,7 @@ export class Scroll {
if (protyle.block.showAll) {
this.element.classList.add("fn__none");
} else {
if (protyle.block.scroll) {
if (protyle.block.scroll && !protyle.contentElement.classList.contains("fn__none")) {
this.element.classList.remove("fn__none");
} else {
this.element.classList.add("fn__none");