diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index 1efcc75a0f..ce59ea4705 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -152,7 +152,7 @@ public class DataVisualizationServer implements DataVisualizationApi { @Override public DataVisualizationVO findCopyResource(Long dvId, String busiFlag) { - DataVisualizationVO result = Objects.requireNonNull(CommonBeanFactory.proxy(this.getClass())).findById(new DataVisualizationBaseRequest(dvId, busiFlag)); + DataVisualizationVO result = Objects.requireNonNull(CommonBeanFactory.proxy(this.getClass())).findById(new DataVisualizationBaseRequest(dvId, busiFlag, CommonConstants.RESOURCE_TABLE.SNAPSHOT)); if (result != null && result.getPid() == -1) { return result; } else { @@ -521,7 +521,7 @@ public class DataVisualizationServer implements DataVisualizationApi { // 状态修改统一为后端操作:历史状态检查 如果 状态为 0(未发布) 或者 2(已发布未保存)则状态不变 // 如果当前状态为 1 则状态修改为 2(已发布未保存) Integer curStatus = extDataVisualizationMapper.findDvInfoStats(dvId); - visualizationInfo.setStatus(curStatus == 1?CommonConstants.DV_STATUS.SAVED_UNPUBLISHED:curStatus); + visualizationInfo.setStatus(curStatus == 1 ? CommonConstants.DV_STATUS.SAVED_UNPUBLISHED : curStatus); coreVisualizationManage.innerEdit(visualizationInfo); //保存图表信息 chartDataManage.saveChartViewFromVisualization(request.getComponentData(), dvId, request.getCanvasViewInfo()); @@ -547,7 +547,7 @@ public class DataVisualizationServer implements DataVisualizationApi { coreVisualizationManage.removeDvCore(dvId); coreVisualizationManage.dvRestore(dvId); chartViewManege.publishThreshold(dvId, request.getActiveViewIds()); - }else if(CommonConstants.DV_STATUS.UNPUBLISHED == request.getStatus()){ + } else if (CommonConstants.DV_STATUS.UNPUBLISHED == request.getStatus()) { chartViewManege.publishThreshold(dvId, request.getActiveViewIds()); } } diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts index 1fe7a2a556..c3a82aa957 100644 --- a/core/core-frontend/src/utils/canvasUtils.ts +++ b/core/core-frontend/src/utils/canvasUtils.ts @@ -329,7 +329,7 @@ export function refreshOtherComponent(dvId, busiFlag) { } export function initCanvasDataPrepare(dvId, params, callBack) { - const busiFlag = params.busiFlag + const busiFlag = params.busiFlg const copyFlag = busiFlag != null && busiFlag.includes('-copy') const busiFlagCustom = copyFlag ? busiFlag.split('-')[0] : busiFlag const method = copyFlag ? findCopyResource : findById 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 42440c8137..a5e0d8928a 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 @@ -64,6 +64,12 @@ public class DataVisualizationBaseRequest extends DataVisualizationVO { //数据来源 core 主表 snapshot 镜像表 private String resourceTable = "core"; + public DataVisualizationBaseRequest(Long id,String busiFlag,String resource) { + this.busiFlag = busiFlag; + this.resourceTable = resource; + super.setId(id); + } + public DataVisualizationBaseRequest(Long id,String busiFlag) { this.busiFlag = busiFlag; super.setId(id);