From 763918907f49658c6fce71f49faa6685c4c7af29 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Wed, 6 Sep 2023 18:31:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E8=AF=8D=E4=BA=91=E5=9B=BE?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=8C=BA=E9=97=B4=E5=92=8C=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E9=97=B4=E8=B7=9D=E7=BC=96=E8=BE=91=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/shapeAttr/SizeSelectorAntV.vue | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue b/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue index 43eafffbe9..7f181cd20c 100644 --- a/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue +++ b/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue @@ -791,13 +791,13 @@ /> @@ -1369,7 +1369,7 @@ Date: Wed, 6 Sep 2023 19:34:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E7=9B=98=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E7=BC=96=E8=BE=91=E5=88=BB=E5=BA=A6=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=BC=80=E5=85=B3=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/views/chart/chart/util.js | 4 ++-- .../src/views/chart/components/shapeAttr/SizeSelector.vue | 4 ++-- .../src/views/chart/components/shapeAttr/SizeSelectorAntV.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/frontend/src/views/chart/chart/util.js b/core/frontend/src/views/chart/chart/util.js index bc7b285db8..fdacc429a7 100644 --- a/core/frontend/src/views/chart/chart/util.js +++ b/core/frontend/src/views/chart/chart/util.js @@ -297,7 +297,7 @@ export const TYPE_CONFIGS = [ 'gaugeStartAngle', 'gaugeEndAngle', 'gaugeTickCount', - 'gaugeAxisLabel' + 'gaugeAxisLine' ], 'label-selector-ant-v': [ 'labelGauge' @@ -2160,7 +2160,7 @@ export const TYPE_CONFIGS = [ 'gaugeMax', 'gaugeStartAngle', 'gaugeEndAngle', - 'gaugeAxisLabel' + 'gaugeAxisLine' ], 'label-selector': [ 'show', diff --git a/core/frontend/src/views/chart/components/shapeAttr/SizeSelector.vue b/core/frontend/src/views/chart/components/shapeAttr/SizeSelector.vue index eb83468cec..17c0f1f74d 100644 --- a/core/frontend/src/views/chart/components/shapeAttr/SizeSelector.vue +++ b/core/frontend/src/views/chart/components/shapeAttr/SizeSelector.vue @@ -477,13 +477,13 @@ /> diff --git a/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue b/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue index 7f181cd20c..64d05c6823 100644 --- a/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue +++ b/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue @@ -791,13 +791,13 @@ /> From 71234df2f12537c6aeaeae9aaee5ed50a6171a5d Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Wed, 6 Sep 2023 19:39:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E7=9B=98=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E7=BC=96=E8=BE=91=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E5=80=BC=E5=92=8C=E6=9C=80=E5=B0=8F=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/shapeAttr/SizeSelectorAntV.vue | 266 +++++++++--------- 1 file changed, 135 insertions(+), 131 deletions(-) diff --git a/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue b/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue index 64d05c6823..96a544de6f 100644 --- a/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue +++ b/core/frontend/src/views/chart/components/shapeAttr/SizeSelectorAntV.vue @@ -522,150 +522,151 @@ label-width="100px" size="mini" > - - + - {{ $t('chart.fix') }} - {{ $t('chart.dynamic') }} - - - - - - - - + {{ $t('chart.fix') }} + {{ $t('chart.dynamic') }} + + + + + + + + - {{ item.name }} - - - - - - - - - - - - - + {{ item.name }} + + + + + + + + + + + + + - - - {{ $t('chart.fix') }} - {{ $t('chart.dynamic') }} - - - - - - + {{ $t('chart.fix') }} + {{ $t('chart.dynamic') }} + + + + + + @@ -759,6 +760,7 @@ /> + import { CHART_FONT_FAMILY, CHART_FONT_LETTER_SPACE, DEFAULT_SIZE } from '../../chart/chart' import { equalsAny } from '@/utils/StringUtils' +import { mapState } from 'vuex' export default { name: 'SizeSelectorAntV', @@ -1493,7 +1496,8 @@ export default { return customAttr.color.mapLineGradient && equalsAny(this.sizeForm.mapLineType, 'line', 'arc') } return false - } + }, + ...mapState(['batchOptStatus']) }, watch: { 'chart': {