dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13611 from dataease/pr@dev-v2@chart-radar-fix

Browse Source 
fix(图表): 雷达图部分基础配置项未进行专属判断
This commit is contained in:
ulleo 2024-11-27 17:30:38 +08:00 committed by GitHub
commit 5f9806ce45
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
View File

@ -1278,7 +1278,11 @@ onMounted(() => {
<el-radio :effect="themes" label="circle">{{ t('chart.circle') }}</el-radio> <el-radio :effect="themes" label="circle">{{ t('chart.circle') }}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes"> <el-form-item
class="form-item margin-bottom-8"
:class="'form-item-' + themes"
v-if="showProperty('radarShowPoint')"
>
<el-checkbox <el-checkbox
size="small" size="small"
:effect="themes" :effect="themes"
@ -1293,6 +1297,7 @@ onMounted(() => {
class="form-item margin-bottom-8" class="form-item margin-bottom-8"
:class="'form-item-' + themes" :class="'form-item-' + themes"
:label="t('chart.radar_point_size')" :label="t('chart.radar_point_size')"
v-if="showProperty('radarPointSize')"
> >
<el-input-number <el-input-number
style="width: 100%" style="width: 100%"
@ -1306,7 +1311,11 @@ onMounted(() => {
@change="changeBasicStyle('radarPointSize')" @change="changeBasicStyle('radarPointSize')"
/> />
</el-form-item> </el-form-item>
<el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes"> <el-form-item
class="form-item margin-bottom-8"
:class="'form-item-' + themes"
v-if="showProperty('radarAreaColor')"
>
<el-checkbox <el-checkbox
size="small" size="small"
:effect="themes" :effect="themes"

12
core/core-frontend/src/views/chart/components/js/panel/charts/others/radar.ts
View File

@ -1,7 +1,7 @@
import type { RadarOptions, Radar as G2Radar } from '@antv/g2plot/esm/plots/radar' import type { RadarOptions, Radar as G2Radar } from '@antv/g2plot/esm/plots/radar'
import { G2PlotChartView, G2PlotDrawOptions } from '../../types/impl/g2plot' import { G2PlotChartView, G2PlotDrawOptions } from '../../types/impl/g2plot'
import { flow, parseJson } from '../../../util' import { flow, parseJson } from '../../../util'
import { configPlotTooltipEvent, getPadding } from '../../common/common_antv' import { configPlotTooltipEvent } from '../../common/common_antv'
import { valueFormatter } from '../../../formatter' import { valueFormatter } from '../../../formatter'
import type { Datum } from '@antv/g2plot/esm/types/common' import type { Datum } from '@antv/g2plot/esm/types/common'
import { useI18n } from '@/hooks/web/useI18n' import { useI18n } from '@/hooks/web/useI18n'
@ -25,7 +25,15 @@ export class Radar extends G2PlotChartView<RadarOptions, G2Radar> {
'linkage' 'linkage'
] ]
propertyInner: EditorPropertyInner = { propertyInner: EditorPropertyInner = {
'basic-style-selector': ['colors', 'alpha', 'radarShape', 'seriesColor'], 'basic-style-selector': [
'colors',
'alpha',
'radarShape',
'seriesColor',
'radarShowPoint',
'radarPointSize',
'radarAreaColor'
],
'label-selector': ['seriesLabelFormatter'], 'label-selector': ['seriesLabelFormatter'],
'tooltip-selector': ['color', 'fontSize', 'backgroundColor', 'seriesTooltipFormatter', 'show'], 'tooltip-selector': ['color', 'fontSize', 'backgroundColor', 'seriesTooltipFormatter', 'show'],
'misc-style-selector': ['showName', 'color', 'fontSize', 'axisColor', 'axisValue'], 'misc-style-selector': ['showName', 'color', 'fontSize', 'axisColor', 'axisValue'],