From 63900da8c27e7e18525638def75663db90823756 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 17 Feb 2022 09:39:37 +0800
Subject: [PATCH] =?UTF-8?q?v3.7.0=20=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=BB=E9=A2=98=E9=A2=9C=E8=89=B2=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ThemePicker/index.vue       | 18 ++++++++++++++----
 yudao-ui-admin/src/store/modules/settings.js   |  3 +--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/yudao-ui-admin/src/components/ThemePicker/index.vue b/yudao-ui-admin/src/components/ThemePicker/index.vue
index b0df471ca..5589f5fff 100644
--- a/yudao-ui-admin/src/components/ThemePicker/index.vue
+++ b/yudao-ui-admin/src/components/ThemePicker/index.vue
@@ -31,13 +31,24 @@ export default {
       immediate: true
     },
     async theme(val) {
+      await this.setTheme(val)
+    }
+  },
+  created() {
+    if(this.defaultTheme !== ORIGINAL_THEME) {
+      this.setTheme(this.defaultTheme)
+    }
+  },
+
+  methods: {
+    async setTheme(val) {
       const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
       if (typeof val !== 'string') return
       const themeCluster = this.getThemeCluster(val.replace('#', ''))
       const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
 
       const $message = this.$message({
-        message: '  Compiling the theme',
+        message: '  正在切换主题，请稍后...',
         customClass: 'theme-message',
         type: 'success',
         duration: 0,
@@ -82,10 +93,9 @@ export default {
       this.$emit('change', val)
 
       $message.close()
-    }
-  },
 
-  methods: {
+    },
+
     updateStyle(style, oldCluster, newCluster) {
       let newStyle = style
       oldCluster.forEach((color, index) => {
diff --git a/yudao-ui-admin/src/store/modules/settings.js b/yudao-ui-admin/src/store/modules/settings.js
index 647a8ce0c..5f36d8eee 100644
--- a/yudao-ui-admin/src/store/modules/settings.js
+++ b/yudao-ui-admin/src/store/modules/settings.js
@@ -1,4 +1,3 @@
-import variables from '@/assets/styles/element-variables.scss'
 import defaultSettings from '@/settings'
 
 const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
@@ -6,7 +5,7 @@ const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dyn
 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
   title: '',
-  theme: storageSetting.theme || variables.theme,
+  theme: storageSetting.theme || '#409EFF',
   sideTheme: storageSetting.sideTheme || sideTheme,
   showSettings: showSettings,
   topNav:  storageSetting.topNav === undefined ? topNav : storageSetting.topNav,