From 7d4e07a7321dc8be34facf699e1ad29480f0bf37 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 24 Sep 2024 11:14:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=9B=BE=E8=A1=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=90=8E=EF=BC=8C=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E8=AE=A1=E7=AE=97=E5=8F=82=E6=95=B0=E6=9C=AA?= =?UTF-8?q?=E8=B7=9F=E9=9A=8F=E5=88=87=E6=8D=A2=EF=BC=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E8=BF=98=E6=98=AF=E4=B9=8B=E5=89=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E7=9A=84=E8=AE=A1=E7=AE=97=E5=8F=82=E6=95=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20#12196?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/chart/manage/ChartDataManage.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java index 29938ca456..3f1b08a83c 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java @@ -371,10 +371,7 @@ public class ChartDataManage { provider = ProviderFactory.getProvider(dsMap.entrySet().iterator().next().getValue().getType()); } - if (ObjectUtils.isEmpty(view.getCalParams())) { - view.setCalParams(Utils.getParams(transFields(allFields))); - } - + view.setCalParams(Utils.getParams(transFields(allFields))); SQLMeta sqlMeta = new SQLMeta(); Table2SQLObj.table2sqlobj(sqlMeta, null, "(" + sql + ")", crossDs); CustomWhere2Str.customWhere2sqlObj(sqlMeta, fieldCustomFilter, transFields(allFields), crossDs, dsMap, Utils.getParams(transFields(allFields)), view.getCalParams(), pluginManage); From af95fbe735ad93ef9c6135b4d49e62013280c594 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 24 Sep 2024 11:19:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?style(=E5=9B=BE=E8=A1=A8):=203D=E6=97=8B?= =?UTF-8?q?=E8=BD=AC=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/visualization/OuterParamsSet.vue | 4 ++-- .../src/components/visualization/common/ComponentPosition.vue | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/components/visualization/OuterParamsSet.vue b/core/core-frontend/src/components/visualization/OuterParamsSet.vue index b3387d8208..5a76a3a111 100644 --- a/core/core-frontend/src/components/visualization/OuterParamsSet.vue +++ b/core/core-frontend/src/components/visualization/OuterParamsSet.vue @@ -68,7 +68,7 @@ - + 选择参数关联组件 @@ -249,7 +249,7 @@ - + 参数配置 diff --git a/core/core-frontend/src/components/visualization/common/ComponentPosition.vue b/core/core-frontend/src/components/visualization/common/ComponentPosition.vue index 1e0991e6eb..bea33fd1bb 100644 --- a/core/core-frontend/src/components/visualization/common/ComponentPosition.vue +++ b/core/core-frontend/src/components/visualization/common/ComponentPosition.vue @@ -183,6 +183,7 @@ const maintainRadioChange = () => { } const multiDimensionalChange = () => { // do change + snapshotStore.recordSnapshotCache() } const positionInit = () => { From 14d3eaec4714c1a646bebdee61bc5dd6d6869672 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 24 Sep 2024 11:33:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=203D=E6=97=8B?= =?UTF-8?q?=E8=BD=AC=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E8=BE=B9=E7=95=8C?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-visualization/canvas/Shape.vue | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue index 68c87e5801..7842c9bb87 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue @@ -829,6 +829,30 @@ const commonBackgroundSvgInner = computed(() => { } }) +const padding3D = computed(() => { + const width = defaultStyle.value.width // 原始元素宽度 + const height = defaultStyle.value.height // 原始元素高度 + const rotateX = element.value['multiDimensional'].x // 旋转X角度 + const rotateY = element.value['multiDimensional'].y // 旋转Y角度 + + // 将角度转换为弧度 + const radX = (rotateX * Math.PI) / 180 + const radY = (rotateY * Math.PI) / 180 + + // 计算旋转后新宽度和高度 + const newWidth = Math.abs(width * Math.cos(radY)) + Math.abs(height * Math.sin(radX)) + const newHeight = Math.abs(height * Math.cos(radX)) + Math.abs(width * Math.sin(radY)) + + // 计算需要的 padding + const paddingX = (newWidth - width) / 2 + const paddingY = (newHeight - height) / 2 + + return { + paddingX: `${paddingX}px`, + paddingY: `${paddingY}px` + } +}) + const componentBackgroundStyle = computed(() => { if (element.value.commonBackground && element.value.component !== 'GroupArea') { const {