From 1381ebd2cdb3bb71057bbd028d16ade3a57225ef Mon Sep 17 00:00:00 2001 From: ulleo <ulleo.wang@gmail.com> Date: Thu, 7 Sep 2023 13:41:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20[Echarts=E5=8A=A8=E6=80=81=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=9B=BE]=20=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=80=89=E9=A1=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/selector/TooltipSelector.vue | 3 +++ .../view/official/impl/RaceBarService.java | 6 +++--- .../src/components/selector/TooltipSelector.vue | 17 ++++++++++++++++- .../src/components/selector/TooltipSelector.vue | 3 +++ 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelector.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelector.vue index c59e0f6185..2461555af5 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelector.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/components/selector/TooltipSelector.vue @@ -122,6 +122,9 @@ export default { .form-item>>>.el-form-item__label{ font-size: 12px; } +.form-item ::v-deep .el-form-item__label { + font-size: 12px; +} .el-select-dropdown__item{ padding: 0 20px; } diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java b/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java index 4cc2e91127..0f05beb350 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-backend/src/main/java/io/dataease/plugins/view/official/impl/RaceBarService.java @@ -40,9 +40,9 @@ public class RaceBarService extends ViewPluginService { private static final Map<String, String[]> VIEW_STYLE_PROPERTY_INNER = new HashMap<>(); static { - VIEW_STYLE_PROPERTY_INNER.put("color-selector", new String[]{"value", "alpha"}); - VIEW_STYLE_PROPERTY_INNER.put("label-selector", new String[]{"show", "fontSize", "color", "position", "formatter"}); - VIEW_STYLE_PROPERTY_INNER.put("tooltip-selector", new String[]{"show", "textStyle", "formatter"}); + VIEW_STYLE_PROPERTY_INNER.put("color-selector", new String[]{"value"}); + VIEW_STYLE_PROPERTY_INNER.put("label-selector", new String[]{"show", "fontSize", "color", "position"}); + VIEW_STYLE_PROPERTY_INNER.put("tooltip-selector", new String[]{"show", "textStyle", }); VIEW_STYLE_PROPERTY_INNER.put("title-selector", new String[]{"show", "title", "fontSize", "color", "hPosition", "vPosition", "isItalic", "isBolder"}); } diff --git a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/selector/TooltipSelector.vue b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/selector/TooltipSelector.vue index bba74bfd46..bb93c0abcb 100644 --- a/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/selector/TooltipSelector.vue +++ b/extensions/dataease-extensions-view/view-racebar/view-racebar-frontend/src/components/selector/TooltipSelector.vue @@ -17,6 +17,17 @@ <el-color-picker v-model="tooltipForm.textStyle.color" class="color-picker-style" :predefine="predefineColors" @change="changeTooltipAttr"/> </el-form-item> + <el-form-item + :label="$t('chart.background')" + class="form-item" + > + <el-color-picker + v-model="tooltipForm.backgroundColor" + class="color-picker-style" + :predefine="predefineColors" + @change="changeTooltipAttr" + /> + </el-form-item> <!-- <el-form-item class="form-item"> <span slot="label"> <span class="span-box"> @@ -40,7 +51,7 @@ </template> <script> -import {COLOR_PANEL, DEFAULT_TOOLTIP} from '@/utils/map' +import {COLOR_PANEL, DEFAULT_TOOLTIP} from '../../utils/map' export default { name: 'TooltipSelector', @@ -127,6 +138,10 @@ export default { font-size: 12px; } +.form-item ::v-deep .el-form-item__label { + font-size: 12px; +} + .el-select-dropdown__item { padding: 0 20px; } diff --git a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/components/selector/TooltipSelector.vue b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/components/selector/TooltipSelector.vue index c59e0f6185..2461555af5 100644 --- a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/components/selector/TooltipSelector.vue +++ b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/components/selector/TooltipSelector.vue @@ -122,6 +122,9 @@ export default { .form-item>>>.el-form-item__label{ font-size: 12px; } +.form-item ::v-deep .el-form-item__label { + font-size: 12px; +} .el-select-dropdown__item{ padding: 0 20px; }