From fe50f858d65dfcc426778e3e04e01f23535137da Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 23 Jul 2024 22:46:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8=E5=AF=BC=E5=85=A5=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6=E8=87=AA=E5=8A=A8=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E5=8C=B9=E9=85=8D=E7=BB=93=E6=9E=9C=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/visualization/server/DataVisualizationServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cbf1ac5107..0abc78bf7b 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 @@ -343,7 +343,7 @@ public class DataVisualizationServer implements DataVisualizationApi { } }); - + request.setComponentData(componentDataStr.get()); } DataVisualizationInfo visualizationInfo = new DataVisualizationInfo(); BeanUtils.copyBean(visualizationInfo, request); From 6d64842c2a64ed04e164fa9c90d860787bc01d99 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 24 Jul 2024 09:55:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/data-visualization/RealTimeListTree.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue index 525c6334eb..99c1caa6b0 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue @@ -275,7 +275,7 @@ const areaClick = area => { :title="element.name" class="component-item" :class="{ - 'container-item-not-show': !element.isShow, + 'container-item-not-show': !element.isShow || !canvasStyleData.popupAvailable, activated: (curComponent && curComponent?.id === element?.id) || areaData.components.includes(element) @@ -478,6 +478,7 @@ const areaClick = area => { { .layer-screen { border-top: rgba(255, 255, 255, 0.15) 1px solid; } + +.custom-teleport { + background: #1a1a1a !important; +}