diff --git a/frontend/src/views/chart/chart/liquid/liquid.js b/frontend/src/views/chart/chart/liquid/liquid.js index 25a1561fdd..355c55a123 100644 --- a/frontend/src/views/chart/chart/liquid/liquid.js +++ b/frontend/src/views/chart/chart/liquid/liquid.js @@ -5,15 +5,7 @@ import { DEFAULT_SIZE } from '@/views/chart/chart/chart' export function baseLiquid(plot, container, chart) { let value = 0 const colors = [] - let max - let radius - let outlineBorder - let outlineDistance - let waveLength - let waveCount - let bgColor - let shape - let labelContent + let max, radius, outlineBorder, outlineDistance, waveLength, waveCount, bgColor, shape, labelContent, title if (chart.data) { if (chart.data.series.length > 0) { value = chart.data.series[0].data[0].value @@ -62,6 +54,22 @@ export function baseLiquid(plot, container, chart) { if (customStyle.background) { bgColor = customStyle.background.color.concat(digToHex(parseInt(customStyle.background.alpha))) } + if (customStyle.text) { + const t = JSON.parse(JSON.stringify(customStyle.text)) + if (t.show) { + title = { + formatter: () => { return chart.title }, + style: ({ percent }) => ({ + fontSize: parseInt(t.fontSize), + color: t.color, + fontWeight: t.isBolder ? 'bold' : 'normal', + fontStyle: t.isItalic ? 'italic' : 'normal' + }) + } + } else { + title = false + } + } } // 开始渲染 if (plot) { @@ -87,6 +95,7 @@ export function baseLiquid(plot, container, chart) { count: waveCount }, statistic: { + title: title, content: labelContent } }) diff --git a/frontend/src/views/chart/components/component-style/TitleSelector.vue b/frontend/src/views/chart/components/component-style/TitleSelector.vue index c9e31d4181..59f479f1a1 100644 --- a/frontend/src/views/chart/components/component-style/TitleSelector.vue +++ b/frontend/src/views/chart/components/component-style/TitleSelector.vue @@ -24,14 +24,14 @@ - + {{ $t('chart.text_pos_left') }} {{ $t('chart.text_pos_center') }} {{ $t('chart.text_pos_right') }} - + {{ $t('chart.text_pos_top') }} {{ $t('chart.text_pos_center') }} diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index caa8554b65..07c8dbd807 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -503,7 +503,7 @@ - +