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
89096c96
Commit
89096c96
authored
Mar 23, 2022
by
lihonglin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: map冲突处理
parent
b893bba9
Pipeline
#46493
passed with stages
in 3 minutes 11 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
index.js
src/pages/map/index.js
+9
-5
No files found.
src/pages/map/index.js
View file @
89096c96
/* eslint-disable */
import
React
from
'react'
;
import
React
from
'react'
;
import
{
Spin
}
from
'antd'
;
import
{
connect
}
from
'react-redux'
;
import
{
connect
}
from
'react-redux'
;
import
{
actionCreators
}
from
'@/containers/App/store'
;
import
{
actionCreators
}
from
'@/containers/App/store'
;
import
_
from
'lodash'
;
import
_
from
'lodash'
;
...
@@ -13,7 +12,13 @@ import { ArcGISMap } from '@wisdom-map/arcgismap';
...
@@ -13,7 +12,13 @@ import { ArcGISMap } from '@wisdom-map/arcgismap';
class
Map
extends
React
.
PureComponent
{
class
Map
extends
React
.
PureComponent
{
constructor
(
props
)
{
constructor
(
props
)
{
super
(
props
);
super
(
props
);
this
.
mapManganerRef
=
React
.
createRef
();
this
.
options
=
_
.
merge
({},
props
.
options
);
this
.
state
=
{
type
:
props
.
options
.
type
,
loading
:
true
,
options
:
this
.
transformMapsetting
(
window
.
globalConfig
.
mapsettings
),
widgets
:
window
.
globalConfig
.
uiwidgets
,
}
}
}
transformMapsetting
(
mapsettings
)
{
transformMapsetting
(
mapsettings
)
{
...
@@ -104,7 +109,6 @@ class Map extends React.PureComponent {
...
@@ -104,7 +109,6 @@ class Map extends React.PureComponent {
)
)
}
}
}
}
const
mapStateToProps
=
state
=>
({});
const
mapStateToProps
=
state
=>
({});
const
mapDispatchToProps
=
dispatch
=>
({
const
mapDispatchToProps
=
dispatch
=>
({
...
@@ -116,4 +120,4 @@ const mapDispatchToProps = dispatch => ({
...
@@ -116,4 +120,4 @@ const mapDispatchToProps = dispatch => ({
export
default
connect
(
export
default
connect
(
mapStateToProps
,
mapStateToProps
,
mapDispatchToProps
,
mapDispatchToProps
,
)(
Create
Map
);
)(
Map
);
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