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 0b3f9f379a..68a866f5b0 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 @@ -142,6 +142,10 @@ public class ExportCenterManage { } } + public String exportLimit() { + return String.valueOf(limit); + } + public void download(String id, HttpServletResponse response) throws Exception { CoreExportTask exportTask = exportTaskMapper.selectById(id); OutputStream outputStream = response.getOutputStream(); @@ -267,6 +271,9 @@ public class ExportCenterManage { if (exportTaskDTO.getExportFromType().equalsIgnoreCase("chart")) { exportTaskDTO.setExportFromName(coreChartViewMapper.selectById(exportTaskDTO.getExportFrom()).getTitle()); } + if (exportTaskDTO.getExportFromType().equalsIgnoreCase("dataset")) { + exportTaskDTO.setExportFromName(coreDatasetGroupMapper.selectById(exportTaskDTO.getExportFrom()).getName()); + } } private String hostName() { diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/server/ExportCenterServer.java b/core/core-backend/src/main/java/io/dataease/exportCenter/server/ExportCenterServer.java index d3f180a7c6..52c2b20574 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/server/ExportCenterServer.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/server/ExportCenterServer.java @@ -47,4 +47,8 @@ public class ExportCenterServer implements ExportCenterApi { public void retry(String id) { exportCenterManage.retry(id); } + + public String exportLimit() { + return exportCenterManage.exportLimit(); + } } diff --git a/core/core-frontend/src/api/dataset.ts b/core/core-frontend/src/api/dataset.ts index f013b8ca14..68defbb30b 100644 --- a/core/core-frontend/src/api/dataset.ts +++ b/core/core-frontend/src/api/dataset.ts @@ -130,6 +130,12 @@ export const exportDatasetData = async (data): Promise => { }) } +export const exportLimit = async (): Promise => { + return request.post({ url: `/exportCenter/exportLimit`, data: {} }).then(res => { + return res?.data + }) +} + export const perDelete = async (id): Promise => { return request.post({ url: `/datasetTree/perDelete/${id}`, data: {} }).then(res => { return res?.data 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 e95b6aae84..2d3d5ce436 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/index.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue @@ -37,7 +37,8 @@ import { getDatasetPreview, barInfoApi, perDelete, - exportDatasetData + exportDatasetData, + exportLimit } from '@/api/dataset' import EmptyBackground from '@/components/empty-background/src/EmptyBackground.vue' import DeResourceGroupOpt from '@/views/common/DeResourceGroupOpt.vue' @@ -85,6 +86,7 @@ const rootManage = ref(false) const showExport = ref(false) const rowAuth = ref() const exportDatasetLoading = ref(false) +const limit = ref('10万') const exportForm = ref({}) const table = ref({}) const exportFormRef = ref() @@ -313,6 +315,7 @@ onBeforeMount(() => { nodeInfo.id = (route.params.id as string) || (route.query.id as string) || '' loadInit() getData() + getLimit() }) const columns = shallowRef([]) @@ -678,6 +681,12 @@ const loadInit = () => { } } +const getLimit = () => { + exportLimit().then(res => { + limit.value = res + }) +} + const sortTypeTip = computed(() => { return sortList.find(ele => ele.value === state.curSortType).name }) @@ -916,18 +925,18 @@ const getMenuList = (val: boolean) => { {{ t('data_set.new_data_screen') }} + + + 数据集导出 + {{ t('visualization.edit') }} - - - 数据集导出 -
@@ -1063,7 +1072,7 @@ const getMenuList = (val: boolean) => {
- 提示:最多支持导出10万条数据 + 提示:最多支持导出{{ limit }}条数据