diff --git a/app/src/assets/scss/business/_export.scss b/app/src/assets/scss/business/_export.scss index bc7f23f28..129ae9fc8 100644 --- a/app/src/assets/scss/business/_export.scss +++ b/app/src/assets/scss/business/_export.scss @@ -12,5 +12,10 @@ border: 1px solid var(--b3-list-hover); box-sizing: border-box; } + + .table th, + .table td { + background-color: transparent; + } } } diff --git a/app/src/protyle/export/util.ts b/app/src/protyle/export/util.ts index 38c4addb5..ad6234862 100644 --- a/app/src/protyle/export/util.ts +++ b/app/src/protyle/export/util.ts @@ -111,10 +111,11 @@ export const exportImage = (id: string) => { } else if (window.siyuan.config.export.imageWatermarkStr) { addScript("/stage/protyle/js/html2canvas.min.js?v=1.4.1", "protyleHtml2canvas").then(() => { const width = Math.max(exportDialog.element.querySelector('.export-img').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: 12px;`) + 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 = `
${window.siyuan.config.export.imageWatermarkStr}
`; window.html2canvas(watermarkPreviewElement, { - useCORS: true + useCORS: true, + 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);`) diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index e268f2e7f..69550064f 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -157,7 +157,8 @@ interface Window { siyuan: ISiyuan webkit: any html2canvas: (element: Element, opitons: { - useCORS: boolean + useCORS: boolean, + scale?: number }) => Promise; JSAndroid: { returnDesktop(): void