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
5a5e91cb
Commit
5a5e91cb
authored
3 years ago
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复首页配置
parent
cd42f110
master
dev
devNew
feat/layout-flat
patch-1
soundai
test
zhongyi
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
BasicLayout1.js
src/layouts/BasicLayout1.js
+1
-1
SecurityLayout.js
src/layouts/SecurityLayout.js
+1
-0
micro.js
src/micro.js
+3
-1
No files found.
src/layouts/BasicLayout1.js
View file @
5a5e91cb
...
@@ -441,7 +441,7 @@ const BasicLayout = props => {
...
@@ -441,7 +441,7 @@ const BasicLayout = props => {
}
}
const
handleSelectMenuItem
=
(
item
)
=>
{
const
handleSelectMenuItem
=
(
item
)
=>
{
debugger
setTabActiveKey
(
item
);
setTabActiveKey
(
item
);
if
(
item
.
indexOf
(
'web_console'
)
===
-
1
)
{
if
(
item
.
indexOf
(
'web_console'
)
===
-
1
)
{
window
.
history
.
pushState
(
null
,
''
,
`/civbase
${
item
}
`
);
window
.
history
.
pushState
(
null
,
''
,
`/civbase
${
item
}
`
);
...
...
This diff is collapsed.
Click to expand it.
src/layouts/SecurityLayout.js
View file @
5a5e91cb
...
@@ -30,6 +30,7 @@ class SecurityLayout extends React.Component {
...
@@ -30,6 +30,7 @@ class SecurityLayout extends React.Component {
// });
// });
if
(
_
.
isNull
(
global
.
token
)
||
(
global
.
hasGateWay
&&
_
.
isNull
(
global
.
access_token
)))
{
if
(
_
.
isNull
(
global
.
token
)
||
(
global
.
hasGateWay
&&
_
.
isNull
(
global
.
access_token
)))
{
debugger
this
.
props
.
updateCurrentIndex
&&
this
.
props
.
updateCurrentIndex
(
0
);
this
.
props
.
updateCurrentIndex
&&
this
.
props
.
updateCurrentIndex
(
0
);
let
client
=
global
.
client
||
Cookies
.
get
(
'city'
);
let
client
=
global
.
client
||
Cookies
.
get
(
'city'
);
client
=
client
!==
'undefined'
||
!
_
.
isNull
(
client
)
||
!
_
.
isUndefined
(
client
)
?
client
:
'city'
;
client
=
client
!==
'undefined'
||
!
_
.
isNull
(
client
)
||
!
_
.
isUndefined
(
client
)
?
client
:
'city'
;
...
...
This diff is collapsed.
Click to expand it.
src/micro.js
View file @
5a5e91cb
...
@@ -82,7 +82,9 @@ export const initMicroApps = () => {
...
@@ -82,7 +82,9 @@ export const initMicroApps = () => {
baseRoot
:
item
.
name
,
baseRoot
:
item
.
name
,
// eslint-
// eslint-
// disable-next-line no-undef
// disable-next-line no-undef
globalConfig
:
config
,
globalConfig
:
/civweb4/
.
test
(
item
.
name
)
?
Object
.
assign
({},
config
,
{
homepage
:
config
.
homepage
?
config
.
homepage
.
replace
(
/civweb
\/
/
,
''
):
config
.
homepage
}):
config
,
//createStoreage.get('globalConfig'),
//createStoreage.get('globalConfig'),
XMLHttpRequest
:
window
.
XMLHttpRequest
,
XMLHttpRequest
:
window
.
XMLHttpRequest
,
};
};
...
...
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