center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #13177 from dataease/pr@dev-v2@fix_threshold_field_font_color_alpha

Browse Source 
Pr@dev v2@fix threshold field font color alpha
This commit is contained in:
wisonic-s 2024-11-06 17:15:35 +08:00 committed by GitHub
commit 0bf8dceaa4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,7 +564,7 @@ export function getConditions(chart: Chart) {
if (conditions?.length > 0) { if (conditions?.length > 0) {
const { tableCell, basicStyle, tableHeader } = parseJson(chart.customAttr) const { tableCell, basicStyle, tableHeader } = parseJson(chart.customAttr)
const enableTableCrossBG = tableCell.enableTableCrossBG const enableTableCrossBG = tableCell.enableTableCrossBG
const valueColor = tableCell.tableFontColor const valueColor = isAlphaColor(tableCell.tableFontColor) ? tableCell.tableFontColor : hexColorToRGBA(tableCell.tableFontColor, basicStyle.alpha)
const valueBgColor = enableTableCrossBG const valueBgColor = enableTableCrossBG
? null ? null
: isAlphaColor(tableCell.tableItemBgColor) : isAlphaColor(tableCell.tableItemBgColor)
@ -629,7 +629,7 @@ export function getConditions(chart: Chart) {
} }
export function mappingColor(value, defaultColor, field, type, filedValueMap?, rowData?) { export function mappingColor(value, defaultColor, field, type, filedValueMap?, rowData?) {
let color let color = null
for (let i = 0; i < field.conditions.length; i++) { for (let i = 0; i < field.conditions.length; i++) {
let flag = false let flag = false
const t = field.conditions[i] const t = field.conditions[i]