center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 修复数据导出中心没有所属组织

Browse Source
This commit is contained in:
taojinlong 2024-06-26 19:18:27 +08:00
parent 689f4949d3
commit 46953c144a
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
View File

@ -12,6 +12,7 @@ import io.dataease.chart.server.ChartDataServer;
import io.dataease.exception.DEException; import io.dataease.exception.DEException;
import io.dataease.exportCenter.dao.auto.entity.CoreExportTask; import io.dataease.exportCenter.dao.auto.entity.CoreExportTask;
import io.dataease.exportCenter.dao.auto.mapper.CoreExportTaskMapper; import io.dataease.exportCenter.dao.auto.mapper.CoreExportTaskMapper;
import io.dataease.license.config.XpackInteract;
import io.dataease.system.manage.SysParameterManage; import io.dataease.system.manage.SysParameterManage;
import io.dataease.utils.*; import io.dataease.utils.*;
import io.dataease.visualization.server.DataVisualizationServer; import io.dataease.visualization.server.DataVisualizationServer;
@ -177,14 +178,11 @@ public class ExportCenterManage {
exportTasks.forEach(exportTask -> { exportTasks.forEach(exportTask -> {
ExportTaskDTO exportTaskDTO = new ExportTaskDTO(); ExportTaskDTO exportTaskDTO = new ExportTaskDTO();
BeanUtils.copyBean(exportTaskDTO, exportTask); BeanUtils.copyBean(exportTaskDTO, exportTask);
if (status.equalsIgnoreCase("ALL")) { if (status.equalsIgnoreCase("ALL") || status.equalsIgnoreCase(exportTaskDTO.getExportStatus())) {
setExportFromAbsName(exportTaskDTO); setExportFromAbsName(exportTaskDTO);
} }
if (status.equalsIgnoreCase(exportTaskDTO.getExportStatus())) { if (status.equalsIgnoreCase("ALL") || status.equalsIgnoreCase(exportTaskDTO.getExportStatus())) {
setExportFromAbsName(exportTaskDTO); proxy().setOrg(exportTaskDTO);
}
if (status.equalsIgnoreCase(exportTaskDTO.getExportStatus())) {
setOrgName(exportTaskDTO);
} }
result.add(exportTaskDTO); result.add(exportTaskDTO);
}); });
@ -192,10 +190,11 @@ public class ExportCenterManage {
return result; return result;
} }
private void setOrgName(ExportTaskDTO exportTaskDTO) { @XpackInteract(value = "exportCenter", before = false)
if (exportTaskDTO.getExportFromType().equalsIgnoreCase("chart")) { public void setOrg(ExportTaskDTO exportTaskDTO) {}
exportTaskDTO.setOrgName(dataVisualizationServer.getAbsPath(exportTaskDTO.getExportFrom()));
} private ExportCenterManage proxy() {
return CommonBeanFactory.getBean(ExportCenterManage.class);
} }
private void setExportFromAbsName(ExportTaskDTO exportTaskDTO) { private void setExportFromAbsName(ExportTaskDTO exportTaskDTO) {

4
core/core-frontend/src/views/visualized/data/dataset/ExportExcel.vue
View File

@ -14,6 +14,7 @@ import {
import { useI18n } from '@/hooks/web/useI18n' import { useI18n } from '@/hooks/web/useI18n'
import { useEmitt } from '@/hooks/web/useEmitt' import { useEmitt } from '@/hooks/web/useEmitt'
import Icon from '@/components/icon-custom/src/Icon.vue' import Icon from '@/components/icon-custom/src/Icon.vue'
import { useCache } from '@/hooks/web/useCache'
const { t } = useI18n() const { t } = useI18n()
const tableData = ref([]) const tableData = ref([])
@ -52,6 +53,8 @@ const handleClose = () => {
drawer.value = false drawer.value = false
clearInterval(timer) clearInterval(timer)
} }
const { wsCache } = useCache()
const xpack = wsCache.get('xpack-model-distributed')
onUnmounted(() => { onUnmounted(() => {
clearInterval(timer) clearInterval(timer)
@ -428,6 +431,7 @@ defineExpose({
<span v-if="scope.row.exportFromType === 'chart'">视图</span> <span v-if="scope.row.exportFromType === 'chart'">视图</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-show="xpack" prop="orgName" label="所属组织" width="200" />
<el-table-column prop="exportTime" width="180" :label="$t('data_export.export_time')"> <el-table-column prop="exportTime" width="180" :label="$t('data_export.export_time')">
<template #default="scope"> <template #default="scope">
<span>{{ timestampFormatDate(scope.row.exportTime) }}</span> <span>{{ timestampFormatDate(scope.row.exportTime) }}</span>