From 7d69d3da92c7c189c0044e816318f733c5b48d3c Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 2 Mar 2022 15:40:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E6=8A=98=E7=BA=BF=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/common/common_antv.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/chart/chart/common/common_antv.js b/frontend/src/views/chart/chart/common/common_antv.js index 4175a70bf1..331a3e45dc 100644 --- a/frontend/src/views/chart/chart/common/common_antv.js +++ b/frontend/src/views/chart/chart/common/common_antv.js @@ -112,7 +112,13 @@ export function getLabel(chart) { if (l.show) { if (chart.type === 'pie') { label = { - type: l.position + type: l.position, + autoRotate: false + } + } else if (chart.type.includes('line')) { + label = { + position: l.position, + offsetY: -8 } } else { label = { From 2239a2031ce8cbd87a38886d30fd7d6f759155e2 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 2 Mar 2022 16:04:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E6=B8=85=E7=90=86=E5=AE=98?= =?UTF-8?q?=E6=96=B9=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=9C=AA=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V32__1.8.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql index 47226bade3..16f86ca68b 100644 --- a/backend/src/main/resources/db/migration/V32__1.8.sql +++ b/backend/src/main/resources/db/migration/V32__1.8.sql @@ -448,3 +448,9 @@ RETURN oTemp; END ;; delimiter ; + +delete from chart_view where id in ( +'ce33ad2c-3915-41cc-8d86-55405456ed05', +'d73eda10-68c9-40e2-b03a-a7cbe3e5b365', +'de923e69-df6b-4f61-9391-da2987f77b51' +);