From 6ec5831f24f9596c71da1a5ae45fa1036b158ef1 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 18 Oct 2024 16:44:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20=E3=80=90=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=B8=AD=E5=BF=83=E3=80=91=E6=96=87=E4=BB=B6=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E4=BD=93=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visualized/data/dataset/ExportExcel.vue | 17 ++--------------- .../java/io/dataease/utils/WhitelistUtils.java | 1 + 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue index 781efcedea..8f58f11960 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue @@ -288,22 +288,9 @@ const timestampFormatDate = value => { } return new Date(value).toLocaleString() } +import { PATH_URL } from '@/config/axios/service' const downloadClick = item => { - downloadFile(item.id) - .then(res => { - const blob = new Blob([res], { type: 'application/vnd.ms-excel' }) - const link = document.createElement('a') - link.style.display = 'none' - link.href = URL.createObjectURL(blob) - link.download = item.fileName // 下载的文件名 - document.body.appendChild(link) - link.click() - document.body.removeChild(link) - URL.revokeObjectURL(link.href) - }) - .finally(() => { - exportDatasetLoading.value = false - }) + window.open(PATH_URL + '/exportCenter/download/' + item.id, '_blank') } const retry = item => { diff --git a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java index d2742fafd8..bea3a69223 100644 --- a/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java +++ b/sdk/common/src/main/java/io/dataease/utils/WhitelistUtils.java @@ -72,6 +72,7 @@ public class WhitelistUtils { || StringUtils.startsWithAny(requestURI, "/typeface/download") || StringUtils.startsWithAny(requestURI, "/typeface/defaultFont") || StringUtils.startsWithAny(requestURI, "/typeface/listFont") + || StringUtils.startsWithAny(requestURI, "/exportCenter/download") || StringUtils.startsWithAny(requestURI, "/communicate/image/") || StringUtils.startsWithAny(requestURI, "/communicate/down/"); }