From e98eb89cd28d3443a9d8475344be8c93d8b4056d Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Mon, 28 Aug 2023 13:53:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/packages/BasicComponents/Input/index.vue | 6 +++---
 data-room-ui/packages/js/utils/themeFormatting.js     | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/Input/index.vue b/data-room-ui/packages/BasicComponents/Input/index.vue
index 2c49e835..ee0000df 100644
--- a/data-room-ui/packages/BasicComponents/Input/index.vue
+++ b/data-room-ui/packages/BasicComponents/Input/index.vue
@@ -81,9 +81,9 @@ export default {
       // 样式改变时更新主题配置
       config.theme = settingToTheme(_.cloneDeep(config), this.customTheme)
       this.changeChartConfig(config)
-      if (config.code === this.activeCode) {
-        this.changeActiveItemConfig(config)
-      }
+      // if (config.code === this.activeCode) {
+      //   this.changeActiveItemConfig(config)
+      // }
     }
   }
 }
diff --git a/data-room-ui/packages/js/utils/themeFormatting.js b/data-room-ui/packages/js/utils/themeFormatting.js
index df512cb4..e5f9c005 100644
--- a/data-room-ui/packages/js/utils/themeFormatting.js
+++ b/data-room-ui/packages/js/utils/themeFormatting.js
@@ -27,7 +27,8 @@ export function settingToTheme (config, type) {
         for (const item in config.customize) {
           const value = config.customize[item];
           //如果包含二级属性
-          if (typeof value === 'object' &&  Object.keys(value).length){
+          debugger
+          if (value && typeof value === 'object' &&  Object.keys(value).length){
             // 对于二级属性
             for (const subKey in value) {
               if (subKey.includes('color') || subKey.includes('Color') || subKey.includes('BGC')){