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
65883695
Commit
65883695
authored
3 years ago
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复运营商js注入
parent
7304072e
Pipeline
#48952
passed with stages
in 2 minutes 33 seconds
Changes
8
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
20 additions
and
8 deletions
+20
-8
micor.js
config/micor.js
+0
-1
.nginx.conf
src/.nginx.conf
+1
-1
app.js
src/app.js
+1
-1
NoticeIconView.js
src/components/GlobalHeader/NoticeIconView.js
+0
-1
index.js
src/containers/App/index.js
+5
-1
BasicLayout.js
src/layouts/BasicLayout.js
+1
-1
micro.js
src/micro.js
+12
-1
baseLogin.js
src/pages/user/login/template/baseLogin.js
+0
-1
No files found.
config/micor.js
View file @
65883695
...
...
@@ -9,7 +9,6 @@
export
function
genActiveRule
(
routerPrefix
)
{
return
location
=>
{
debugger
return
location
.
pathname
.
startsWith
(
routerPrefix
)
};
}
...
...
This diff is collapsed.
Click to expand it.
src/.nginx.conf
View file @
65883695
...
...
@@ -14,7 +14,7 @@ server {
# Type your domain name below
server_name
example
.
com
;
gzip
on
;
return
301
https
://$
server_name
$
request_uri
;
}
...
...
This diff is collapsed.
Click to expand it.
src/app.js
View file @
65883695
//
import 'whatwg-fetch';
import
'whatwg-fetch'
;
import
'./public-path'
;
import
'!file-loader?name=[name].[ext]!./images/favicon.ico'
;
import
'./global.less'
;
...
...
This diff is collapsed.
Click to expand it.
src/components/GlobalHeader/NoticeIconView.js
View file @
65883695
...
...
@@ -37,7 +37,6 @@ class NoticeIconView extends Component {
window
.
share
&&
window
.
share
.
event
&&
window
.
share
.
event
.
removeAllListeners
(
'reloadNotice'
);
}
catch
(
error
)
{
}
debugger
this
.
notifier
=
new
Notifier
(
this
.
props
.
global
.
userInfo
,
this
.
renderVideo
,
...
...
This diff is collapsed.
Click to expand it.
src/containers/App/index.js
View file @
65883695
...
...
@@ -26,7 +26,11 @@ function App(props) {
<
Switch
>
{
renderRoutes
(
'panda-console-base'
,
dyRoutes
(
props
.
menu
||
[],
props
.
global
&&
props
.
global
.
layout
,
props
.
global
&&
props
.
global
.
theme
||
'dark'
).
routes
,
dyRoutes
(
props
.
menu
||
[],
props
.
global
&&
props
.
global
.
layout
,
(
props
.
global
&&
props
.
global
.
theme
)
||
'dark'
,
).
routes
,
)}
<
/Switch
>
<
/Router
>
...
...
This diff is collapsed.
Click to expand it.
src/layouts/BasicLayout.js
View file @
65883695
...
...
@@ -10,8 +10,8 @@ import { useHistory } from '@wisdom-utils/runtime';
import
KeepAlive
from
'react-activation'
;
import
AMapLoader
from
'@amap/amap-jsapi-loader'
;
import
{
BasicLayout
}
from
'@wisdom-utils/components/lib/AppLayout'
;
import
RightContent
from
'@/components/GlobalHeader/ExtendRightContent'
;
import
defaultSetting
from
'@wisdom-utils/components/lib/AppLayout/layouts/defaultSettings'
;
import
RightContent
from
'@/components/GlobalHeader/ExtendRightContent'
;
import
{
actionCreators
}
from
'@/containers/App/store'
;
import
{
WEB_GIS_TYPE
}
from
'../constants'
;
import
SecurityLayout
from
'./SecurityLayout'
;
...
...
This diff is collapsed.
Click to expand it.
src/micro.js
View file @
65883695
...
...
@@ -134,12 +134,23 @@ export const initMicroApps = () => {
singular
:
false
,
scopedCSS
:
true
,
prefetch
:
'all'
,
async
fetch
(
url
,
...
args
)
{
if
(
url
.
indexOf
(
'cookie/flash.js'
)
>
-
1
)
{
return
{
async
text
()
{
return
''
;
},
};
}
return
window
.
fetch
(
url
,
...
args
);
},
// eslint-disable-next-line no-underscore-dangle
// getPublicPath: window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__,
excludeAssetFilter
:
url
=>
url
.
indexOf
(
'framework/highcharts'
)
!==
-
1
||
// url.indexOf('framework/amap/AMap.UI') !== -1 ||
// url.indexOf('framework/amap/init.js') !== -1 ||
url
.
indexOf
(
'framework/4.9/init.js'
)
!==
-
1
||
url
.
indexOf
(
'jquery-mousewheel-easyui-qrcode-cookie-resize-filesaver-fisheye-dateFormat-gridify.js'
)
!==
-
1
||
url
.
indexOf
(
'jquery'
)
!==
-
1
||
url
.
indexOf
(
'components/filetools/xlsx.core.min'
)
!==
-
1
||
url
.
indexOf
(
'managers/MapManager.js'
)
!==
-
1
||
...
...
This diff is collapsed.
Click to expand it.
src/pages/user/login/template/baseLogin.js
View file @
65883695
...
...
@@ -69,7 +69,6 @@ const Login = forwardRef((props, _ref) => {
props
.
history
.
push
(
`/?client=
${
props
.
global
.
client
}
`
);
// window.share.event.emit('triggerMicro', props.global);
// initMicroApps();
debugger
defaultApp
();
});
action
&&
...
...
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