Commit 89096c96 authored by lihonglin's avatar lihonglin

feat: map冲突处理

parent b893bba9
Pipeline #46493 passed with stages
in 3 minutes 11 seconds
/* 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,
)(CreateMap); )(Map);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment