Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivWeb
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
ReactWeb5
CivWeb
Commits
bbe7bf69
Commit
bbe7bf69
authored
May 16, 2023
by
杨思琦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 登出状态保存修复
parent
99495221
Pipeline
#72470
passed with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
SimpleRiightContent.js
src/components/GlobalHeader/SimpleRiightContent.js
+8
-4
BasicLayout.js
src/layouts/BasicLayout.js
+0
-1
micro.js
src/micro.js
+1
-1
No files found.
src/components/GlobalHeader/SimpleRiightContent.js
View file @
bbe7bf69
...
...
@@ -7,8 +7,7 @@ import { connect } from 'react-redux';
import
Icon
from
'@ant-design/icons'
;
import
{
AvatarDropdown
as
Avatar
,
useIntl
}
from
'@wisdom-utils/components'
;
import
HeaderSearch
from
'@wisdom-utils/components/lib/layout/components/HeaderSearch'
;
import
{
useHistory
}
from
'@wisdom-utils/runtime'
;
import
{
useHistory
,
useAliveController
}
from
'@wisdom-utils/runtime'
;
import
order
from
'../../assets/basic/message.png'
;
import
notice
from
'../../assets/basic/notice.png'
;
import
search
from
'../../assets/basic/search.png'
;
...
...
@@ -60,7 +59,7 @@ const GlobalHeaderRight = props => {
const
history
=
useHistory
();
const
{
theme
,
layout
}
=
props
;
let
className
=
styles
.
right
;
const
{
clear
}
=
useAliveController
();
if
(
theme
===
'dark'
&&
layout
===
'top'
)
{
className
=
`
${
styles
.
right
}
${
styles
.
dark
}
`
;
}
...
...
@@ -174,6 +173,11 @@ const GlobalHeaderRight = props => {
)
}
const
logout
=
()
=>
{
clear
();
props
.
logout
();
}
const
renderTopMenu
=
()
=>
{
if
(
!
props
.
global
||
!
props
.
global
.
topMenu
)
return
null
;
const
topMenus
=
props
.
global
.
topMenu
.
split
(
','
)
||
[];
...
...
@@ -210,7 +214,7 @@ const GlobalHeaderRight = props => {
return
(
<
div
className
=
{
className
}
>
{
renderTopMenu
()}
<
Avatar
menu
config
=
{
props
.
global
}
updateCurrentIndex
=
{
props
.
updateCurrentIndex
}
updateConfig
=
{
props
.
updateConfig
}
logout
=
{
props
.
logout
}
/
>
<
Avatar
menu
config
=
{
props
.
global
}
updateCurrentIndex
=
{
props
.
updateCurrentIndex
}
updateConfig
=
{
props
.
updateConfig
}
logout
=
{
logout
}
/
>
<
/div
>
);
};
...
...
src/layouts/BasicLayout.js
View file @
bbe7bf69
...
...
@@ -23,7 +23,6 @@ import { waterMark } from '../utils/mark';
import
layoutStyles
from
'./BasicLayout.less'
;
import
SecurityLayout
from
'./SecurityLayout'
;
import
Site
from
'./Site'
;
import
{
initSaveMicroApps
}
from
'../micro'
;
const
{
params
}
=
helpers
;
...
...
src/micro.js
View file @
bbe7bf69
...
...
@@ -246,7 +246,7 @@ export const initMicroApps = (url) => {
if
(
window
?.
qiankunIsCache
){
microStore
.
on
(
"event:dropCache"
,
(()
=>
{
micorManager
.
map
((
micro
)
=>
{
micro
.
unmount
??
micro
.
unmount
();
micro
.
unmount
&&
micro
.
unmount
();
})
micorManager
=
[];
}));
...
...
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