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
5144118f
Commit
5144118f
authored
1 year ago
by
徐乐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 修改集成子站切换功能加载问题
parent
1fd2fcb0
Pipeline
#79583
passed with stages
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
BasicLayout.js
src/layouts/BasicLayout.js
+6
-2
index.js
src/pages/bootpage/integration/index.js
+2
-0
No files found.
src/layouts/BasicLayout.js
View file @
5144118f
...
...
@@ -530,7 +530,7 @@ const Layout = props => {
appService
.
getTicketByToken
({
token
:
window
.
globalConfig
?.
token
}).
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
setVisible
(
false
);
const
url
=
`
${
val
.
url
+
(
val
.
url
.
indexOf
(
'?'
)
>
0
?
'&'
:
'?'
)
+
val
.
paramName
}
=
${
res
.
data
}
`
;
const
url
=
`
${
val
.
url
+
(
val
.
url
.
indexOf
(
'?'
)
>
0
?
'&'
:
'?'
)
+
val
.
paramName
}
=
${
res
.
data
}
`
;
window
.
open
(
url
,
"_blank"
);
}
else
{
setVisible
(
false
);
...
...
@@ -543,10 +543,14 @@ const Layout = props => {
});
}
else
{
setVisible
(
false
);
const
url
=
`
${
val
.
url
+
(
val
.
url
.
indexOf
(
'?'
)
>
0
?
'&'
:
'?'
)
+
val
.
paramName
}
=
${
window
.
globalConfig
?.
token
}
`;
const
url
=
`
${
val
.
url
+
(
val
.
url
.
indexOf
(
'?'
)
>
0
?
'&'
:
'?'
)
+
val
.
paramName
}
=
${
window
.
globalConfig
?.
token
}
`;
window.open(url, "_blank");
}
} else {
store.set('event:refreshCurrentMenu', {
dropCache: true,
action: 'closeAllTabs'
})
const cli = val.url?.indexOf('client=') >= 0 ? val.url.split('client=')[1] : '';
Cookies.set('client', cli, {
expires: 86400000 / (24 * 60 * 60 * 1000),
...
...
This diff is collapsed.
Click to expand it.
src/pages/bootpage/integration/index.js
View file @
5144118f
...
...
@@ -7,6 +7,7 @@ import { connect } from 'react-redux';
import
{
useDocumentTitle
}
from
'@ant-design/pro-utils'
;
import
defaultSetting
from
'@wisdom-utils/components/lib/AppLayout/layouts/defaultSettings'
;
import
{
actionCreators
}
from
'@/containers/App/store'
;
import
{
store
}
from
'@wisdom-utils/utils'
;
import
LoginAction
from
'@/pages/user/login/login'
;
import
Cookies
from
'js-cookie'
;
import
{
defaultApp
}
from
'@/micro'
;
...
...
@@ -62,6 +63,7 @@ const Integration = props => {
window
.
open
(
url
,
"_blank"
);
}
}
else
{
store
.
set
(
'event:dropCache'
);
let
cli
=
item
.
url
?.
indexOf
(
'client='
)
>=
0
?
item
.
url
.
split
(
'client='
)[
1
]
:
''
;
Cookies
.
set
(
'client'
,
cli
,
{
...
...
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