diff --git a/frontend-web/src/widget/modules/gaugechart/GaugeChart.tsx b/frontend-web/src/widget/modules/gaugechart/GaugeChart.tsx index 550604a..bfecfcb 100644 --- a/frontend-web/src/widget/modules/gaugechart/GaugeChart.tsx +++ b/frontend-web/src/widget/modules/gaugechart/GaugeChart.tsx @@ -33,7 +33,6 @@ const GaugeChart = props => { }, series: [ { - name: option.title, type: 'gauge', progress: { show: true, @@ -45,7 +44,7 @@ const GaugeChart = props => { data: [ { value: getAggregationData(option.aggregation, dataSet, option.field), - name: option.field, + name: option?.fieldLabel ? option.fieldLabel : option.field, }, ], itemStyle: { diff --git a/frontend-web/src/widget/modules/linechart/LineChart.tsx b/frontend-web/src/widget/modules/linechart/LineChart.tsx index 688d513..96bf1db 100644 --- a/frontend-web/src/widget/modules/linechart/LineChart.tsx +++ b/frontend-web/src/widget/modules/linechart/LineChart.tsx @@ -51,7 +51,7 @@ const LineChart = props => { if (item.field) { const series = { name: - (item?.name ? item.name : item.field) + + (item?.fieldLabel ? item.fieldLabel : item.field) + (option?.legendAggregation ? ` (${AGGREGATION_LIST.find(element => element.value === item.aggregation).label})` : ''), diff --git a/frontend-web/src/widget/modules/radarchart/RadarChart.tsx b/frontend-web/src/widget/modules/radarchart/RadarChart.tsx index dc418cb..fedb0d1 100644 --- a/frontend-web/src/widget/modules/radarchart/RadarChart.tsx +++ b/frontend-web/src/widget/modules/radarchart/RadarChart.tsx @@ -1,6 +1,7 @@ import React, { useEffect, useState } from 'react'; import ReactECharts from 'echarts-for-react'; import { getAggregationDataForChart, getCenter, getLegendOption } from '@/widget/modules/utils/chartUtil'; +import { AGGREGATION_LIST } from '@/constant'; const RadarChart = props => { const { option, dataSet, seriesOp, defaultOp, createOp } = props; @@ -45,7 +46,11 @@ const RadarChart = props => { if (item.field) { const seriesData = { value: aggrData.map(dataItem => dataItem[item.field]), - name: option.legendAggregation ? `${item.field} (${item.aggregation})` : item.field, + name: + (item?.fieldLabel ? item.fieldLabel : item.field) + + (option?.legendAggregation + ? ` (${AGGREGATION_LIST.find(element => element.value === item.aggregation).label})` + : ''), itemStyle: { color: item.color, }, diff --git a/frontend-web/src/widget/settings/Bar3DChartSetting.tsx b/frontend-web/src/widget/settings/Bar3DChartSetting.tsx index 66d5916..49e42d0 100644 --- a/frontend-web/src/widget/settings/Bar3DChartSetting.tsx +++ b/frontend-web/src/widget/settings/Bar3DChartSetting.tsx @@ -87,7 +87,7 @@ const Bar3DChartSetting = props => { ))} handleChange(event, setOption)} diff --git a/frontend-web/src/widget/settings/Bubble3DChartSetting.tsx b/frontend-web/src/widget/settings/Bubble3DChartSetting.tsx index 7365e3e..e373dea 100644 --- a/frontend-web/src/widget/settings/Bubble3DChartSetting.tsx +++ b/frontend-web/src/widget/settings/Bubble3DChartSetting.tsx @@ -37,7 +37,7 @@ const Bubble3DChartSetting = props => { handleSeriesChange(event, setOption)} endButton={} @@ -98,7 +98,7 @@ const Bubble3DChartSetting = props => { ))} handleChange(event, setOption)} diff --git a/frontend-web/src/widget/settings/BubbleChartSetting.tsx b/frontend-web/src/widget/settings/BubbleChartSetting.tsx index 1fe018a..94d43d4 100644 --- a/frontend-web/src/widget/settings/BubbleChartSetting.tsx +++ b/frontend-web/src/widget/settings/BubbleChartSetting.tsx @@ -36,7 +36,7 @@ const BubbleChartSetting = props => { handleSeriesChange(event, setOption)} endButton={} @@ -86,7 +86,7 @@ const BubbleChartSetting = props => { ))} handleChange(event, setOption)} diff --git a/frontend-web/src/widget/settings/FunnelChartSetting.tsx b/frontend-web/src/widget/settings/FunnelChartSetting.tsx index 68d0d04..49081dc 100644 --- a/frontend-web/src/widget/settings/FunnelChartSetting.tsx +++ b/frontend-web/src/widget/settings/FunnelChartSetting.tsx @@ -83,7 +83,7 @@ const FunnelChartSetting = props => { /> { /> } /> + handleChange(event, setOption)} + /> { /> handleChange(event, setOption)} diff --git a/frontend-web/src/widget/settings/LineChartSetting.tsx b/frontend-web/src/widget/settings/LineChartSetting.tsx index 16b76e7..bef179b 100644 --- a/frontend-web/src/widget/settings/LineChartSetting.tsx +++ b/frontend-web/src/widget/settings/LineChartSetting.tsx @@ -58,10 +58,10 @@ const LineChartSetting = props => { endButton={} /> handleSeriesChange(event, setOption)} endButton={' '} /> @@ -98,7 +98,7 @@ const LineChartSetting = props => { ))} handleChange(event, setOption)} diff --git a/frontend-web/src/widget/settings/MixedDonutPieChartSetting.tsx b/frontend-web/src/widget/settings/MixedDonutPieChartSetting.tsx index e8e9fb1..edfba41 100644 --- a/frontend-web/src/widget/settings/MixedDonutPieChartSetting.tsx +++ b/frontend-web/src/widget/settings/MixedDonutPieChartSetting.tsx @@ -88,7 +88,7 @@ const MixedDonutPieChartSetting = props => { /> handleSeriesChange(event, setOption, 'series', 'label')} @@ -131,7 +131,7 @@ const MixedDonutPieChartSetting = props => { /> handleSeriesChange(event, setOption, 'pie', 'label')} diff --git a/frontend-web/src/widget/settings/MixedLinePieChartSetting.tsx b/frontend-web/src/widget/settings/MixedLinePieChartSetting.tsx index 78a075b..449e111 100644 --- a/frontend-web/src/widget/settings/MixedLinePieChartSetting.tsx +++ b/frontend-web/src/widget/settings/MixedLinePieChartSetting.tsx @@ -148,7 +148,7 @@ const MixedLinePieChartSetting = props => { ))} handleChange(event, setOption)} @@ -176,7 +176,7 @@ const MixedLinePieChartSetting = props => { /> { ))} handleChange(event, setOption)} diff --git a/frontend-web/src/widget/settings/PieChartSetting.tsx b/frontend-web/src/widget/settings/PieChartSetting.tsx index 9a10cd7..17b69ab 100644 --- a/frontend-web/src/widget/settings/PieChartSetting.tsx +++ b/frontend-web/src/widget/settings/PieChartSetting.tsx @@ -58,7 +58,7 @@ const PieChartSetting = props => { /> { /> handleChange(event, setOption)} diff --git a/frontend-web/src/widget/settings/RadarChartSetting.tsx b/frontend-web/src/widget/settings/RadarChartSetting.tsx index 3cde84b..5a3759c 100644 --- a/frontend-web/src/widget/settings/RadarChartSetting.tsx +++ b/frontend-web/src/widget/settings/RadarChartSetting.tsx @@ -5,6 +5,7 @@ import ColorButtonForm from '@/components/form/ColorButtonForm'; import { AddButton, RemoveButton } from '@/components/button/AddIconButton'; import { handleAddClick, handleChange, handleRemoveClick, handleSeriesChange } from '@/widget/utils/handler'; import { AGGREGATION_LIST, COLUMN_TYPE, DISPLAY_LIST, LEGEND_LIST, WIDGET_AGGREGATION } from '@/constant'; +import TextFieldForm from '@/components/form/TextFieldForm'; const RadarChartSetting = props => { const { option, setOption, seriesItem, spec } = props; @@ -66,6 +67,14 @@ const RadarChartSetting = props => { onChange={event => handleSeriesChange(event, setOption)} endButton={} /> + handleSeriesChange(event, setOption)} + endButton={' '} + /> { ))} handleChange(event, setOption)} diff --git a/frontend-web/src/widget/settings/Scatter3DChartSetting.tsx b/frontend-web/src/widget/settings/Scatter3DChartSetting.tsx index b667e55..cbbe9ab 100644 --- a/frontend-web/src/widget/settings/Scatter3DChartSetting.tsx +++ b/frontend-web/src/widget/settings/Scatter3DChartSetting.tsx @@ -37,7 +37,7 @@ const Scatter3DChartSetting = props => { handleSeriesChange(event, setOption)} endButton={} @@ -95,7 +95,7 @@ const Scatter3DChartSetting = props => { ))} handleChange(event, setOption)} diff --git a/frontend-web/src/widget/settings/ScatterChartSetting.tsx b/frontend-web/src/widget/settings/ScatterChartSetting.tsx index 6ac8e20..f38e254 100644 --- a/frontend-web/src/widget/settings/ScatterChartSetting.tsx +++ b/frontend-web/src/widget/settings/ScatterChartSetting.tsx @@ -36,7 +36,7 @@ const ScatterChartSetting = props => { handleSeriesChange(event, setOption)} endButton={} @@ -83,7 +83,7 @@ const ScatterChartSetting = props => { ))} handleChange(event, setOption)} diff --git a/frontend-web/src/widget/settings/TreemapChartSetting.tsx b/frontend-web/src/widget/settings/TreemapChartSetting.tsx index 0e818bf..2dc9472 100644 --- a/frontend-web/src/widget/settings/TreemapChartSetting.tsx +++ b/frontend-web/src/widget/settings/TreemapChartSetting.tsx @@ -35,7 +35,7 @@ const TreemapChartSetting = props => { /> handleChange(event, setOption)}