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
e83f482c
Commit
e83f482c
authored
3 years ago
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复路由加载
parent
6265a570
master
dev
devNew
feat/layout-flat
patch-1
soundai
test
zhongyi
No related merge requests found
Pipeline
#42269
passed with stages
in 1 minute 51 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
micro.js
src/micro.js
+6
-0
baseLogin.js
src/pages/user/login/template/baseLogin.js
+1
-1
No files found.
src/micro.js
View file @
e83f482c
...
...
@@ -209,6 +209,7 @@ export const initMicroApps = () => {
export
const
defaultApp
=
()
=>
{
// eslint-disable-next-line no-undef
const
config
=
createStoreage
.
get
(
'globalConfig'
);
if
(
config
&&
config
.
token
)
{
// const basePath =config.homepage !== '' && FILTER_FOLER_REG.test(config.homepage) ?'civweb4' :'civweb4';
...
...
@@ -221,7 +222,12 @@ export const defaultApp = () => {
// createStoreage.set('init_web4', true)
// }
if
(
/civweb4/
.
test
(
config
.
homepage
))
{
setDefaultMountApp
(
`/civbase/
${
config
.
homepage
.
replace
(
/^
\/
/
,
''
)}
`
);
}
else
{
setDefaultMountApp
(
`/civbase/
${
config
.
home
.
path
.
replace
(
/^
\/
/
,
''
)}
`
);
}
//setDefaultMountApp(`/civbase/${config.homepage.replace(/^\//, '')}`);
if
(
config
.
homepage
.
indexOf
(
'civweb4'
)
>
-
1
)
createStoreage
.
set
(
'init_web4'
,
true
);
}
};
...
...
This diff is collapsed.
Click to expand it.
src/pages/user/login/template/baseLogin.js
View file @
e83f482c
...
...
@@ -62,7 +62,7 @@ const Login = forwardRef((props, _ref) => {
action
&&
action
.
events
.
on
(
'loginSuccess'
,
event
=>
{
setSubmitting
(
false
);
props
.
updateCurrentIndex
&&
props
.
updateCurrentIndex
(
0
);
props
.
history
.
push
(
`/
?client=
${
props
.
global
.
client
}
`
);
props
.
history
.
push
(
`/`
);
// debugger
// window.share.event.emit('triggerMicro', props.global);
initMicroApps
();
...
...
This diff is collapsed.
Click to expand it.
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