From cb2025164e0d087fc3e286c05fdb12ebdc401ba0 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 26 Jun 2024 15:58:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=97=B6=E6=95=B0=E6=8D=AE=E6=BA=90=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/datasource/server/DatasourceServer.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java index 33697e9c02..b0e0c8062f 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java @@ -688,9 +688,7 @@ public class DatasourceServer implements DatasourceApi { wrapper.eq("id", coreDatasource.getId()); CoreDatasource originData = datasourceMapper.selectById(coreDatasource.getId()); String originStatus = originData.getStatus(); - if (!StringUtils.equals(coreDatasource.getStatus(), originStatus)) { - dataSourceManage.innerEditStatus(coreDatasource); - } + dataSourceManage.innerEditStatus(coreDatasource); } datasourceDTO.setConfiguration(""); return datasourceDTO; From 689f4949d3dbc963b8857bd1d5e4fed5c28bc4c1 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 26 Jun 2024 17:42:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=97=B6=E6=95=B0=E6=8D=AE=E6=BA=90=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visualization/ComponentEditBar.vue | 2 +- .../visualization/UserViewEnlarge.vue | 2 +- .../src/layout/components/Header.vue | 8 ++- .../visualized/data/dataset/ExportExcel.vue | 58 ++++++++++++------- .../datasource/form/ApiHttpRequestDraw.vue | 16 ++++- 5 files changed, 58 insertions(+), 28 deletions(-) diff --git a/core/core-frontend/src/components/visualization/ComponentEditBar.vue b/core/core-frontend/src/components/visualization/ComponentEditBar.vue index 65e3e8e5a4..1fd9f132a4 100644 --- a/core/core-frontend/src/components/visualization/ComponentEditBar.vue +++ b/core/core-frontend/src/components/visualization/ComponentEditBar.vue @@ -366,7 +366,7 @@ const openMessageLoading = cb => { } const callbackExport = () => { - useEmitt().emitter.emit('data-export-center') + useEmitt().emitter.emit('data-export-center', { activeName: 'IN_PROGRESS' }) } const exportAsExcel = () => { diff --git a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue index 7ae698b3e6..c3320099f6 100644 --- a/core/core-frontend/src/components/visualization/UserViewEnlarge.vue +++ b/core/core-frontend/src/components/visualization/UserViewEnlarge.vue @@ -264,7 +264,7 @@ const downloadViewDetails = () => { } const exportData = () => { - useEmitt().emitter.emit('data-export-center') + useEmitt().emitter.emit('data-export-center', { activeName: 'IN_PROGRESS' }) } const openMessageLoading = cb => { diff --git a/core/core-frontend/src/layout/components/Header.vue b/core/core-frontend/src/layout/components/Header.vue index 438059632f..c3b3c44047 100644 --- a/core/core-frontend/src/layout/components/Header.vue +++ b/core/core-frontend/src/layout/components/Header.vue @@ -45,8 +45,8 @@ const activeIndex = computed(() => { const permissionStore = usePermissionStore() const ExportExcelRef = ref() -const downloadClick = () => { - ExportExcelRef.value.init() +const downloadClick = params => { + ExportExcelRef.value.init(params) } const routers: any[] = formatRoute(permissionStore.getRoutersNotHidden as AppCustomRouteRecordRaw[]) const showSystem = ref(false) @@ -94,7 +94,9 @@ onMounted(() => { initAiBase() useEmitt({ name: 'data-export-center', - callback: downloadClick + callback: function (params) { + ExportExcelRef.value.init(params) + } }) }) 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 b73bc0f088..f1bff61bc7 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue @@ -105,8 +105,11 @@ const handleClick = tab => { }) } -const init = () => { +const init = params => { drawer.value = true + if (params && params.activeName !== undefined) { + activeName.value = params.activeName + } handleClick() timer = setInterval(() => { if (activeName.value === 'IN_PROGRESS') { @@ -150,12 +153,16 @@ const taskExportTopicCall = task => { openMessageLoading( JSON.parse(task).exportFromName + ' 导出成功，前往', 'success', - callbackExport + callbackExportSuc ) return } if (JSON.parse(task).exportStatus === 'FAILED') { - openMessageLoading(JSON.parse(task).exportFromName + ' 导出失败，前往', 'error', callbackExport) + openMessageLoading( + JSON.parse(task).exportFromName + ' 导出失败，前往', + 'error', + callbackExportError + ) } } @@ -185,8 +192,12 @@ const openMessageLoading = (text, type = 'success', cb) => { }) } -const callbackExport = () => { - useEmitt().emitter.emit('data-export-center') +const callbackExportError = () => { + useEmitt().emitter.emit('data-export-center', { activeName: 'FAILED' }) +} + +const callbackExportSuc = () => { + useEmitt().emitter.emit('data-export-center', { activeName: 'SUCCESS' }) } const downLoadAll = () => { @@ -424,17 +435,20 @@ defineExpose({