public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-14 12:22:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(图表): 修复图表的提示配置，自定义显示指标字段时，如果指标字段是非数值类型图表报错的问题

Browse Source
This commit is contained in:
jianneng-fit2cloud
2026-04-14 16:39:22 +08:00
committed by jianneng-fit2cloud
parent b81b6c9fa0
commit 8e3e666b25
6 changed files with 77 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java
View File

@@ -630,9 +630,15 @@ public class ChartDataBuild {
DynamicValueDTO valueDTO = new DynamicValueDTO();
ChartViewFieldDTO f = view.getExtLabel().get(ii);
int idx = extLabelStart + ii;
BigDecimal value = (idx < row.length && StringUtils.isNotEmpty(row[idx])) ? new BigDecimal(row[idx]) : null;
if (idx < row.length && StringUtils.isNotEmpty(row[idx])) {
try {
valueDTO.setValue(new BigDecimal(row[idx]));
} catch (NumberFormatException e) {
// 时间等非数值类型，保留原始字符串
valueDTO.setStringValue(row[idx]);
}
}
valueDTO.setFieldId(f.getId());
valueDTO.setValue(value);
dynamicLabelValue.add(valueDTO);
}
}
@@ -641,9 +647,15 @@ public class ChartDataBuild {
DynamicValueDTO valueDTO = new DynamicValueDTO();
ChartViewFieldDTO f = view.getExtTooltip().get(ii);
int idx = extTooltipStart + ii;
BigDecimal value = (idx < row.length && StringUtils.isNotEmpty(row[idx])) ? new BigDecimal(row[idx]) : null;
if (idx < row.length && StringUtils.isNotEmpty(row[idx])) {
try {
valueDTO.setValue(new BigDecimal(row[idx]));
} catch (NumberFormatException e) {
// 时间等非数值类型，保留原始字符串
valueDTO.setStringValue(row[idx]);
}
}
valueDTO.setFieldId(f.getId());
valueDTO.setValue(value);
dynamicTooltipValue.add(valueDTO);
}
}
@@ -1633,9 +1645,15 @@ public class ChartDataBuild {
for (int ii = 0; ii < view.getExtLabel().size(); ii++) {
DynamicValueDTO valueDTO = new DynamicValueDTO();
ChartViewFieldDTO chartViewFieldDTO = view.getExtLabel().get(ii);
BigDecimal value = StringUtils.isEmpty(row[ii + (size - extSize)]) ? null : new BigDecimal(row[ii + (size - extSize)]);
String raw = row[ii + (size - extSize)];
if (StringUtils.isNotEmpty(raw)) {
try {
valueDTO.setValue(new BigDecimal(raw));
} catch (NumberFormatException e) {
valueDTO.setStringValue(raw);
}
}
valueDTO.setFieldId(chartViewFieldDTO.getId());
valueDTO.setValue(value);
dynamicLabelValue.add(valueDTO);
}
}
@@ -1643,9 +1661,15 @@ public class ChartDataBuild {
for (int ii = 0; ii < view.getExtTooltip().size(); ii++) {
DynamicValueDTO valueDTO = new DynamicValueDTO();
ChartViewFieldDTO chartViewFieldDTO = view.getExtTooltip().get(ii);
BigDecimal value = StringUtils.isEmpty(row[ii + (size - extSize) + view.getExtLabel().size()]) ? null : new BigDecimal(row[ii + (size - extSize) + view.getExtLabel().size()]);
String raw = row[ii + (size - extSize) + view.getExtLabel().size()];
if (StringUtils.isNotEmpty(raw)) {
try {
valueDTO.setValue(new BigDecimal(raw));
} catch (NumberFormatException e) {
valueDTO.setStringValue(raw);
}
}
valueDTO.setFieldId(chartViewFieldDTO.getId());
valueDTO.setValue(value);
dynamicTooltipValue.add(valueDTO);
}
}

21
core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue
View File

@@ -205,6 +205,11 @@ const COUNT_AGGREGATION_TYPE = [
]
const COUNT_DE_TYPE = [0, 1, 5]
// 当前选中的指标是否为非数值类型，非数值类型禁用数值格式配置
const isNonNumericFormatter = computed(() => {
return COUNT_DE_TYPE.includes(curSeriesFormatter.value?.deType)
})
const aggregationList = computed(() => {
if (COUNT_DE_TYPE.includes(curSeriesFormatter.value?.deType)) {
return COUNT_AGGREGATION_TYPE
@@ -851,7 +856,7 @@ onMounted(() => {
>
<el-select
size="small"
:disabled="!curSeriesFormatter.show"
:disabled="!curSeriesFormatter.show || isNonNumericFormatter"
style="width: 100%"
:effect="props.themes"
v-model="curSeriesFormatter.formatterCfg.type"
@@ -873,7 +878,7 @@ onMounted(() => {
>
<el-input-number
controls-position="right"
:disabled="!curSeriesFormatter.show"
:disabled="!curSeriesFormatter.show || isNonNumericFormatter"
style="width: 100%"
:effect="props.themes"
v-model="curSeriesFormatter.formatterCfg.decimalCount"
@@ -895,7 +900,9 @@ onMounted(() => {
>
<el-select
:disabled="
!curSeriesFormatter.show || curSeriesFormatter.formatterCfg.type == 'percent'
!curSeriesFormatter.show ||
isNonNumericFormatter ||
curSeriesFormatter.formatterCfg.type == 'percent'
"
size="small"
:effect="themes"
@@ -923,7 +930,9 @@ onMounted(() => {
>
<el-select
:disabled="
!curSeriesFormatter.show || curSeriesFormatter.formatterCfg.type == 'percent'
!curSeriesFormatter.show ||
isNonNumericFormatter ||
curSeriesFormatter.formatterCfg.type == 'percent'
"
:effect="props.themes"
v-model="curSeriesFormatter.formatterCfg.unit"
@@ -949,7 +958,7 @@ onMounted(() => {
:class="'form-item-' + themes"
>
<el-input
:disabled="!curSeriesFormatter.show"
:disabled="!curSeriesFormatter.show || isNonNumericFormatter"
:effect="props.themes"
v-model="curSeriesFormatter.formatterCfg.suffix"
maxlength="30"
@@ -965,7 +974,7 @@ onMounted(() => {
<el-form-item class="form-item" :class="'form-item-' + themes">
<el-checkbox
:disabled="!curSeriesFormatter.show"
:disabled="!curSeriesFormatter.show || isNonNumericFormatter"
size="small"
:effect="props.themes"
v-model="curSeriesFormatter.formatterCfg.thousandSeparator"

5
core/core-frontend/src/views/chart/components/js/panel/charts/others/scatter-multi.ts
View File

@@ -423,7 +423,10 @@ export class MultiScatter extends G2PlotChartView<ScatterOptions, G2Scatter> {
datum.dynamicTooltipValue?.forEach(item => {
const formatter = formatterMap[item.fieldId]
if (formatter) {
const value = valueFormatter(parseFloat(item.value), formatter.formatterCfg)
const value =
item.value != null
? valueFormatter(parseFloat(item.value), formatter.formatterCfg)
: item.stringValue ?? ''
const name = isEmpty(formatter.chartShowName) ? formatter.name : formatter.chartShowName
result.push({ color: 'grey', name, value, marker: true })
}

10
core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
View File

@@ -307,7 +307,10 @@ export function getMultiSeriesTooltip(chart: Chart) {
head.data.dynamicTooltipValue?.forEach(item => {
const formatter = formatterMap[item.fieldId]
if (formatter) {
const value = valueFormatter(parseFloat(item.value), formatter.formatterCfg)
const value =
item.value != null
? valueFormatter(parseFloat(item.value), formatter.formatterCfg)
: item.stringValue ?? ''
const name = isEmpty(formatter.chartShowName) ? formatter.name : formatter.chartShowName
result.push({ color: 'grey', name, value })
}
@@ -1028,7 +1031,10 @@ export function configL7Tooltip(chart: Chart): TooltipOptions {
head.dynamicTooltipValue?.forEach(item => {
const formatter = formatterMap[item.fieldId]
if (formatter) {
const value = valueFormatter(parseFloat(item.value), formatter.formatterCfg)
const value =
item.value != null
? valueFormatter(parseFloat(item.value), formatter.formatterCfg)
: item.stringValue ?? ''
const name = isEmpty(formatter.chartShowName) ? formatter.name : formatter.chartShowName
result.push({ color: 'grey', name, value: `${value ?? ''}` })
}

1
sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/DynamicValueDTO.java
View File

@@ -14,4 +14,5 @@ public class DynamicValueDTO {
@JsonSerialize(using = ToStringSerializer.class)
private Long fieldId;
private BigDecimal value;
private String stringValue;
}

20
sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/util/ChartDataUtil.java
View File

@@ -271,9 +271,15 @@ public class ChartDataUtil {
for (int ii = 0; ii < view.getExtLabel().size(); ii++) {
DynamicValueDTO valueDTO = new DynamicValueDTO();
ChartViewFieldDTO chartViewFieldDTO = view.getExtLabel().get(ii);
BigDecimal value = StringUtils.isEmpty(row[ii + (size - extSize)]) ? null : new BigDecimal(row[ii + (size - extSize)]);
String raw = row[ii + (size - extSize)];
if (StringUtils.isNotEmpty(raw)) {
try {
valueDTO.setValue(new BigDecimal(raw));
} catch (NumberFormatException e) {
valueDTO.setStringValue(raw);
}
}
valueDTO.setFieldId(chartViewFieldDTO.getId());
valueDTO.setValue(value);
dynamicLabelValue.add(valueDTO);
}
}
@@ -281,9 +287,15 @@ public class ChartDataUtil {
for (int ii = 0; ii < view.getExtTooltip().size(); ii++) {
DynamicValueDTO valueDTO = new DynamicValueDTO();
ChartViewFieldDTO chartViewFieldDTO = view.getExtTooltip().get(ii);
BigDecimal value = StringUtils.isEmpty(row[ii + (size - extSize) + view.getExtLabel().size()]) ? null : new BigDecimal(row[ii + (size - extSize) + view.getExtLabel().size()]);
String raw = row[ii + (size - extSize) + view.getExtLabel().size()];
if (StringUtils.isNotEmpty(raw)) {
try {
valueDTO.setValue(new BigDecimal(raw));
} catch (NumberFormatException e) {
valueDTO.setStringValue(raw);
}
}
valueDTO.setFieldId(chartViewFieldDTO.getId());
valueDTO.setValue(value);
dynamicTooltipValue.add(valueDTO);
}
}