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

fix(图表): 修复存量透视表表头颜色错误

Browse Source
This commit is contained in:
wisonic 2025-01-15 12:04:04 +08:00 committed by wisonic-s
parent c33a3842cd
commit 0d62d5822d
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue
View File

@ -70,6 +70,22 @@ const changeTableHeader = prop => {
const init = () => {
const tableHeader = props.chart?.customAttr?.tableHeader
if (tableHeader) {
// 存量透视表处理
if (!tableHeader.tableHeaderColBgColor) {
tableHeader.tableHeaderColBgColor = tableHeader.tableHeaderBgColor
tableHeader.tableHeaderColFontColor = tableHeader.tableHeaderFontColor
tableHeader.tableTitleColFontSize = tableHeader.tableTitleFontSize
tableHeader.tableHeaderColAlign = tableHeader.tableHeaderAlign
tableHeader.isColBolder = tableHeader.isBolder
tableHeader.isColItalic = tableHeader.isItalic
tableHeader.tableHeaderCornerBgColor = tableHeader.tableHeaderBgColor
tableHeader.tableHeaderCornerFontColor = tableHeader.tableHeaderFontColor
tableHeader.tableTitleCornerFontSize = tableHeader.tableTitleFontSize
tableHeader.tableHeaderCornerAlign = tableHeader.tableHeaderAlign
tableHeader.isCornerBolder = tableHeader.isBolder
tableHeader.isCornerItalic = tableHeader.isItalic
}
state.tableHeaderForm = defaultsDeep(cloneDeep(tableHeader), cloneDeep(DEFAULT_TABLE_HEADER))
if (!isAlphaColor(state.tableHeaderForm.tableHeaderBgColor)) {
const alpha = props.chart.customAttr.basicStyle.alpha

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

@ -389,7 +389,6 @@ export class TablePivot extends S2ChartView<PivotSheet> {
if (!isAlphaColor(tableBorderColor)) {
tableBorderColor = hexColorToRGBA(tableBorderColor, basicStyle.alpha)
}
const tableHeaderFontColor = hexColorToRGBA(tableHeader.tableHeaderFontColor, basicStyle.alpha)
const tableHeaderColFontColor = hexColorToRGBA(
tableHeader.tableHeaderColFontColor,
basicStyle.alpha
@ -398,10 +397,8 @@ export class TablePivot extends S2ChartView<PivotSheet> {
tableHeader.tableHeaderCornerFontColor,
basicStyle.alpha
)
const fontStyle = tableHeader.isItalic ? 'italic' : 'normal'
const colFontStyle = tableHeader.isColItalic ? 'italic' : 'normal'
const cornerFontStyle = tableHeader.isCornerItalic ? 'italic' : 'normal'
const fontWeight = tableHeader.isBolder === false ? 'normal' : 'bold'
const colFontWeight = tableHeader.isColBolder === false ? 'normal' : 'bold'
const cornerFontWeight = tableHeader.isCornerBolder === false ? 'normal' : 'bold'
const pivotTheme = {

17
core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
View File

@ -185,6 +185,23 @@ const handleDefaultVal = (chart: Chart) => {
customAttr.tableTotal.row.subTotalsDimensionsNew =
!!customAttr.tableTotal.row.subTotalsDimensionsNew
}
const { tableHeader } = customAttr
// 存量透视表处理
if (!tableHeader.tableHeaderColBgColor) {
tableHeader.tableHeaderColBgColor = tableHeader.tableHeaderBgColor
tableHeader.tableHeaderColFontColor = tableHeader.tableHeaderFontColor
tableHeader.tableTitleColFontSize = tableHeader.tableTitleFontSize
tableHeader.tableHeaderColAlign = tableHeader.tableHeaderAlign
tableHeader.isColBolder = tableHeader.isBolder
tableHeader.isColItalic = tableHeader.isItalic
tableHeader.tableHeaderCornerBgColor = tableHeader.tableHeaderBgColor
tableHeader.tableHeaderCornerFontColor = tableHeader.tableHeaderFontColor
tableHeader.tableTitleCornerFontSize = tableHeader.tableTitleFontSize
tableHeader.tableHeaderCornerAlign = tableHeader.tableHeaderAlign
tableHeader.isCornerBolder = tableHeader.isBolder
tableHeader.isCornerItalic = tableHeader.isItalic
}
}
}
const renderChart = (viewInfo: Chart, resetPageInfo: boolean) => {