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
c4d1b9bd
Commit
c4d1b9bd
authored
Nov 20, 2021
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复退出登录时,获取client不准备BUG
parent
336e5615
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
22 additions
and
21 deletions
+22
-21
civbase.zip
civbase.zip
+0
-0
proxy.js
config/proxy.js
+1
-1
webpack.prod.babel.js
internals/webpack/webpack.prod.babel.js
+2
-2
app.js
src/app.js
+18
-16
AvatarDropdown.js
src/components/GlobalHeader/AvatarDropdown.js
+1
-0
index.js
src/containers/App/index.js
+0
-2
micro.js
src/micro.js
+0
-0
No files found.
civbase.zip
0 → 100644
View file @
c4d1b9bd
This diff was suppressed by a .gitattributes entry.
config/proxy.js
View file @
c4d1b9bd
/* eslint-disable */
// const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
const
proxyURL
=
'http
://192.168.12.47:8081
'
;
const
proxyURL
=
'http
s://panda-water.com
'
;
module
.
exports
=
{
assetsRoot
:
process
.
env
.
NODE_ENV
!==
'production'
?
proxyURL
:
'./'
,
dev
:
{
...
...
internals/webpack/webpack.prod.babel.js
View file @
c4d1b9bd
...
...
@@ -46,8 +46,8 @@ module.exports = require('./webpack.base.babel')({
concatenateModules
:
true
,
runtimeChunk
:
'single'
,
splitChunks
:
{
maxSize
:
100
*
1024
,
// 控制包的最大字节数
minSize
:
10
*
1024
,
// 控制包的最小字节数
//
maxSize: 100 * 1024, // 控制包的最大字节数
//
minSize: 10 * 1024, // 控制包的最小字节数
cacheGroups
:
{
vendor
:
{
...
...
src/app.js
View file @
c4d1b9bd
...
...
@@ -104,20 +104,20 @@ const initGlobalConfig = () => {
updateTheme
(
'#ff9600'
);
}
}
else
{
appService
.
getWateWayConfig
().
then
(
res
=>
{
const
hasGateWay
=
res
&&
res
.
data
&&
isString
(
res
.
data
)
?
JSON
.
parse
(
res
.
data
)
:
res
.
data
;
if
(
res
.
code
===
0
)
{
store
.
dispatch
(
actionCreators
.
getConfig
(
Object
.
assign
({},
window
.
globalConfig
,
{
hasGateWay
,
apiGatewayDomain
:
`
${
window
.
location
.
origin
}
/PandaCore/GateWay`
,
}),
),
);
}
});
//
appService.getWateWayConfig().then(res => {
//
const hasGateWay =
//
res && res.data && isString(res.data) ? JSON.parse(res.data) : res.data;
//
if (res.code === 0) {
//
store.dispatch(
//
actionCreators.getConfig(
//
Object.assign({}, window.globalConfig, {
//
hasGateWay,
//
apiGatewayDomain: `${window.location.origin}/PandaCore/GateWay`,
//
}),
//
),
//
);
//
}
//
});
// eslint-disable-next-line react-hooks/rules-of-hooks
appService
.
queryConfig
({
...
...
@@ -135,6 +135,8 @@ const initGlobalConfig = () => {
),
);
Cookies
.
set
(
'city'
,
data
.
client
)
if
(
data
.
loginTemplate
===
'新春 - 智联.html'
)
{
updateTheme
(
'#ff9600'
);
}
...
...
@@ -170,9 +172,9 @@ const initGlobalConfig = () => {
// eslint-disable-next-line no-shadow
.
then
(
res
=>
{
// eslint-disable-next-line no-use-before-define
initSensorType
();
//
initSensorType();
// eslint-disable-next-line no-use-before-define
initIsMock
();
//
initIsMock();
render
({
appContent
:
''
,
loading
:
true
});
})
.
catch
(
error
=>
{
...
...
src/components/GlobalHeader/AvatarDropdown.js
View file @
c4d1b9bd
...
...
@@ -61,6 +61,7 @@ class AvatarDropdown extends React.Component {
}
}
loginout
=
event
=>
{
debugger
// eslint-disable-next-line no-undef
this
.
props
.
logout
();
if
(
...
...
src/containers/App/index.js
View file @
c4d1b9bd
...
...
@@ -22,8 +22,6 @@ const defaultSetting = config.layout;
function
App
(
props
)
{
const
{
routes
}
=
dyRoutes
(
props
.
menu
);
console
.
log
(
"routes"
,
routes
)
return
(
<>
<
Helmet
...
...
src/micro.js
View file @
c4d1b9bd
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