From de763317d0d6dec33955e61d29f0d81554504d99 Mon Sep 17 00:00:00 2001 From: RB Date: Wed, 22 Jan 2025 16:35:24 +0800 Subject: [PATCH] chart showMarkLine --- src/main/resources/web/assets/css/chart-design.css | 2 +- src/main/resources/web/assets/js/charts/charts.js | 12 ++++++++++++ src/main/resources/web/dashboard/chart-design.html | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/resources/web/assets/css/chart-design.css b/src/main/resources/web/assets/css/chart-design.css index 02a84e744..bb4945b13 100644 --- a/src/main/resources/web/assets/css/chart-design.css +++ b/src/main/resources/web/assets/css/chart-design.css @@ -499,7 +499,7 @@ a.ui-draggable.ui-draggable-dragging { .themeStyle { border: 0 none; outline: 0 none; - width: 77px; + width: 80px; border-bottom: 1px solid #ccc; padding: 2px; margin-left: 5px; diff --git a/src/main/resources/web/assets/js/charts/charts.js b/src/main/resources/web/assets/js/charts/charts.js index 4ea40f653..fb10078f2 100644 --- a/src/main/resources/web/assets/js/charts/charts.js +++ b/src/main/resources/web/assets/js/charts/charts.js @@ -376,6 +376,14 @@ const ECHART_AXIS_LABEL = { }, } +const ECHART_MARK_LINE = { + data: [{ type: 'average', name: $L('均线') }], + symbol: 'none', + silent: true, + emphasis: { disabled: true }, + label: { show: false }, +} + const ECHART_VALUE_LABEL2 = function (dataFlags = []) { return { show: true, @@ -519,6 +527,7 @@ class ChartLine extends BaseChart { const showAreaColor = data._renderOption && data._renderOption.showAreaColor const dataFlags = data._renderOption.dataFlags || [] const themeStyle = data._renderOption ? data._renderOption.themeStyle : null + const showMarkLine = data._renderOption ? data._renderOption.showMarkLine : null for (let i = 0; i < data.yyyAxis.length; i++) { const yAxis = data.yyyAxis[i] @@ -532,6 +541,7 @@ class ChartLine extends BaseChart { if (showAreaColor) yAxis.areaStyle = { opacity: 0.2 } if (showNumerical) yAxis.label = ECHART_VALUE_LABEL2(dataFlags) yAxis.cursor = 'default' + if (showMarkLine) yAxis.markLine = { ...$clone(ECHART_MARK_LINE) } data.yyyAxis[i] = yAxis } @@ -589,6 +599,7 @@ class ChartBar extends BaseChart { const showMutliYAxis = data._renderOption && data._renderOption.showMutliYAxis // v3.7 const dataFlags = data._renderOption.dataFlags || [] // 小数符号 const themeStyle = data._renderOption ? data._renderOption.themeStyle : null + const showMarkLine = data._renderOption ? data._renderOption.showMarkLine : null for (let i = 0; i < data.yyyAxis.length; i++) { const yAxis = data.yyyAxis[i] @@ -603,6 +614,7 @@ class ChartBar extends BaseChart { yAxis.smooth = true yAxis.lineStyle = { width: 3 } } + if (showMarkLine) yAxis.markLine = { ...$clone(ECHART_MARK_LINE) } data.yyyAxis[i] = yAxis } diff --git a/src/main/resources/web/dashboard/chart-design.html b/src/main/resources/web/dashboard/chart-design.html index 9cdc91b15..d49d94b27 100644 --- a/src/main/resources/web/dashboard/chart-design.html +++ b/src/main/resources/web/dashboard/chart-design.html @@ -117,6 +117,12 @@
[[${bundle.L('图表选项')}]]
[[${bundle.L('显示参考线')}]] +
+ +