From 0e07afe3aa73d1cb0352803aa6a3cf6a80e010f0 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 22 Jan 2024 14:48:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E8=B5=84=E6=BA=90=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8F=98=E6=9B=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/api/visualization/dataVisualization.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-frontend/src/api/visualization/dataVisualization.ts b/core/core-frontend/src/api/visualization/dataVisualization.ts index 8507b4c509..4cc7e31538 100644 --- a/core/core-frontend/src/api/visualization/dataVisualization.ts +++ b/core/core-frontend/src/api/visualization/dataVisualization.ts @@ -17,7 +17,7 @@ export interface Panel { } export const findCopyResource = async (dvId, busiFlag): Promise => { - return request.get({ url: '/findCopyResource/findById/' + dvId + '/' + busiFlag }) + return request.get({ url: '/dataVisualization/findCopyResource/' + dvId + '/' + busiFlag }) } export const findById = async (dvId, busiFlag): Promise => { From dbabb1fe640461c7f366adc4387adcd05ec52b64 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 22 Jan 2024 15:02:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=AA?= =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E6=A0=B7=E5=BC=8F=E7=BC=A9=E6=94=BE=E6=AF=94?= =?UTF-8?q?=E4=BE=8B=EF=BC=8C=E7=BB=84=E4=BB=B6=E5=86=85=E8=BE=B9=E8=B7=9D?= =?UTF-8?q?=E7=BC=A9=E6=94=BE=E6=AF=94=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-visualization/canvas/ComponentWrapper.vue | 5 ++++- .../src/components/data-visualization/canvas/DePreview.vue | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue index 59655240de..bc343811f0 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue @@ -133,7 +133,10 @@ const componentBackgroundStyle = computed(() => { innerPadding, borderRadius } = config.value.commonBackground - const style = { padding: innerPadding + 'px', borderRadius: borderRadius + 'px' } + const style = { + padding: innerPadding * deepScale.value + 'px', + borderRadius: borderRadius + 'px' + } let colorRGBA = '' if (backgroundColorSelect && backgroundColor) { colorRGBA = backgroundColor diff --git a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue index 6b55cce64d..7c6dba19d4 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/DePreview.vue @@ -141,7 +141,7 @@ const restore = () => { cellWidth.value = canvasWidth / pcMatrixCount.value.x cellHeight.value = canvasHeight / pcMatrixCount.value.y scaleWidth.value = isMainCanvas(canvasId.value) - ? scaleWidth.value * 1.5 + ? scaleWidth.value * 1.2 : outerScale.value * 100 } else { changeRefComponentsSizeWithScale(