From fe126396df67d8fa4846e8ad73ca32a812efdb4a Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Wed, 27 Nov 2024 16:08:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E9=9B=B7=E8=BE=BE?= =?UTF-8?q?=E5=9B=BE=E6=94=AF=E6=8C=81=E6=9B=B4=E6=94=B9=E6=8A=98=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E5=92=8C=E9=9A=90=E8=97=8F,?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E9=A2=9C=E8=89=B2=E8=A6=86=E7=9B=96=E5=BC=80?= =?UTF-8?q?=E5=85=B3=20#12916?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/en.ts | 5 ++- core/core-frontend/src/locales/tw.ts | 5 ++- core/core-frontend/src/locales/zh-CN.ts | 5 ++- .../src/models/chart/chart-attr.d.ts | 12 ++++++ .../components/BasicStyleSelector.vue | 38 +++++++++++++++++++ .../chart/components/editor/util/chart.ts | 5 ++- .../js/panel/charts/others/radar.ts | 26 +++++++++---- 7 files changed, 84 insertions(+), 12 deletions(-) diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 93c58b39ec..a9c50718ee 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -1850,7 +1850,10 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr full_display: 'full display', show_hover_style: 'show mouse hover style', merge_cells: 'merge cells', - length_limit: 'length limit' + length_limit: 'length limit', + radar_point: 'enable auxiliary points', + radar_point_size: 'size', + radar_area_color: 'enable area ' }, dataset: { scope_edit: 'only effective when editing', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index d3bd5b7a60..a3cd4a4c69 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -1810,7 +1810,10 @@ export default { full_display: '全量顯示', show_hover_style: '顯示滑鼠懸浮樣式', merge_cells: '合併儲存格', - length_limit: '長度限制' + length_limit: '長度限制', + radar_point: '開啟輔助點', + radar_point_size: '輔助點大小', + radar_area_color: '開啟面積' }, dataset: { scope_edit: '僅編輯時生效', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index a4c9e2f6cb..c648fff17f 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -1813,7 +1813,10 @@ export default { full_display: '全量显示', show_hover_style: '显示鼠标悬浮样式', merge_cells: '合并单元格', - length_limit: '长度限制' + length_limit: '长度限制', + radar_point: '开启辅助点', + radar_point_size: '辅助点大小', + radar_area_color: '开启面积' }, dataset: { scope_edit: '仅编辑时生效', diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts index 5057da5e45..2c35194d0a 100644 --- a/core/core-frontend/src/models/chart/chart-attr.d.ts +++ b/core/core-frontend/src/models/chart/chart-attr.d.ts @@ -334,6 +334,18 @@ declare interface ChartBasicStyle { * 最大行数 */ maxLines?: number + /** + * 雷达图辅助点 + */ + radarShowPoint: boolean + /** + * 雷达图辅助点大小 + */ + radarPointSize: number + /** + * 雷达图面积颜色开关 + */ + radarAreaColor: boolean } /** * 表头属性 diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue index 83af8f6ea6..458e5e2a37 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue @@ -1278,6 +1278,44 @@ onMounted(() => { {{ t('chart.circle') }} + + + {{ $t('chart.radar_point') }} + + + + + + + + {{ $t('chart.radar_area_color') }} + + { yField: 'value', seriesField: 'category', appendPadding: [10, 10, 10, 10], - point: { - size: 4, - shape: 'circle', - style: { - fill: null - } - }, interactions: [ { type: 'legend-active', @@ -122,6 +115,22 @@ export class Radar extends G2PlotChartView { return newChart } + protected configBasicStyle(chart: Chart, options: RadarOptions): RadarOptions { + const { radarShowPoint, radarPointSize, radarAreaColor } = parseJson( + chart.customAttr + ).basicStyle + const tempOptions: RadarOptions = {} + + if (radarShowPoint) { + tempOptions['point'] = { shape: 'circle', size: radarPointSize, style: { fill: null } } + } + if (radarAreaColor) { + tempOptions['area'] = {} + } + + return { ...options, ...tempOptions } + } + protected configLabel(chart: Chart, options: RadarOptions): RadarOptions { const tmpOptions = super.configLabel(chart, options) if (!tmpOptions.label) { @@ -266,7 +275,8 @@ export class Radar extends G2PlotChartView { this.configLabel, this.configLegend, this.configMultiSeriesTooltip, - this.configAxis + this.configAxis, + this.configBasicStyle )(chart, options) }