From 2e0e2b433f413331dd4f66afd06d3949687c2bcf Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Wed, 22 Jun 2022 17:15:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BD=8D=E7=BD=AE=E5=B8=83=E5=B1=80=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/components/TextAttr.vue | 5 ++++- frontend/src/components/dataease/DeOutWidget.vue | 2 +- frontend/src/components/widget/DeWidget/TitlePostion.vue | 8 ++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue index b3bab89ced..8525c85377 100644 --- a/frontend/src/components/canvas/components/TextAttr.vue +++ b/frontend/src/components/canvas/components/TextAttr.vue @@ -153,7 +153,7 @@
- +
@@ -352,6 +352,9 @@ export default { styleInfo() { return this.$store.state.curComponent.style }, + elementType() { + return this.$store.state.curComponent.component + }, canvasWidth() { return this.canvasStyleData.width * this.curCanvasScale.scalePointWidth }, diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue index 5cb6289de0..223b0e4ede 100644 --- a/frontend/src/components/dataease/DeOutWidget.vue +++ b/frontend/src/components/dataease/DeOutWidget.vue @@ -147,7 +147,7 @@ export default { this.outsideStyle = { flexWrap: 'wrap' } - if (vertical !== 'top') { + if (vertical !== 'top' && this.element.component !== 'de-select-grid') { this.titleStyle = null this.outsideStyle = { flexDirection: horizontal === 'right' ? 'row-reverse' : '', diff --git a/frontend/src/components/widget/DeWidget/TitlePostion.vue b/frontend/src/components/widget/DeWidget/TitlePostion.vue index 9b115c7616..9256b8d988 100644 --- a/frontend/src/components/widget/DeWidget/TitlePostion.vue +++ b/frontend/src/components/widget/DeWidget/TitlePostion.vue @@ -9,7 +9,7 @@ {{ $t('chart.text_pos_left') }} - {{ $t('chart.text_pos_center') }} + {{ $t('chart.text_pos_center') }} {{ $t('chart.text_pos_right') }} @@ -40,7 +40,11 @@ export default { showVertical: { type: Boolean, default: false - } + }, + elementType: { + type: String, + default: '' + }, } }