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

fix(图表): 修复表格日期字段条件样式判空不生效 #17710

Browse Source
This commit is contained in:
wisonic
2026-01-07 15:58:29 +08:00
committed by wisonic-s
parent af49f69778
commit 97e2800e50
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts
View File

@@ -268,11 +268,11 @@ export class TablePivot extends S2ChartView<PivotSheet> {
// 默认展开层级
if (basicStyle.tableLayoutMode === 'tree') {
const { defaultExpandLevel } = basicStyle
if (isNumber(defaultExpandLevel)) {
if (defaultExpandLevel >= chart.xAxis.length) {
s2Options.style.rowExpandDepth = defaultExpandLevel
if (isNumeric(defaultExpandLevel)) {
if ((defaultExpandLevel as number) >= chart.xAxis.length) {
s2Options.style.rowExpandDepth = defaultExpandLevel as number
} else {
s2Options.style.rowExpandDepth = defaultExpandLevel - 2
s2Options.style.rowExpandDepth = (defaultExpandLevel as number) - 2
}
}
if (defaultExpandLevel === 'all') {

2
core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts
View File

@@ -813,7 +813,7 @@ export function mappingColor(value, defaultColor, field, type, filedValueMap?, r
} else {
const fc = field.conditions[i]
if (fc.term === 'null') {
if (value === null && value === undefined && value === '') {
if (value === null || value === undefined || value === '') {
color = fc[type]
flag = true
}