From aa12e9c81219fa343aaf67e18352ab35ebe04de5 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 1 Apr 2025 15:48:40 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=B0=86=E8=81=94=E5=8A=A8=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=88=B0=E6=9C=80=E4=B8=8A=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/auto/entity/SnapshotDataVisualizationInfo.java | 6 +++--- .../visualization/server/DataVisualizationServer.java | 2 +- core/core-frontend/src/components/dashboard/DbToolbar.vue | 1 + .../src/store/modules/data-visualization/dvMain.ts | 2 +- .../src/views/data-visualization/PreviewCanvasMobile.vue | 8 ++++++++ core/core-frontend/src/views/mobile/panel/Mobile.vue | 8 ++++++++ 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotDataVisualizationInfo.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotDataVisualizationInfo.java index 016436cef1..4d3e10cdd2 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotDataVisualizationInfo.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/auto/entity/SnapshotDataVisualizationInfo.java @@ -64,7 +64,7 @@ public class SnapshotDataVisualizationInfo implements Serializable { /** * 移动端布局0-关闭 1-开启 */ - private Byte mobileLayout; + private Boolean mobileLayout; /** * 状态 0-未发布 1-已发布 @@ -213,11 +213,11 @@ public class SnapshotDataVisualizationInfo implements Serializable { this.componentData = componentData; } - public Byte getMobileLayout() { + public Boolean getMobileLayout() { return mobileLayout; } - public void setMobileLayout(Byte mobileLayout) { + public void setMobileLayout(Boolean mobileLayout) { this.mobileLayout = mobileLayout; } 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 19990a6c5e..6d4738caea 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 @@ -513,7 +513,7 @@ public class DataVisualizationServer implements DataVisualizationApi { coreVisualizationManage.move(request); } } - visualizationInfo.setStatus(CommonConstants.DV_STATUS.SAVED_UNPUBLISHED); + visualizationInfo.setStatus(request.getStatus()!=null?request.getStatus():CommonConstants.DV_STATUS.SAVED_UNPUBLISHED); coreVisualizationManage.innerEdit(visualizationInfo); //保存图表信息 chartDataManage.saveChartViewFromVisualization(request.getComponentData(), dvId, request.getCanvasViewInfo()); diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue index c159e6d78f..93244457c8 100644 --- a/core/core-frontend/src/components/dashboard/DbToolbar.vue +++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue @@ -179,6 +179,7 @@ const resourceOptFinish = param => { dvInfo.value.dataState = 'ready' dvInfo.value.pid = param.pid dvInfo.value.name = param.name + dvInfo.value.status = 0 saveCanvasWithCheck() } } diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts index baa814bc5c..3f6405140c 100644 --- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts +++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts @@ -1590,7 +1590,7 @@ export const dvMainStore = defineStore('dataVisualization', { name: name, pid: pid, type: dvType, - status: 1, + status: 0, selfWatermarkStatus: true, watermarkInfo: watermarkInfo, mobileLayout: false, diff --git a/core/core-frontend/src/views/data-visualization/PreviewCanvasMobile.vue b/core/core-frontend/src/views/data-visualization/PreviewCanvasMobile.vue index c2d47f9d5d..e6f2a214a8 100644 --- a/core/core-frontend/src/views/data-visualization/PreviewCanvasMobile.vue +++ b/core/core-frontend/src/views/data-visualization/PreviewCanvasMobile.vue @@ -15,6 +15,7 @@ import { propTypes } from '@/utils/propTypes' import { setTitle } from '@/utils/utils' import EmptyBackground from '../../components/empty-background/src/EmptyBackground.vue' import { filterEnumMapSync } from '@/utils/componentUtils' +import CanvasOptBar from '@/components/visualization/CanvasOptBar.vue' const dvMainStore = dvMainStoreWithOut() const { t } = useI18n() @@ -165,6 +166,11 @@ defineExpose({