Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
sts网站
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyang
sts网站
Commits
5d72f9d2
Commit
5d72f9d2
authored
Sep 03, 2021
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复保存配置主题颜色失效问题
parent
e49f0ceb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
6 deletions
+15
-6
index.vue
ruoyi-ui/src/components/ThemePicker/index.vue
+14
-4
settings.js
ruoyi-ui/src/store/modules/settings.js
+1
-2
No files found.
ruoyi-ui/src/components/ThemePicker/index.vue
View file @
5d72f9d2
...
...
@@ -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
)
=>
{
...
...
ruoyi-ui/src/store/modules/settings.js
View file @
5d72f9d2
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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment