diff --git a/core/core-frontend/src/utils/CanvasInfoTransUtils.ts b/core/core-frontend/src/utils/CanvasInfoTransUtils.ts
index 075ec9a493..5edbed01af 100644
--- a/core/core-frontend/src/utils/CanvasInfoTransUtils.ts
+++ b/core/core-frontend/src/utils/CanvasInfoTransUtils.ts
@@ -4,9 +4,13 @@ export default function defaultConditionTrans(canvasInfo) {
const { reportFilterInfo, componentData } = canvasInfo
const componentDataArray = JSON.parse(componentData)
const allFilter = []
+ const componentMap = {}
// 获取所有查询条件
componentDataArray.forEach(item => {
if (item.component === 'VQuery') {
+ item.propValue.forEach(filterItem => {
+ componentMap[filterItem.id] = item
+ })
Array.prototype.push.apply(allFilter, item.propValue)
}
})
@@ -15,13 +19,15 @@ export default function defaultConditionTrans(canvasInfo) {
if (reportFilterInfo) {
allFilter.forEach((itemFilter, index) => {
if (reportFilterInfo[itemFilter.id]) {
- allDefaultFilter.splice(index, 1, JSON.parse(reportFilterInfo[itemFilter.id]))
+ allDefaultFilter.splice(index, 1, JSON.parse(reportFilterInfo[itemFilter.id].filterInfo))
}
})
}
return {
sourceFilter: allFilter,
- defaultFilter: allDefaultFilter
+ defaultFilter: allDefaultFilter,
+ sourceDefaultFilter: deepCopy(allDefaultFilter),
+ componentMap: componentMap
}
}
diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
index b2bf88b1a3..4794644783 100644
--- a/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
+++ b/core/core-frontend/src/views/data-visualization/PreviewCanvas.vue
@@ -121,7 +121,7 @@ const XpackLoaded = () => p(true)
onMounted(async () => {
await new Promise(r => (p = r))
const dvId = embeddedStore.dvId || router.currentRoute.value.query.dvId
- const { dvType, callBackFlag } = router.currentRoute.value.query
+ const { dvType, callBackFlag, taskId } = router.currentRoute.value.query
if (dvId) {
loadCanvasDataAsync(dvId, dvType)
return
diff --git a/null/VisualizationReportFilterController.java b/null/VisualizationReportFilterController.java
deleted file mode 100644
index 2b48922c26..0000000000
--- a/null/VisualizationReportFilterController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.dataease.visualization.dao.auto.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- *
- * 前端控制器
- *
- *
- * @author fit2cloud
- * @since 2024-06-25
- */
-@Controller
-@RequestMapping("/visualizationReportFilter")
-public class VisualizationReportFilterController {
-
-}
diff --git a/null/VisualizationReportFilterMapper.xml b/null/VisualizationReportFilterMapper.xml
deleted file mode 100644
index 4e22897581..0000000000
--- a/null/VisualizationReportFilterMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/null/VisualizationReportFilterServiceImpl.java b/null/VisualizationReportFilterServiceImpl.java
deleted file mode 100644
index fd02dcac10..0000000000
--- a/null/VisualizationReportFilterServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package io.dataease.visualization.dao.auto.service.impl;
-
-import io.dataease.visualization.dao.auto.entity.VisualizationReportFilter;
-import io.dataease.visualization.dao.auto.mapper.VisualizationReportFilterMapper;
-import io.dataease.visualization.dao.auto.service.IVisualizationReportFilterService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- *
- * 服务实现类
- *
- *
- * @author fit2cloud
- * @since 2024-06-25
- */
-@Service
-public class VisualizationReportFilterServiceImpl extends ServiceImpl
implements IVisualizationReportFilterService {
-
-}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportCreator.java b/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportCreator.java
index 1d969e7281..391b794266 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportCreator.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportCreator.java
@@ -2,6 +2,7 @@ package io.dataease.api.report.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.dataease.api.visualization.vo.VisualizationReportFilterVO;
import lombok.Data;
import java.io.Serial;
@@ -51,4 +52,6 @@ public class ReportCreator implements Serializable {
private Long startTime;
private Long endTime;
+
+ private List reportFilter;
}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/DataVisualizationBaseRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/DataVisualizationBaseRequest.java
index adcf02d952..eb8af2743a 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/DataVisualizationBaseRequest.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/request/DataVisualizationBaseRequest.java
@@ -34,6 +34,9 @@ public class DataVisualizationBaseRequest extends DataVisualizationVO {
// 定时报告id
private Long reportId;
+ // 定时报告任务id
+ private Long taskId;
+
public DataVisualizationBaseRequest(Long id,String busiFlag) {
this.busiFlag = busiFlag;
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationReportFilterVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationReportFilterVO.java
index 0363eba4c3..d649aa9666 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationReportFilterVO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/visualization/vo/VisualizationReportFilterVO.java
@@ -13,14 +13,23 @@ import java.io.Serializable;
* @since 2024-06-25
*/
public class VisualizationReportFilterVO implements Serializable {
-
private static final long serialVersionUID = 1L;
/**
- * 报告ID
+ * id
*/
private Long id;
+ /**
+ * 定时报告id
+ */
+ private Long reportId;
+
+ /**
+ * 任务id
+ */
+ private Long taskId;
+
/**
* 资源id
*/
@@ -69,6 +78,22 @@ public class VisualizationReportFilterVO implements Serializable {
this.id = id;
}
+ public Long getReportId() {
+ return reportId;
+ }
+
+ public void setReportId(Long reportId) {
+ this.reportId = reportId;
+ }
+
+ public Long getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(Long taskId) {
+ this.taskId = taskId;
+ }
+
public Long getResourceId() {
return resourceId;
}
@@ -136,15 +161,17 @@ public class VisualizationReportFilterVO implements Serializable {
@Override
public String toString() {
return "VisualizationReportFilter{" +
- "id = " + id +
- ", resourceId = " + resourceId +
- ", dvType = " + dvType +
- ", componentId = " + componentId +
- ", filterId = " + filterId +
- ", filterInfo = " + filterInfo +
- ", filterVersion = " + filterVersion +
- ", createTime = " + createTime +
- ", createUser = " + createUser +
- "}";
+ "id = " + id +
+ ", reportId = " + reportId +
+ ", taskId = " + taskId +
+ ", resourceId = " + resourceId +
+ ", dvType = " + dvType +
+ ", componentId = " + componentId +
+ ", filterId = " + filterId +
+ ", filterInfo = " + filterInfo +
+ ", filterVersion = " + filterVersion +
+ ", createTime = " + createTime +
+ ", createUser = " + createUser +
+ "}";
}
}