diff --git a/core/frontend/src/views/chart/chart/table/table-info.js b/core/frontend/src/views/chart/chart/table/table-info.js index 7e94bed258..687beb009a 100644 --- a/core/frontend/src/views/chart/chart/table/table-info.js +++ b/core/frontend/src/views/chart/chart/table/table-info.js @@ -747,9 +747,14 @@ function getConditions(chart) { res.text.push({ field: field.field.dataeaseName, mapping(value, rowData) { + // 总计小计 if (rowData?.isTotals) { return null } + // 表头 + if (rowData?.id && rowData?.field === rowData.id) { + return null + } return { fill: mappingColor(value, defaultTextColor, field, 'color', filedValueMap, rowData) } @@ -761,6 +766,9 @@ function getConditions(chart) { if (rowData?.isTotals) { return null } + if (rowData?.id && rowData?.field === rowData.id) { + return null + } const fill = mappingColor(value, defaultBgColor, field, 'backgroundColor', filedValueMap, rowData) if (fill) { return { fill } diff --git a/core/frontend/src/views/chart/components/senior/Threshold.vue b/core/frontend/src/views/chart/components/senior/Threshold.vue index b0f1ba128c..9b5d85a2b4 100644 --- a/core/frontend/src/views/chart/components/senior/Threshold.vue +++ b/core/frontend/src/views/chart/components/senior/Threshold.vue @@ -384,9 +384,13 @@ {{ item.enumValues.join(',') }} + + + {{ item.enumValues.join(',') }} + + diff --git a/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue b/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue index 806ea8fbc8..fcd6395c90 100644 --- a/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue +++ b/core/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue @@ -719,7 +719,7 @@ export default { const fieldType = this.getFieldType(fieldId) if (fieldType) { post('/chart/view/getFieldData/' + this.chart.id + '/' + this.panelInfo.id + '/' + fieldId + '/' + fieldType, {}).then(response => { - this.$set(this.fieldEnumValues, fieldId, response.data) + this.$set(this.fieldEnumValues, fieldId, response.data?.filter(i => i && i.trim())) }) } },