From d372d35f43ab74fbfa6d6d3c2b408a75f9e76a0b Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Fri, 22 Dec 2023 16:55:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E7=BB=84?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=BB=84=E4=BB=B6=E5=9C=A8=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=86=E6=B8=90=E5=8F=98=E8=89=B2=E4=BF=9D=E5=AD=98=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F=E6=95=B0=E6=8D=AE=E5=90=8E=E5=88=B7=E6=96=B0=EF=BC=8C?=
 =?UTF-8?q?=E6=B8=90=E5=8F=98=E8=89=B2=E6=95=B0=E6=8D=AE=E8=A2=AB=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BasicComponents/Numbers/index.vue        | 11 +++++++++++
 .../packages/BigScreenDesign/PageDesignTop.vue        |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/Numbers/index.vue b/data-room-ui/packages/BasicComponents/Numbers/index.vue
index 023562e7..00df8440 100644
--- a/data-room-ui/packages/BasicComponents/Numbers/index.vue
+++ b/data-room-ui/packages/BasicComponents/Numbers/index.vue
@@ -12,6 +12,8 @@
   </div>
 </template>
 <script>
+import cloneDeep from 'lodash/cloneDeep'
+import { settingToTheme } from 'data-room-ui/js/utils/themeFormatting'
 import commonMixins from 'data-room-ui/js/mixins/commonMixins'
 import paramsMixins from 'data-room-ui/js/mixins/paramsMixins'
 import linkageMixins from 'data-room-ui/js/mixins/linkageMixins'
@@ -36,11 +38,20 @@ export default {
   },
   mounted () {
     this.chartInit()
+    console.log(this.config.customize.color)
   },
   methods: {
     changeStyle (config) {
       config.customize.title = config.customize.thousands ? config.customize?.title?.toString()?.replace(/\B(?=(\d{3})+(?!\d))/g, ',') : config.customize.title
       this.changeChartConfig(config)
+      config = { ...this.config, ...config }
+      // 样式改变时更新主题配置
+      config.theme = settingToTheme(cloneDeep(config), this.customTheme)
+      this.changeChartConfig(config)
+      if (config.code === this.activeCode) {
+        this.changeActiveItemConfig(config)
+      }
+      return config
     },
     // 通过表达式计算得来的值
     getDataByExpression (config) {
diff --git a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue
index eb2730d7..e182035a 100644
--- a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue
+++ b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue
@@ -457,10 +457,10 @@ export default {
                   customClass: 'bs-el-message-box'
                 }).then(async () => {
                   res = await saveScreen(pageInfo)
-                  this.$message.success('数据保存成功')
+                  this.$message.success('保存成功')
                 }).catch(async () => {
                   res = await saveScreen(pageInfo)
-                  this.$message.success('数据保存成功')
+                  this.$message.success('保存成功')
                 })
               }
             } else {
@@ -486,7 +486,7 @@ export default {
               pageInfo.coverPicture = dataUrl
             }
             res = await saveScreen(pageInfo)
-            this.$message.success('数据保存成功')
+            this.$message.success('保存成功')
           }
           return res
         }