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
1bda202a
Commit
1bda202a
authored
Sep 14, 2024
by
周宏民
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改 弥勒集成登录 切换client 中间 loading会重置的bug
parent
477baa3d
Pipeline
#92684
passed with stages
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
index.js
src/pages/bootpage/template/project/mile/index.js
+7
-2
No files found.
src/pages/bootpage/template/project/mile/index.js
View file @
1bda202a
...
...
@@ -62,8 +62,9 @@ const IntegrationMile = props => {
const
[
integrationData
,
setIntegrationData
]
=
useState
({});
const
[
linkUrl
,
setLinkUrl
]
=
useState
(
''
);
const
[
jumpLoading
,
setJumpLoading
]
=
useState
(
false
);
const
[
progressValue2
,
setProgressValue2
]
=
useState
(
0
);
// 解决 切换 client 时,updateConfig时,页会刷新,loading会重置
const
[
jumpLoading
,
setJumpLoading
]
=
useState
(
!!
window
.
jumpLoadingProgress
);
const
[
progressValue2
,
setProgressValue2
]
=
useState
(
window
.
jumpLoadingProgress
||
0
);
const
[
showBackBtn
,
setShowBackBtn
]
=
useState
(
true
);
// 是否显示iframe 返回按钮,三维平台用
const
configName
=
'弥勒集成配置文件'
;
...
...
@@ -305,6 +306,7 @@ const IntegrationMile = props => {
setJumpLoading(true);
jumpProgressStart();
startTiming(15);
window.jumpLoadingProgress = 99;
getWebSiteConfig({
identity: token,
client,
...
...
@@ -335,6 +337,7 @@ const IntegrationMile = props => {
});
setJumpLoading(false);
jumpProgressEnd();
window.jumpLoadingProgress = 0;
return;
}
loginAction.updateConfig && loginAction.updateConfig(config);
...
...
@@ -343,6 +346,7 @@ const IntegrationMile = props => {
.catch(err => {
setJumpLoading(false);
jumpProgressEnd();
window.jumpLoadingProgress = 0;
});
}
}
...
...
@@ -388,6 +392,7 @@ const IntegrationMile = props => {
const handleToggleIndustry = event => {
setJumpLoading(false);
jumpProgressEnd();
window.jumpLoadingProgress = 0;
props.updateCurrentIndex && props.updateCurrentIndex(0);
props.history.push(`
/
?
client
=
$
{
mClient
||
props
.
global
.
client
}
`);
...
...
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