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
908c0c14
Commit
908c0c14
authored
3 years ago
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: 升级kit_global_config
parent
5d772c34
Pipeline
#40661
passed with stages
in 6 minutes 21 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
initConfig.js
src/initConfig.js
+3
-1
No files found.
src/initConfig.js
View file @
908c0c14
...
@@ -10,6 +10,8 @@ window.createStoreage = new Storeage(namespace);
...
@@ -10,6 +10,8 @@ window.createStoreage = new Storeage(namespace);
export
const
initGlobalConfig
=
(
loader
,
store
,
render
)
=>
{
export
const
initGlobalConfig
=
(
loader
,
store
,
render
)
=>
{
// eslint-disable-next-line no-debugger
// eslint-disable-next-line no-debugger
// eslint-disable-next-line no-undef
// eslint-disable-next-line no-undef
createStoreage
.
remove
(
`__PANDA_STORE__
${
location
.
hostname
}
`
);
let
config
=
createStoreage
.
get
(
'globalConfig'
)
||
{};
let
config
=
createStoreage
.
get
(
'globalConfig'
)
||
{};
store
.
dispatch
(
actionCreators
.
updateComplexConfig
({}));
store
.
dispatch
(
actionCreators
.
updateComplexConfig
({}));
if
(
!
getToken
()
||
config
.
token
==
null
)
{
if
(
!
getToken
()
||
config
.
token
==
null
)
{
...
@@ -60,8 +62,8 @@ export const initGlobalConfig = (loader, store, render) => {
...
@@ -60,8 +62,8 @@ export const initGlobalConfig = (loader, store, render) => {
})
})
.
then
(
res
=>
{
.
then
(
res
=>
{
if
(
res
)
{
if
(
res
)
{
store
.
dispatch
(
actionCreators
.
getConfig
(
Object
.
assign
({})));
store
.
dispatch
(
actionCreators
.
getConfig
(
Object
.
assign
({})));
createStoreage
.
remove
(
`__PANDA_STORE__
${
location
.
hostname
}
`
);
const
data
=
res
;
const
data
=
res
;
if
(
!
data
.
client
)
{
if
(
!
data
.
client
)
{
data
.
client
=
params
.
getParams
(
'client'
)
||
'city'
;
data
.
client
=
params
.
getParams
(
'client'
)
||
'city'
;
...
...
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