From ca70d0b7213ce3129f6b50f205f4c2bbad8f8def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?= <42510293+ziyujiahao@users.noreply.github.com> Date: Thu, 4 Dec 2025 10:30:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=A9=BA=E7=99=BD=E9=97=AE=E9=A2=98=20(#1753?= =?UTF-8?q?0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/utils/imgUtils.ts | 15 +++---------- .../views/dashboard/DashboardPreviewShow.vue | 2 +- .../views/data-visualization/PreviewShow.vue | 22 ++++++------------- 3 files changed, 11 insertions(+), 28 deletions(-) diff --git a/core/core-frontend/src/utils/imgUtils.ts b/core/core-frontend/src/utils/imgUtils.ts index 5835f9583a..6ca659d48a 100644 --- a/core/core-frontend/src/utils/imgUtils.ts +++ b/core/core-frontend/src/utils/imgUtils.ts @@ -6,7 +6,6 @@ import { storeToRefs } from 'pinia' import { findResourceAsBase64 } from '@/api/staticResource' import FileSaver from 'file-saver' import { deepCopy } from '@/utils/utils' -import { toPng } from 'html-to-image' import { domToPng } from 'modern-screenshot' const embeddedStore = useEmbedded() const dvMainStore = dvMainStoreWithOut() @@ -36,15 +35,7 @@ export function imgUrlTrans(url) { } } -export function download2AppTemplate( - downloadType, - canvasDom, - name, - attachParams, - componentDataSource = componentData.value, - canvasStyleDataSource = canvasStyleData.value, - callBack? -) { +export function download2AppTemplate(downloadType, canvasDom, name, attachParams, callBack?) { try { findStaticSource(function (staticResource) { html2canvas(canvasDom).then(canvas => { @@ -61,8 +52,8 @@ export function download2AppTemplate( dvType: dvInfo.value.type, nodeType: downloadType, version: 3, - canvasStyleData: JSON.stringify(canvasStyleDataSource), - componentData: JSON.stringify(componentDataSource), + canvasStyleData: JSON.stringify(canvasStyleData.value), + componentData: JSON.stringify(componentData.value), dynamicData: JSON.stringify(canvasViewDataTemplate), staticResource: JSON.stringify(staticResource || {}), appData: attachParams ? JSON.stringify(attachParams) : null diff --git a/core/core-frontend/src/views/dashboard/DashboardPreviewShow.vue b/core/core-frontend/src/views/dashboard/DashboardPreviewShow.vue index 19c56a470a..5b76b0f7d2 100644 --- a/core/core-frontend/src/views/dashboard/DashboardPreviewShow.vue +++ b/core/core-frontend/src/views/dashboard/DashboardPreviewShow.vue @@ -191,7 +191,7 @@ const fileDownload = (downloadType, attachParams) => { downloadStatus.value = true nextTick(() => { const vueDom = previewCanvasContainer.value.querySelector('.canvas-container') - download2AppTemplate(downloadType, vueDom, state.dvInfo.name, attachParams, null, null, () => { + download2AppTemplate(downloadType, vueDom, state.dvInfo.name, attachParams, () => { downloadStatus.value = false const param = { id: state.dvInfo.id, diff --git a/core/core-frontend/src/views/data-visualization/PreviewShow.vue b/core/core-frontend/src/views/data-visualization/PreviewShow.vue index fe26ad6d79..c8176c57c4 100644 --- a/core/core-frontend/src/views/data-visualization/PreviewShow.vue +++ b/core/core-frontend/src/views/data-visualization/PreviewShow.vue @@ -139,22 +139,14 @@ const fileDownload = (downloadType, attachParams) => { downloadStatus.value = true nextTick(() => { const vueDom = previewCanvasContainer.value.querySelector('.canvas-container') - download2AppTemplate( - downloadType, - vueDom, - state.dvInfo.name, - attachParams, - state.canvasDataPreviewSource, - state.canvasStylePreviewSource, - () => { - downloadStatus.value = false - const param = { - id: state.dvInfo.id, - type: state.dvInfo.type === 'dashboard' ? 'panel' : 'screen' - } - downloadType === 'app' ? exportLogApp(param) : exportLogTemplate(param) + download2AppTemplate(downloadType, vueDom, state.dvInfo.name, attachParams, () => { + downloadStatus.value = false + const param = { + id: state.dvInfo.id, + type: state.dvInfo.type === 'dashboard' ? 'panel' : 'screen' } - ) + downloadType === 'app' ? exportLogApp(param) : exportLogTemplate(param) + }) }) }