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

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

Browse source
This commit is contained in:
Vanessa 2023-12-27 22:53:25 +08:00
parent df0e273a50
commit cc7b68b6e2
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/config/exportConfig.ts
View file

@ -197,7 +197,7 @@ export const exportConfig = {
setexprt(); setexprt();
}); });
}); });
exportConfig.element.querySelectorAll("input").forEach((item) => { exportConfig.element.querySelectorAll("input, textarea").forEach((item) => {
if (item.id == "importData") { if (item.id == "importData") {
item.addEventListener("change", (event: InputEvent & { target: HTMLInputElement }) => { item.addEventListener("change", (event: InputEvent & { target: HTMLInputElement }) => {
const formData = new FormData(); const formData = new FormData();

29
app/src/protyle/export/util.ts
View file

@ -105,22 +105,27 @@ export const exportImage = (id: string) => {
}); });
const updateWatermark = () => { const updateWatermark = () => {
const watermarkPreviewElement = exportDialog.element.querySelector(".export-img__watermark") as HTMLElement; const watermarkPreviewElement = exportDialog.element.querySelector(".export-img__watermark") as HTMLElement;
watermarkPreviewElement.innerHTML = "";
if (watermarkElement.checked) { if (watermarkElement.checked) {
if (window.siyuan.config.export.imageWatermarkDesc) { if (window.siyuan.config.export.imageWatermarkDesc) {
watermarkPreviewElement.setAttribute("style", window.siyuan.config.export.imageWatermarkDesc) watermarkPreviewElement.innerHTML = window.siyuan.config.export.imageWatermarkDesc;
} else if (window.siyuan.config.export.imageWatermarkStr) { } else if (window.siyuan.config.export.imageWatermarkStr) {
addScript("/stage/protyle/js/html2canvas.min.js?v=1.4.1", "protyleHtml2canvas").then(() => { if (window.siyuan.config.export.imageWatermarkStr.startsWith("http")) {
const width = Math.max(exportDialog.element.querySelector('.export-img').clientWidth / 3, 150); 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);`)
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;`) } else {
watermarkPreviewElement.innerHTML = `<div style="transform: rotate(-45deg)">${window.siyuan.config.export.imageWatermarkStr}</div>`; addScript("/stage/protyle/js/html2canvas.min.js?v=1.4.1", "protyleHtml2canvas").then(() => {
window.html2canvas(watermarkPreviewElement, { const width = Math.max(exportDialog.element.querySelector('.export-img').clientWidth / 3, 150);
useCORS: true, 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;`)
scale: 1, watermarkPreviewElement.innerHTML = `<div style="transform: rotate(-45deg)">${window.siyuan.config.export.imageWatermarkStr}</div>`;
}).then((canvas) => { window.html2canvas(watermarkPreviewElement, {
watermarkPreviewElement.innerHTML = ""; useCORS: true,
watermarkPreviewElement.setAttribute("style", `background-image: url(${canvas.toDataURL("image/png")});background-repeat: repeat;position: absolute;top: 0;left: 0;width: 100%;height: 100%;border-radius: var(--b3-border-radius-b);`) scale: 1,
}).then((canvas) => {
watermarkPreviewElement.innerHTML = "";
watermarkPreviewElement.setAttribute("style", `background-image: url(${canvas.toDataURL("image/png")});background-repeat: repeat;position: absolute;top: 0;left: 0;width: 100%;height: 100%;border-radius: var(--b3-border-radius-b);`)
});
}); });
}); }
} }
} else { } else {
watermarkPreviewElement.removeAttribute("style"); watermarkPreviewElement.removeAttribute("style");