From 0d62d5822dffe551493c228b2cd05f1d8ca161aa Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Wed, 15 Jan 2025 12:04:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AD=98=E9=87=8F=E9=80=8F=E8=A7=86=E8=A1=A8=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/table/TableHeaderSelector.vue    | 16 ++++++++++++++++
 .../js/panel/charts/table/table-pivot.ts        |  3 ---
 .../views/components/ChartComponentS2.vue       | 17 +++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue
index 3931d8f226..a411edc4da 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue
@@ -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
diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts
index b99ae1885f..c1eea79a1b 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts
@@ -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 = {
diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
index 48183d32c6..850c2abe95 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
@@ -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) => {