From 73edb7b2f3f1b688122b9d353c0cfbb4f5b1ce37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?=
 <42510293+ziyujiahao@users.noreply.github.com>
Date: Wed, 15 Apr 2026 19:17:45 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8E=86=E5=8F=B2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=80=82=E9=85=8D=20(#18275)=20(#18276)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard-style/ComponentColorSelector.vue  | 17 +++--------------
 core/core-frontend/src/utils/canvasUtils.ts     | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/ComponentColorSelector.vue b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/ComponentColorSelector.vue
index 4315d6e336..fef2e7fc6d 100644
--- a/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/ComponentColorSelector.vue
+++ b/core/core-frontend/src/components/dashboard/subject-setting/dashboard-style/ComponentColorSelector.vue
@@ -380,20 +380,9 @@ const fontSizeList = computed(() => {
   return arr
 })
 
-const colorForm = computed(() => ({
-  ...(canvasStyleData.value.component.chartColor as DeepPartial<ChartAttr>),
-  label: {
-    color: '#000000',
-    fontSize: 12,
-    ...(canvasStyleData.value.component.chartColor?.label || {})
-  },
-  tooltip: {
-    color: '#000000',
-    fontSize: 12,
-    backgroundColor: '#FFFFFF',
-    ...(canvasStyleData.value.component.chartColor?.tooltip || {})
-  }
-}))
+const colorForm = computed(
+  () => canvasStyleData.value.component.chartColor as DeepPartial<ChartAttr>
+)
 
 const seniorForm = computed(() => canvasStyleData.value.component.seniorStyleSetting)
 
diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index 21d6713415..8ede7eeb60 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -346,6 +346,21 @@ export function historyAdaptor(
   canvasStyleResult['component']['formatterItem'] =
     canvasStyleResult['component']['formatterItem'] || deepCopy(formatterItem)
 
+  canvasStyleResult.component.chartColor = {
+    ...canvasStyleResult.component.chartColor,
+    label: {
+      color: '#000000',
+      fontSize: 12,
+      ...(canvasStyleResult.component.chartColor?.label || {})
+    },
+    tooltip: {
+      color: '#000000',
+      fontSize: 12,
+      backgroundColor: '#FFFFFF',
+      ...(canvasStyleResult.component.chartColor?.tooltip || {})
+    }
+  }
+
   canvasDataResult.forEach(componentItem => {
     historyItemAdaptor(componentItem, reportFilterInfo, attachInfo, canvasVersion, canvasInfo)
   })