dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13186 from dataease/dev-v2

Browse Source 
merge: 合并分支
This commit is contained in:
wisonic-s 2024-11-06 19:45:39 +08:00 committed by GitHub
commit 1220f2dde7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,7 +353,10 @@ export class TablePivot extends S2ChartView<PivotSheet> {
if (!isAlphaColor(tableHeaderBgColor)) {
tableHeaderBgColor = hexColorToRGBA(tableHeaderBgColor, basicStyle.alpha)
}
const tableBorderColor = hexColorToRGBA(basicStyle.tableBorderColor, basicStyle.alpha)
let tableBorderColor = basicStyle.tableBorderColor
if (!isAlphaColor(tableBorderColor)) {
tableBorderColor = hexColorToRGBA(tableBorderColor, basicStyle.alpha)
}
const tableHeaderFontColor = hexColorToRGBA(tableHeader.tableHeaderFontColor, basicStyle.alpha)
const fontStyle = tableHeader.isItalic ? 'italic' : 'normal'
const fontWeight = tableHeader.isBolder === false ? 'normal' : 'bold'