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
ae104835
Commit
ae104835
authored
Oct 12, 2023
by
杨思琦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 登录修改
parent
db6e7a5a
Pipeline
#79942
passed with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
actions.js
src/containers/App/store/actions.js
+1
-0
BasicLayout.js
src/layouts/BasicLayout.js
+6
-3
No files found.
src/containers/App/store/actions.js
View file @
ae104835
...
...
@@ -199,6 +199,7 @@ export function logout(data) {
window
.
globalConfig
.
hasGateWay
=
false
;
window
.
globalConfig
.
userInfo
=
null
;
window
.
qiankunIsCache
=
null
;
window
.
qiankunStarted
=
false
;
// window.globalConfig.hasGateWay = ;
}
...
...
src/layouts/BasicLayout.js
View file @
ae104835
...
...
@@ -24,7 +24,7 @@ import defaultSetting from '@wisdom-utils/components/lib/AppLayout/layouts/defau
import
{
actionCreators
}
from
'@/containers/App/store'
;
import
Icon
,
{
LoadingOutlined
}
from
'@ant-design/icons'
;
import
BasicLayout
from
'@wisdom-utils/components/lib/layout/BasicLayout'
;
import
{
useHistory
,
useLocation
}
from
'@wisdom-utils/runtime'
;
import
{
useHistory
,
useLocation
,
useAliveController
}
from
'@wisdom-utils/runtime'
;
import
{
helpers
,
store
,
event
}
from
'@wisdom-utils/utils'
;
import
{
Storeage
as
Store
}
from
'@wisdom-utils/utils/lib/helpers'
;
import
{
defaultApp
}
from
'@/micro'
;
...
...
@@ -248,6 +248,7 @@ const pickRoutes = memoized((routes, pathname, locale) => {
});
const
Layout
=
props
=>
{
const
{
clear
}
=
useAliveController
();
const
currentProduct
=
`__global__recent_productIndex__micro_
${
window
.
location
.
hostname
}
_
${
params
.
getParams
(
'client'
,
)
||
...
...
@@ -312,6 +313,7 @@ const Layout = props => {
:
''
;
if
(
!
isLogin
)
{
history
.
push
(
`/user/login?client=
${
client
}${
generateType
}
`
,
{
reload
:
true
});
clear
();
props
.
logout
();
}
store
.
on
(
'event:unauthorized'
,
()
=>
{
...
...
@@ -328,6 +330,7 @@ const Layout = props => {
notification
.
close
(
key
);
setTimeout
(()
=>
{
history
.
push
(
`/user/login?client=
${
client
}${
generateType
}
`
,
{
reload
:
true
});
clear
();
props
.
logout
();
})
}}
>
确认
...
...
@@ -340,7 +343,7 @@ const Layout = props => {
return
()
=>
{
store
.
off
(
'event:unauthorized'
);
};
},
[
history
,
prefixCls
,
props
,
props
.
global
,
siteAction
]);
},
[
clear
,
history
,
prefixCls
,
props
,
props
.
global
,
siteAction
]);
useEffect
(()
=>
{
if
(
...
...
@@ -404,7 +407,7 @@ const Layout = props => {
window
.
share
.
event
.
removeAllListeners
(
'updateSite'
);
loginAction
.
events
.
removeListener
(
'toggleIndustry'
,
handleToggleIndustry
);
};
},
[
loginAction
.
events
,
props
]);
},
[
GetIntegrationConfig
,
loginAction
.
events
,
props
]);
useEffect
(()
=>
{
const
needMark
=
()
=>
...
...
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