From 8f965a7717004b0abe50f7e610841f524edd5e42 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 18 Nov 2024 18:52:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E3=80=91=E5=BC=80=E6=BA=90=E7=89=88=E5=A4=A7=E4=BA=8E10w?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=99=BD=E7=84=B6=E6=97=A0=E6=B3=95=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E4=BD=86=E6=98=AF=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=BB=BA=E8=AE=AE=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=AD=A4=E5=A4=84=EF=BC=8C=E5=87=8F=E5=B0=91=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=B6=88=E8=80=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/exportCenter/manage/ExportCenterManage.java | 3 ++- core/core-frontend/src/api/dataset.ts | 5 ++--- .../src/views/visualized/data/dataset/index.vue | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java index 760bf05bb1..8a33f1c07f 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java @@ -349,7 +349,8 @@ public class ExportCenterManage implements BaseExportApi { startViewTask(exportTask, request); } - public void addTask(Long exportFrom, String exportFromType, DataSetExportRequest request) { + public void addTask(Long exportFrom, String exportFromType, DataSetExportRequest request)throws Exception{ + datasetGroupManage.getDatasetGroupInfoDTO(exportFrom, null); CoreExportTask exportTask = new CoreExportTask(); exportTask.setId(UUID.randomUUID().toString()); exportTask.setUserId(AuthUtils.getUser().getUserId()); diff --git a/core/core-frontend/src/api/dataset.ts b/core/core-frontend/src/api/dataset.ts index fe8c87b3db..d89f0e7756 100644 --- a/core/core-frontend/src/api/dataset.ts +++ b/core/core-frontend/src/api/dataset.ts @@ -120,13 +120,12 @@ export const delDatasetTree = async (id): Promise => { }) } -export const exportDatasetData = async (data): Promise => { +export const exportDatasetData = (data = {}) => { return request.post({ url: '/datasetTree/exportDataset', method: 'post', data: data, - loading: true, - responseType: 'blob' + loading: true }) } diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue index 02ec4878f8..adcf38faa9 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/index.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue @@ -394,7 +394,11 @@ const save = ({ logic, items, errorMessage }) => { exportDatasetLoading.value = true exportDatasetData(table.value) .then(res => { - openMessageLoading(exportData) + if (res.code === 0) { + openMessageLoading(exportData) + } else { + ElMessage.error(res.msg) + } }) .finally(() => { exportDatasetLoading.value = false