Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
ant-design-pro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
duanledexianxianxian
ant-design-pro
Commits
a9b19e99
Unverified
Commit
a9b19e99
authored
Jun 04, 2019
by
陈帅
Committed by
GitHub
Jun 04, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4373 from kaoding/master
防止每次刷新都要“切换主题”
parents
3916692c
d8b6227b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
src/models/setting.ts
src/models/setting.ts
+3
-3
No files found.
src/models/setting.ts
View file @
a9b19e99
...
@@ -104,7 +104,7 @@ const SettingModel: SettingModelType = {
...
@@ -104,7 +104,7 @@ const SettingModel: SettingModelType = {
});
});
const
{
primaryColor
,
colorWeak
}
=
setting
;
const
{
primaryColor
,
colorWeak
}
=
setting
;
if
(
state
.
primaryColor
!==
primaryColor
)
{
if
(
primaryColor
&&
state
.
primaryColor
!==
primaryColor
)
{
updateTheme
(
primaryColor
);
updateTheme
(
primaryColor
);
}
}
updateColorWeak
(
!!
colorWeak
);
updateColorWeak
(
!!
colorWeak
);
...
@@ -133,13 +133,13 @@ const SettingModel: SettingModelType = {
...
@@ -133,13 +133,13 @@ const SettingModel: SettingModelType = {
}
}
});
});
const
{
primaryColor
,
colorWeak
,
contentWidth
}
=
payload
;
const
{
primaryColor
,
colorWeak
,
contentWidth
}
=
payload
;
if
(
state
.
primaryColor
!==
primaryColor
)
{
if
(
primaryColor
&&
state
.
primaryColor
!==
primaryColor
)
{
updateTheme
(
primaryColor
);
updateTheme
(
primaryColor
);
}
}
if
(
state
.
contentWidth
!==
contentWidth
&&
window
.
dispatchEvent
)
{
if
(
state
.
contentWidth
!==
contentWidth
&&
window
.
dispatchEvent
)
{
window
.
dispatchEvent
(
new
Event
(
'
resize
'
));
window
.
dispatchEvent
(
new
Event
(
'
resize
'
));
}
}
updateColorWeak
(
colorWeak
);
updateColorWeak
(
!!
colorWeak
);
window
.
history
.
replaceState
(
null
,
'
setting
'
,
urlParams
.
href
);
window
.
history
.
replaceState
(
null
,
'
setting
'
,
urlParams
.
href
);
return
{
return
{
...
state
,
...
state
,
...
...
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