From 811840da8641e3067d4abb19f2162f49e8f295ad Mon Sep 17 00:00:00 2001 From: junjie Date: Fri, 19 Mar 2021 17:57:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B9=B3=E6=BB=91=E6=8A=98=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/zh.js | 3 ++- frontend/src/views/chart/chart/chart.js | 1 + frontend/src/views/chart/chart/line/line.js | 1 + .../src/views/chart/components/shape_attr/SizeSelector.vue | 3 +++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index c77ba63b14..e965d70523 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -637,7 +637,8 @@ export default { line_symbol_none: '无', pie_inner_radius: '内径', pie_outer_radius: '外径', - funnel_width: '宽度' + funnel_width: '宽度', + line_smooth: '平滑折线' }, dataset: { datalist: '数据集', diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index b71fc5d14f..be877f189d 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -11,6 +11,7 @@ export const DEFAULT_SIZE = { lineType: 'solid', lineSymbol: 'emptyCircle', lineSymbolSize: 4, + lineSmooth: false, pieInnerRadius: 0, pieOuterRadius: 60, funnelWidth: 80 diff --git a/frontend/src/views/chart/chart/line/line.js b/frontend/src/views/chart/chart/line/line.js index 91fa2210b5..0ddc7635d4 100644 --- a/frontend/src/views/chart/chart/line/line.js +++ b/frontend/src/views/chart/chart/line/line.js @@ -27,6 +27,7 @@ export function baseLineOption(chart_option, chart) { width: customAttr.size.lineWidth, type: customAttr.size.lineType } + y.smooth = customAttr.size.lineSmooth } y.type = 'line' chart_option.legend.data.push(y.name) diff --git a/frontend/src/views/chart/components/shape_attr/SizeSelector.vue b/frontend/src/views/chart/components/shape_attr/SizeSelector.vue index 48772311bb..9150c9ee7e 100644 --- a/frontend/src/views/chart/components/shape_attr/SizeSelector.vue +++ b/frontend/src/views/chart/components/shape_attr/SizeSelector.vue @@ -42,6 +42,9 @@ + + {{ $t('chart.line_smooth') }} +