github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #13747 from dataease/pr@dev-v2@chart-line-style-fix

Browse Source 
fix(图表): 修复折线图条件样式对计数字段的条件无效的问题
This commit is contained in:
jianneng-fit2cloud 2024-12-03 09:28:55 +08:00 committed by GitHub
commit 97063f2595
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1377,43 +1377,41 @@ export function getConditions(chart: Chart) {
continue
}
for (const t of field.conditions) {
if ([2, 3, 4].includes(field.field.deType)) {
const annotation = {
type: 'regionFilter',
start: ['start', 'median'],
end: ['end', 'min'],
color: t.color
}
// 加中线
const annotationLine = {
type: 'line',
start: ['start', t.value],
end: ['end', t.value],
style: {
stroke: t.color,
lineDash: [2, 2]
}
}
if (t.term === 'between') {
annotation.start = ['start', parseFloat(t.min)]
annotation.end = ['end', parseFloat(t.max)]
annotationLine.start = ['start', parseFloat(t.min)]
annotationLine.end = ['end', parseFloat(t.min)]
annotations.push(JSON.parse(JSON.stringify(annotationLine)))
annotationLine.start = ['start', parseFloat(t.max)]
annotationLine.end = ['end', parseFloat(t.max)]
annotations.push(annotationLine)
} else if (['lt', 'le'].includes(t.term)) {
annotation.start = ['start', t.value]
annotation.end = ['end', 'min']
annotations.push(annotationLine)
} else if (['gt', 'ge'].includes(t.term)) {
annotation.start = ['start', t.value]
annotation.end = ['end', 'max']
annotations.push(annotationLine)
}
annotations.push(annotation)
const annotation = {
type: 'regionFilter',
start: ['start', 'median'],
end: ['end', 'min'],
color: t.color
}
// 加中线
const annotationLine = {
type: 'line',
start: ['start', t.value],
end: ['end', t.value],
style: {
stroke: t.color,
lineDash: [2, 2]
}
}
if (t.term === 'between') {
annotation.start = ['start', parseFloat(t.min)]
annotation.end = ['end', parseFloat(t.max)]
annotationLine.start = ['start', parseFloat(t.min)]
annotationLine.end = ['end', parseFloat(t.min)]
annotations.push(JSON.parse(JSON.stringify(annotationLine)))
annotationLine.start = ['start', parseFloat(t.max)]
annotationLine.end = ['end', parseFloat(t.max)]
annotations.push(annotationLine)
} else if (['lt', 'le'].includes(t.term)) {
annotation.start = ['start', t.value]
annotation.end = ['end', 'min']
annotations.push(annotationLine)
} else if (['gt', 'ge'].includes(t.term)) {
annotation.start = ['start', t.value]
annotation.end = ['end', 'max']
annotations.push(annotationLine)
}
annotations.push(annotation)
}
}
return annotations