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
153bb209
Commit
153bb209
authored
Jan 26, 2021
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复菜单切换
parent
980e8e9a
Pipeline
#23048
skipped with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
11 deletions
+12
-11
package-lock.json
package-lock.json
+5
-5
BasicLayout.js
src/layouts/BasicLayout.js
+6
-5
index.js
src/pages/bootpage/index.js
+1
-1
No files found.
package-lock.json
View file @
153bb209
...
...
@@ -14046,7 +14046,7 @@
"micromatch"
:
{
"version"
:
"4.0.2"
,
"resolved"
:
"https://g.civnet.cn:4873/micromatch/-/micromatch-4.0.2.tgz"
,
"integrity"
:
"sha
1-T8sJmb+fvC/L3SEvbWKbmlbDklk
="
,
"integrity"
:
"sha
512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=
="
,
"dev"
:
true
,
"requires"
:
{
"braces"
:
"^3.0.1"
,
...
...
@@ -16099,7 +16099,7 @@
"micromatch"
:
{
"version"
:
"4.0.2"
,
"resolved"
:
"https://g.civnet.cn:4873/micromatch/-/micromatch-4.0.2.tgz"
,
"integrity"
:
"sha
1-T8sJmb+fvC/L3SEvbWKbmlbDklk
="
,
"integrity"
:
"sha
512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=
="
,
"dev"
:
true
,
"requires"
:
{
"braces"
:
"^3.0.1"
,
...
...
@@ -20380,7 +20380,7 @@
"micromatch"
:
{
"version"
:
"3.1.10"
,
"resolved"
:
"https://g.civnet.cn:4873/micromatch/-/micromatch-3.1.10.tgz"
,
"integrity"
:
"sha
1-cIWbyVyYQJUvNZoGij/En57PrCM
="
,
"integrity"
:
"sha
512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=
="
,
"dev"
:
true
,
"requires"
:
{
"arr-diff"
:
"^4.0.0"
,
...
...
@@ -28512,7 +28512,7 @@
"micromatch"
:
{
"version"
:
"3.1.10"
,
"resolved"
:
"https://g.civnet.cn:4873/micromatch/-/micromatch-3.1.10.tgz"
,
"integrity"
:
"sha
1-cIWbyVyYQJUvNZoGij/En57PrCM
="
,
"integrity"
:
"sha
512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=
="
,
"dev"
:
true
,
"requires"
:
{
"arr-diff"
:
"^4.0.0"
,
...
...
@@ -28737,7 +28737,7 @@
"micromatch"
:
{
"version"
:
"4.0.2"
,
"resolved"
:
"https://g.civnet.cn:4873/micromatch/-/micromatch-4.0.2.tgz"
,
"integrity"
:
"sha
1-T8sJmb+fvC/L3SEvbWKbmlbDklk
="
,
"integrity"
:
"sha
512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=
="
,
"dev"
:
true
,
"requires"
:
{
"braces"
:
"^3.0.1"
,
src/layouts/BasicLayout.js
View file @
153bb209
...
...
@@ -373,15 +373,16 @@ const BasicLayout = props => {
},
[
props
.
location
.
pathname
]);
useEffect
(()
=>
{
setLoading
(
true
);
props
.
menu
.
length
===
0
?
setLoading
(
true
):
(
setLoading
(
false
));
clearTime
=
setTimeout
(()
=>
{
if
(
props
.
route
&&
props
.
route
.
routes
.
length
>
0
)
{
if
(
props
.
menu
.
length
>
0
&&
(
props
.
route
&&
props
.
route
.
routes
.
length
>
0
)
)
{
setCurrentRoutes
(
props
.
route
.
routes
[
props
.
currentMenuIndex
]);
setLoading
(
false
);
}
},
400
);
return
()
=>
clearTimeout
&&
clearTimeout
(
clearTime
);
},
[
props
.
currentMenuIndex
,
props
.
route
]);
//
return () => clearTimeout && clearTimeout(clearTime);
},
[
props
.
currentMenuIndex
,
props
.
route
,
props
.
menu
]);
useEffect
(()
=>
{
siteAction
.
setGlobalConfig
(
props
.
global
);
...
...
@@ -533,7 +534,7 @@ const BasicLayout = props => {
window
.
share
.
event
.
emit
(
'trigger:route'
);
}
};
debugger
const
title
=
getPageTitle
({
title
:
props
.
global
&&
props
.
global
.
get
(
'title'
)
||
defaultSetting
.
title
});
...
...
src/pages/bootpage/index.js
View file @
153bb209
...
...
@@ -43,7 +43,7 @@ const BootPage = props => {
const
[
loadding
,
setLoadding
]
=
useState
(
false
);
const
[
scale
,
setScale
]
=
useState
(
1
);
useDocumentTitle
(
{
title
:
defaultSetting
.
title
,
id
:
''
,
pageName
:
'行业
qieh
'
},
{
title
:
defaultSetting
.
title
,
id
:
''
,
pageName
:
'行业
切换
'
},
props
.
global
.
title
||
defaultSetting
.
title
,
);
const
handlePage
=
useCallback
((
event
,
type
)
=>
{
...
...
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