@vtx/map 1.1.8 → 1.1.11

package/lib/VtxSearchMap/VtxSearchMap.js

@@ -1,891 +1,938 @@
-'use strict';
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
-    value: true
+  value: true
 });
+exports["default"] = void 0;
 
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+var _react = _interopRequireDefault(require("react"));
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+var _button = _interopRequireDefault(require("antd/lib/button"));
 
-var _react = require('react');
+var _input = _interopRequireDefault(require("antd/lib/input"));
 
-var _react2 = _interopRequireDefault(_react);
+var _message = _interopRequireDefault(require("antd/lib/message"));
 
-require('./VtxSearchMap.less');
+var _checkbox = _interopRequireDefault(require("antd/lib/checkbox"));
 
-var _button = require('antd/lib/button');
+var _VtxModal = require("../VtxModal");
 
-var _button2 = _interopRequireDefault(_button);
+var _VtxMap = require("../VtxMap");
 
-require('antd/lib/button/style');
+var _default2 = _interopRequireWildcard(require("../default"));
 
-var _input = require('antd/lib/input');
+var _mapping = require("./mapping");
 
-var _input2 = _interopRequireDefault(_input);
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-require('antd/lib/input/style');
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-var _message = require('antd/lib/message');
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var _message2 = _interopRequireDefault(_message);
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-require('antd/lib/message/style');
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-var _checkbox = require('antd/lib/checkbox');
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-var _checkbox2 = _interopRequireDefault(_checkbox);
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-require('antd/lib/checkbox/style');
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var _VtxModal = require('../VtxModal');
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-var _VtxMap = require('../VtxMap');
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-var _default = require('../default');
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-var _default2 = _interopRequireDefault(_default);
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-var _mapping = require('./mapping');
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
-var styles = {
-    searchModal: 'vtx-ui-searchmap-searchmodal',
-    searchMap: 'vtx-ui-searchmap-searchmap',
-    top: 'vtx-ui-searchmap-top',
-    bottom: 'vtx-ui-searchmap-bottom',
-    content: 'vtx-ui-searchmap-content',
-    show: 'vtx-ui-searchmap-show',
-    hidden: 'vtx-ui-searchmap-hidden',
-    w_l: 'vtx-ui-searchmap-w_l',
-    content_left: 'vtx-ui-searchmap-content_left',
-    listTitle: 'vtx-ui-searchmap-listtitle',
-    title: 'vtx-ui-searchmap-title',
-    btn: 'vtx-ui-searchmap-btn',
-    lists: 'vtx-ui-searchmap-lists',
-    select: 'vtx-ui-searchmap-select',
-    scrollauto: 'vtx-ui-searchmap-scrollauto',
-    content_right: 'vtx-ui-searchmap-content_right',
-    showLabel: 'vtx-ui-searchmap-showlabel',
-    hiddenLabel: 'vtx-ui-searchmap-hiddenlabel',
-    otherModal: 'vtx-ui-searchmap-othermodal'
-};
-// import Icon from 'antd/lib/icon';
-// import 'antd/lib/icon/style/css';
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-//公共地址配置
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
-// message.config({
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+var styles = {
+  searchModal: 'vtx-ui-searchmap-searchmodal',
+  searchMap: 'vtx-ui-searchmap-searchmap',
+  top: 'vtx-ui-searchmap-top',
+  bottom: 'vtx-ui-searchmap-bottom',
+  content: 'vtx-ui-searchmap-content',
+  show: 'vtx-ui-searchmap-show',
+  hidden: 'vtx-ui-searchmap-hidden',
+  w_l: 'vtx-ui-searchmap-w_l',
+  content_left: 'vtx-ui-searchmap-content_left',
+  listTitle: 'vtx-ui-searchmap-listtitle',
+  title: 'vtx-ui-searchmap-title',
+  btn: 'vtx-ui-searchmap-btn',
+  lists: 'vtx-ui-searchmap-lists',
+  select: 'vtx-ui-searchmap-select',
+  scrollauto: 'vtx-ui-searchmap-scrollauto',
+  content_right: 'vtx-ui-searchmap-content_right',
+  showLabel: 'vtx-ui-searchmap-showlabel',
+  hiddenLabel: 'vtx-ui-searchmap-hiddenlabel',
+  otherModal: 'vtx-ui-searchmap-othermodal'
+}; // message.config({
 //   top: document.getElementById('root').offsetHeight/3,
 //   duration: 5,
 // });
+
 var warning = function warning() {
-    _message2.default.warning('位置点查询失败,请缩小比例尺或切换关键字后再重新查询!');
+  _message["default"].warning('位置点查询失败,请缩小比例尺或切换关键字后再重新查询!');
 };
+
 function distinct(ary) {
-    var pts = [].concat(_toConsumableArray(ary));
-    if (pts[0][0] == pts[pts.length - 1][0] && pts[0][1] == pts[pts.length - 1][1]) {
-        pts.pop();
-        return distinct(pts);
-    } else {
-        return pts;
-    }
+  var pts = _toConsumableArray(ary);
+
+  if (pts[0][0] == pts[pts.length - 1][0] && pts[0][1] == pts[pts.length - 1][1]) {
+    pts.pop();
+    return distinct(pts);
+  } else {
+    return pts;
+  }
 }
 
 var getIcon = function getIcon(type) {
-    return _default.antdMajorVersion === '4' ? _react2.default.createElement(_default.VtxMapIcon, { type: 'icon-' + _mapping.iconMapping[type] }) : type;
+  return _default2.antdMajorVersion === '4' ? /*#__PURE__*/_react["default"].createElement(_default2.VtxMapIcon, {
+    type: "icon-".concat(_mapping.iconMapping[type])
+  }) : type;
 };
 
-var VtxSearchMap = function (_React$Component) {
-    _inherits(VtxSearchMap, _React$Component);
-
-    function VtxSearchMap(props) {
-        _classCallCheck(this, VtxSearchMap);
-
-        var _this = _possibleConstructorReturn(this, (VtxSearchMap.__proto__ || Object.getPrototypeOf(VtxSearchMap)).call(this, props));
-
-        _this.map = null; //Map组件的ref对象
-        _this.mapLoaded = false;
-        _this.isDrawStatus = false;
-        _this.isClickMap = false;
-        _this.apid = []; //所有点id,除编辑点外
-        _this.loadExtent = null;
-        _this.mapId = 'searchMap' + new Date().getTime();
-        _this.state = {
-            //列表和地图宽度切换的动画需要
-            isShowList: false,
-            //可拖动用于定位的点
-            locationPoint: [],
-            //搜索框文字
-            searchValue: '',
-            //搜索出来的列表点位
-            listPoint: [],
-            //列表数据
-            listMess: [],
-            // 返回点位/图形
-            graphicType: props.graphicType || 'point',
-            isDraw: props.graphicType !== 'point',
-            parameter: props.drawParameter,
-            graphicValue: null,
-            drawGraphID: 'drawnGraph',
-            /*地图Api参数*/
-            mapCenter: props.mapCenter || '',
-            maxZoom: props.maxZoom,
-            minZoom: props.minZoom,
-            wkid: props.wkid,
-            mapType: props.mapType || 'bmap',
-            mapServer: props.mapServer,
-            setCenter: false,
-            mapVisiblePoints: {
-                fitView: [],
-                type: 'all'
-            },
-            setVisiblePoints: false,
-            isDoEdit: false,
-            isEndEdit: false,
-            editGraphicId: '',
-            editGraphic: null,
-            mapZoomLevel: props.mapZoomLevel || 11,
-            setZoomLevel: false,
-            /*modal参数*/
-            modal1Visible: props.modal1Visible || false,
-            isShowOther: props.isShowOther || false,
-            otherText: props.otherText || '显示服务区域',
-            isShowOtherGraph: props.isShowOther || false,
-            // openlayer
-            olProps: props.olProps
-        };
-        return _this;
-    }
-    //经纬度回调
-
-
-    _createClass(VtxSearchMap, [{
-        key: 'callback',
-        value: function callback() {
-            var fun = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'callback';
-
-            if (fun in this.props && typeof this.props[fun] === 'function') {
-                var editGraphicId = this.state.editGraphicId;
-
-                switch (this.state.graphicType) {
-                    case 'point':
-                        var locationPoint = this.state.locationPoint;
-
-                        if (this.map.getGraphic('locationPoint')) {
-                            var p = this.map.getGraphic(locationPoint[0].id).geometry;
-                            this.props[fun]([p.x, p.y]);
-                        } else {
-                            return [];
-                        }
-                        break;
-                    case 'circle':
-                        this.props[fun](this.state.graphicValue ? {
-                            x: this.state.graphicValue.geometry.x,
-                            y: this.state.graphicValue.geometry.y,
-                            radius: this.state.graphicValue.geometry.radius,
-                            area: this.state.graphicValue.area
-                        } : null);
-                        break;
-                    case 'polygon':
-                        if (this.map.getGraphic(editGraphicId)) {
-                            var _p = this.map.getGraphic(editGraphicId);
-                            this.props[fun]({
-                                rings: distinct(_p.geometry.rings),
-                                area: this.map.getPolygonArea(distinct(_p.geometry.rings))
-                            });
-                        } else {
-                            this.props[fun](this.state.graphicValue ? {
-                                rings: distinct(this.state.graphicValue.geometry.rings),
-                                area: this.state.graphicValue.area
-                            } : null);
-                        }
-                        break;
-                    case 'rectangle':
-                        this.props[fun](this.state.graphicValue ? {
-                            rings: distinct(this.state.graphicValue.geometry.rings),
-                            area: this.state.graphicValue.area
-                        } : null);
-                        break;
-                    case 'polyline':
-                        if (this.map.getGraphic(editGraphicId)) {
-                            var _p2 = this.map.getGraphic(editGraphicId);
-                            this.props[fun]({
-                                paths: _p2.geometry.paths,
-                                length: this.map.calculateDistance(_p2.geometry.paths)
-                            });
-                        } else {
-                            this.props[fun](this.state.graphicValue ? {
-                                paths: this.state.graphicValue.geometry.paths,
-                                length: this.map.calculateDistance(this.state.graphicValue.geometry.paths)
-                            } : null);
-                        }
-                        break;
-                }
+var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
+  _inherits(VtxSearchMap, _React$Component);
+
+  var _super = _createSuper(VtxSearchMap);
+
+  function VtxSearchMap(props) {
+    var _this;
+
+    _classCallCheck(this, VtxSearchMap);
+
+    _this = _super.call(this, props);
+    _this.map = null; //Map组件的ref对象
+
+    _this.mapLoaded = false;
+    _this.isDrawStatus = false;
+    _this.isClickMap = false;
+    _this.apid = []; //所有点id,除编辑点外
+
+    _this.loadExtent = null;
+    _this.mapId = "searchMap".concat(new Date().getTime());
+    _this.state = {
+      //列表和地图宽度切换的动画需要
+      isShowList: false,
+      //可拖动用于定位的点
+      locationPoint: [],
+      //搜索框文字
+      searchValue: '',
+      //搜索出来的列表点位
+      listPoint: [],
+      //列表数据
+      listMess: [],
+      // 返回点位/图形
+      graphicType: props.graphicType || 'point',
+      isDraw: props.graphicType !== 'point',
+      parameter: props.drawParameter,
+      graphicValue: null,
+      drawGraphID: 'drawnGraph',
+
+      /*地图Api参数*/
+      mapCenter: props.mapCenter || '',
+      maxZoom: props.maxZoom,
+      minZoom: props.minZoom,
+      wkid: props.wkid,
+      mapType: props.mapType || 'bmap',
+      mapStyle: props.mapStyle,
+      mapServer: props.mapServer,
+      setCenter: false,
+      mapVisiblePoints: {
+        fitView: [],
+        type: 'all'
+      },
+      setVisiblePoints: false,
+      isDoEdit: false,
+      isEndEdit: false,
+      editGraphicId: '',
+      editGraphic: null,
+      mapZoomLevel: props.mapZoomLevel || 11,
+      setZoomLevel: false,
+
+      /*modal参数*/
+      modal1Visible: props.modal1Visible || false,
+      isShowOther: props.isShowOther || false,
+      otherText: props.otherText || '显示服务区域',
+      isShowOtherGraph: props.isShowOther || false,
+      // openlayer
+      olProps: props.olProps
+    };
+    return _this;
+  } //经纬度回调
+
+
+  _createClass(VtxSearchMap, [{
+    key: "callback",
+    value: function callback() {
+      var fun = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'callback';
+
+      if (fun in this.props && typeof this.props[fun] === 'function') {
+        var editGraphicId = this.state.editGraphicId;
+
+        switch (this.state.graphicType) {
+          case 'point':
+            var locationPoint = this.state.locationPoint;
+
+            if (this.map.getGraphic('locationPoint')) {
+              var p = this.map.getGraphic(locationPoint[0].id).geometry;
+              this.props[fun]([p.x, p.y]);
+            } else {
+              return [];
             }
-            if (this.props.clearDrawnGraph) {
-                this.clearDrawnGraph();
+
+            break;
+
+          case 'circle':
+            this.props[fun](this.state.graphicValue ? {
+              x: this.state.graphicValue.geometry.x,
+              y: this.state.graphicValue.geometry.y,
+              radius: this.state.graphicValue.geometry.radius,
+              area: this.state.graphicValue.area
+            } : null);
+            break;
+
+          case 'polygon':
+            if (this.map.getGraphic(editGraphicId)) {
+              var _p = this.map.getGraphic(editGraphicId);
+
+              this.props[fun]({
+                rings: distinct(_p.geometry.rings),
+                area: this.map.getPolygonArea(distinct(_p.geometry.rings))
+              });
+            } else {
+              this.props[fun](this.state.graphicValue ? {
+                rings: distinct(this.state.graphicValue.geometry.rings),
+                area: this.state.graphicValue.area
+              } : null);
             }
-        }
-    }, {
-        key: 'showOrhidden',
-        value: function showOrhidden(bealoon) {
-            this.setState({
-                isShowList: bealoon
-            });
-        }
-        //绘制定位点(以当前的中心点位参照 => 同时开启点位编辑)
-
-    }, {
-        key: 'drawLocationPoint',
-        value: function drawLocationPoint() {
-            var t = this;
-            //判断arcgis,是: 判断中心点是否已经确定,确定,继续走逻辑.不确认.轮询等待
-            if (this.props.mapType !== 'gmap' || this.map.state.gis.extent && !!this.map.state.gis.extent.xmax) {
-                var lglt = this.map.getMapExtent(),
-                    editGraphic = null,
-                    editGraphicId = 'locationPoint';
-                if (this.props.editParam) {
-                    // && (this.props.graphicType == 'polyline' || this.props.graphicType == 'polygon')
-                    editGraphic = _extends({}, this.props.editParam, { id: 'drawnGraph' });
-                    editGraphicId = 'drawnGraph';
-                }
-                this.isinit = false;
-                this.setState({
-                    editGraphic: editGraphic,
-                    locationPoint: [{
-                        id: 'locationPoint',
-                        longitude: (t.props.mapCenter || [])[0] || lglt.nowCenter.lng,
-                        latitude: (t.props.mapCenter || [])[1] || lglt.nowCenter.lat,
-                        url: _default2.default.mapServerURL + '/images/defaultMarker.png',
-                        config: {
-                            zIndex: 1000
-                        }
-                    }]
-                }, function () {
-                    t.setState({
-                        isDoEdit: true,
-                        editGraphicId: editGraphicId
-                    }, function () {
-                        setTimeout(function () {
-                            t.setState({
-                                isDoEdit: false
-                            });
-                        }, 500);
-                    });
-                });
+
+            break;
+
+          case 'rectangle':
+            this.props[fun](this.state.graphicValue ? {
+              rings: distinct(this.state.graphicValue.geometry.rings),
+              area: this.state.graphicValue.area
+            } : null);
+            break;
+
+          case 'polyline':
+            if (this.map.getGraphic(editGraphicId)) {
+              var _p2 = this.map.getGraphic(editGraphicId);
+
+              this.props[fun]({
+                paths: _p2.geometry.paths,
+                length: this.map.calculateDistance(_p2.geometry.paths)
+              });
             } else {
-                t.loadExtent = setTimeout(function () {
-                    t.drawLocationPoint();
-                }, 50);
+              this.props[fun](this.state.graphicValue ? {
+                paths: this.state.graphicValue.geometry.paths,
+                length: this.map.calculateDistance(this.state.graphicValue.geometry.paths)
+              } : null);
             }
+
+            break;
         }
-        //校正定位的点位位置到当前的中心点
-
-    }, {
-        key: 'correction',
-        value: function correction() {
-            var t = this;
-            //获取当前中心点经纬度
-            var lglt = this.map.getMapExtent();
-            var locationPoint = t.state.locationPoint;
-
-            locationPoint = locationPoint.map(function (item, index) {
-                return _extends({}, item, {
-                    longitude: lglt.nowCenter.lng,
-                    latitude: lglt.nowCenter.lat
-                });
-            });
-            this.map.updatePoint(locationPoint);
+      }
+
+      if (this.props.clearDrawnGraph) {
+        this.clearDrawnGraph();
+      }
+    }
+  }, {
+    key: "showOrhidden",
+    value: function showOrhidden(bealoon) {
+      this.setState({
+        isShowList: bealoon
+      });
+    } //绘制定位点(以当前的中心点位参照 => 同时开启点位编辑)
+
+  }, {
+    key: "drawLocationPoint",
+    value: function drawLocationPoint() {
+      var t = this; //判断arcgis,是: 判断中心点是否已经确定,确定,继续走逻辑.不确认.轮询等待
+
+      if (this.props.mapType !== 'gmap' || this.map.state.gis.extent && !!this.map.state.gis.extent.xmax) {
+        var lglt = this.map.getMapExtent(),
+            editGraphic = null,
+            editGraphicId = 'locationPoint';
+
+        if (this.props.editParam) {
+          // && (this.props.graphicType == 'polyline' || this.props.graphicType == 'polygon')
+          editGraphic = _objectSpread(_objectSpread({}, this.props.editParam), {}, {
+            id: 'drawnGraph'
+          });
+          editGraphicId = 'drawnGraph';
         }
-        //搜索关键字切换
 
-    }, {
-        key: 'changeValue',
-        value: function changeValue(e) {
-            this.setState({
-                searchValue: e.target.value
+        this.isinit = false;
+        this.setState({
+          editGraphic: editGraphic,
+          locationPoint: [{
+            id: 'locationPoint',
+            longitude: (t.props.mapCenter || [])[0] || lglt.nowCenter.lng,
+            latitude: (t.props.mapCenter || [])[1] || lglt.nowCenter.lat,
+            // url: `${configUrl.mapServerURL}/images/defaultMarker.png`,
+            url: require("../VtxMap/images/defaultMarker.png"),
+            config: {
+              zIndex: 1000
+            }
+          }]
+        }, function () {
+          t.setState({
+            isDoEdit: true,
+            editGraphicId: editGraphicId
+          }, function () {
+            setTimeout(function () {
+              t.setState({
+                isDoEdit: false
+              });
+            }, 500);
+          });
+        });
+      } else {
+        t.loadExtent = setTimeout(function () {
+          t.drawLocationPoint();
+        }, 50);
+      }
+    } //校正定位的点位位置到当前的中心点
+
+  }, {
+    key: "correction",
+    value: function correction() {
+      var t = this; //获取当前中心点经纬度
+
+      var lglt = this.map.getMapExtent();
+      var locationPoint = t.state.locationPoint;
+      locationPoint = locationPoint.map(function (item, index) {
+        return _objectSpread(_objectSpread({}, item), {}, {
+          longitude: lglt.nowCenter.lng,
+          latitude: lglt.nowCenter.lat
+        });
+      });
+      this.map.updatePoint(locationPoint);
+    } //搜索关键字切换
+
+  }, {
+    key: "changeValue",
+    value: function changeValue(e) {
+      this.setState({
+        searchValue: e.target.value
+      });
+    } //根据关键字搜索数据
+
+  }, {
+    key: "searchList",
+    value: function searchList() {
+      //因为antd组件问题,这边使用手动关键位,控制方法执行
+      var t = this;
+      var searchPoints = t.map.searchPoints(this.state.searchValue);
+      searchPoints.then(function (results) {
+        if (results.length > 0) {
+          var lsp = [],
+              lsm = [];
+          t.apid = [];
+
+          for (var i = 0; i < results.length; i++) {
+            var r = results[i];
+            lsp.push(_objectSpread(_objectSpread({}, results[i]), {}, {
+              // url: `${configUrl.mapServerURL}/images/defaultMarker_selected.png`,
+              url: require("../VtxMap/images/defaultMarker_selected.png"),
+              labelClass: styles.hiddenLabel
+            }));
+            lsm.push({
+              id: r.id,
+              title: r.config.labelContent,
+              isSelect: false
             });
+            t.apid.push(r.id);
+          }
+
+          t.setState({
+            listPoint: lsp,
+            listMess: lsm,
+            isShowList: true
+          });
+          t.setFitView();
+        } else {
+          warning();
         }
-        //根据关键字搜索数据
-
-    }, {
-        key: 'searchList',
-        value: function searchList() {
-            //因为antd组件问题,这边使用手动关键位,控制方法执行
-            var t = this;
-            var searchPoints = t.map.searchPoints(this.state.searchValue);
-            searchPoints.then(function (results) {
-                if (results.length > 0) {
-                    var lsp = [],
-                        lsm = [];
-                    t.apid = [];
-                    for (var i = 0; i < results.length; i++) {
-                        var r = results[i];
-                        lsp.push(_extends({}, results[i], {
-                            url: _default2.default.mapServerURL + '/images/defaultMarker_selected.png',
-                            labelClass: styles.hiddenLabel
-                        }));
-                        lsm.push({
-                            id: r.id,
-                            title: r.config.labelContent,
-                            isSelect: false
-                        });
-                        t.apid.push(r.id);
-                    }
-                    t.setState({
-                        listPoint: lsp,
-                        listMess: lsm,
-                        isShowList: true
-                    });
-                    t.setFitView();
-                } else {
-                    warning();
-                }
-            });
+      });
+    } //返回最佳位置(zoom,center)
+
+  }, {
+    key: "setFitView",
+    value: function setFitView() {
+      var _this2 = this;
+
+      this.setState({
+        mapVisiblePoints: {
+          fitView: this.apid,
+          type: 'all'
+        },
+        setVisiblePoints: true
+      }, function () {
+        _this2.setState({
+          setVisiblePoints: false
+        });
+      });
+    } //清空列表的所有数据(包括点位)
+
+  }, {
+    key: "clearList",
+    value: function clearList() {
+      this.apid = [];
+      this.setState({
+        searchValue: '',
+        listPoint: [],
+        listMess: [],
+        isShowList: false
+      });
+    } //列表选中地址
+
+  }, {
+    key: "chooseAddress",
+    value: function chooseAddress(id) {
+      var t = this;
+      var _this$state = this.state,
+          listPoint = _this$state.listPoint,
+          listMess = _this$state.listMess;
+      var mapCenter = [];
+      listPoint = listPoint.map(function (item, index) {
+        if (item.id === id) {
+          mapCenter = [item.longitude, item.latitude];
+          return _objectSpread(_objectSpread({}, item), {}, {
+            labelClass: styles.showLabel
+          });
+        } else {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            labelClass: styles.hiddenLabel
+          });
         }
-        //返回最佳位置(zoom,center)
-
-    }, {
-        key: 'setFitView',
-        value: function setFitView() {
-            var _this2 = this;
-
-            this.setState({
-                mapVisiblePoints: {
-                    fitView: this.apid,
-                    type: 'all'
-                },
-                setVisiblePoints: true
-            }, function () {
-                _this2.setState({
-                    setVisiblePoints: false
-                });
-            });
+      });
+      listMess = listMess.map(function (item, index) {
+        if (item.id === id) {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            isSelect: true
+          });
+        } else {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            isSelect: false
+          });
         }
-        //清空列表的所有数据(包括点位)
-
-    }, {
-        key: 'clearList',
-        value: function clearList() {
-            this.apid = [];
-            this.setState({
-                searchValue: '',
-                listPoint: [],
-                listMess: [],
-                isShowList: false
-            });
+      });
+      this.setState({
+        listPoint: listPoint,
+        listMess: listMess,
+        mapCenter: mapCenter,
+        setCenter: true
+      }, function () {
+        t.setState({
+          setCenter: false
+        });
+
+        if (t.state.graphicType == 'point') {
+          t.correction();
         }
-        //列表选中地址
-
-    }, {
-        key: 'chooseAddress',
-        value: function chooseAddress(id) {
-            var t = this;
-            var _state = this.state,
-                listPoint = _state.listPoint,
-                listMess = _state.listMess;
-
-            var mapCenter = [];
-            listPoint = listPoint.map(function (item, index) {
-                if (item.id === id) {
-                    mapCenter = [item.longitude, item.latitude];
-                    return _extends({}, item, {
-                        labelClass: styles.showLabel
-                    });
-                } else {
-                    return _extends({}, item, {
-                        labelClass: styles.hiddenLabel
-                    });
-                }
-            });
-            listMess = listMess.map(function (item, index) {
-                if (item.id === id) {
-                    return _extends({}, item, {
-                        isSelect: true
-                    });
-                } else {
-                    return _extends({}, item, {
-                        isSelect: false
-                    });
-                }
-            });
-            this.setState({
-                listPoint: listPoint,
-                listMess: listMess,
-                mapCenter: mapCenter,
-                setCenter: true
-            }, function () {
-                t.setState({
-                    setCenter: false
-                });
-                if (t.state.graphicType == 'point') {
-                    t.correction();
-                }
+      });
+    }
+  }, {
+    key: "clickGraphic",
+    value: function clickGraphic(obj) {
+      if (obj.type === 'point' && obj.attributes.other === 'search') {
+        this.chooseAddress(obj.attributes.id);
+      }
+    }
+  }, {
+    key: "closeModal",
+    value: function closeModal(e) {
+      if (this.isDrawStatus && this.isClickMap) {
+        _message["default"].warning('请双击结束图元编辑');
+      } else {
+        if ('closeModal' in this.props) {
+          this.props.closeModal();
+        } else {
+          this.setState({
+            modal1Visible: false
+          });
+        } // if(this.props.clearDrawnGraph){
+
+
+        this.clearDrawnGraph(); // }
+      }
+    }
+  }, {
+    key: "clearDrawnGraph",
+    value: function clearDrawnGraph() {
+      var _this3 = this;
+
+      this.isDrawStatus = true;
+      this.setState({
+        isDraw: this.state.graphicType !== 'point',
+        graphicValue: null,
+        isEndEdit: this.state.graphicType !== 'point'
+      }, function () {
+        _this3.setState({
+          isEndEdit: false
+        });
+      });
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this4 = this;
+
+      var t = this;
+      var _this$state2 = this.state,
+          isShowList = _this$state2.isShowList,
+          searchValue = _this$state2.searchValue,
+          locationPoint = _this$state2.locationPoint,
+          listPoint = _this$state2.listPoint,
+          listMess = _this$state2.listMess,
+          mapZoomLevel = _this$state2.mapZoomLevel,
+          setZoomLevel = _this$state2.setZoomLevel,
+          maxZoom = _this$state2.maxZoom,
+          minZoom = _this$state2.minZoom,
+          wkid = _this$state2.wkid,
+          mapServer = _this$state2.mapServer,
+          mapCenter = _this$state2.mapCenter,
+          setCenter = _this$state2.setCenter,
+          mapType = _this$state2.mapType,
+          mapStyle = _this$state2.mapStyle,
+          mapVisiblePoints = _this$state2.mapVisiblePoints,
+          setVisiblePoints = _this$state2.setVisiblePoints,
+          isDoEdit = _this$state2.isDoEdit,
+          editGraphicId = _this$state2.editGraphicId,
+          isEndEdit = _this$state2.isEndEdit,
+          modal1Visible = _this$state2.modal1Visible,
+          drawGraphID = _this$state2.drawGraphID,
+          isShowOther = _this$state2.isShowOther,
+          otherText = _this$state2.otherText,
+          isShowOtherGraph = _this$state2.isShowOtherGraph,
+          editGraphic = _this$state2.editGraphic,
+          graphicType = _this$state2.graphicType,
+          olProps = _this$state2.olProps;
+      var InputProps = {
+        style: {
+          'width': '200px'
+        },
+        placeholder: '输入关键字',
+        value: searchValue,
+        onChange: this.changeValue.bind(this),
+        onPressEnter: this.searchList.bind(this),
+        onKeyDown: this.changeValue.bind(this)
+      };
+      var drawProps = this.state.graphicType == 'point' || t.isinit ? {
+        isDraw: this.state.isDraw,
+        isCloseDraw: this.state.isCloseDraw
+      } : {
+        isDraw: this.state.isDraw,
+        isCloseDraw: this.state.isCloseDraw,
+        drawEnd: function drawEnd(obj) {
+          _this4.isDrawStatus = false;
+          _this4.isClickMap = false;
+          var objparam = {
+            graphicValue: obj,
+            isDraw: false
+          };
+
+          if (obj.geometryType == 'polyline' || obj.geometryType == 'polygon') {
+            objparam.editGraphicId = obj.id;
+            objparam.isDoEdit = true;
+          }
+
+          _this4.setState(objparam, function () {
+            _this4.setState({
+              isDoEdit: false
             });
+          });
+        },
+        mapDraw: {
+          geometryType: this.state.graphicType,
+          parameter: this.state.parameter || (this.state.graphicType == 'polyline' ? {
+            color: '#108edf',
+            //线颜色,
+            pellucidity: 1,
+            //线透明度,
+            lineWidth: 3,
+            //线宽度 
+            lineType: 'solid'
+          } : this.state.graphicType == 'polygon' || this.state.graphicType == 'circle' || this.state.graphicType == 'rectangle' ? {
+            color: '#ffffff',
+            //填充色, 
+            lineColor: '#108edf',
+            //线颜色, 
+            lineOpacity: 1,
+            //线透明度, 
+            lineWidth: 3,
+            //线宽度, 
+            pellucidity: 0.8,
+            //填充透明度 
+            lineType: 'solid'
+          } : {}),
+          data: {
+            id: drawGraphID
+          }
         }
-    }, {
-        key: 'clickGraphic',
-        value: function clickGraphic(obj) {
-            if (obj.type === 'point' && obj.attributes.other === 'search') {
-                this.chooseAddress(obj.attributes.id);
-            }
+      };
+      var mapPoints = [],
+          mapLines = [],
+          mapPolygons = [],
+          mapCircles = [];
+
+      if (graphicType == 'point') {
+        mapPoints = [].concat(_toConsumableArray(locationPoint), _toConsumableArray(listPoint));
+      } else {
+        mapPoints = _toConsumableArray(listPoint);
+      }
+
+      if (graphicType === 'polygon') {
+        if (editGraphic) {
+          mapPolygons.push(editGraphic);
+          drawProps = null;
         }
-    }, {
-        key: 'closeModal',
-        value: function closeModal(e) {
-            if (this.isDrawStatus && this.isClickMap) {
-                _message2.default.warning('请双击结束图元编辑');
-            } else {
-                if ('closeModal' in this.props) {
-                    this.props.closeModal();
-                } else {
-                    this.setState({
-                        modal1Visible: false
-                    });
-                }
-                // if(this.props.clearDrawnGraph){
-                this.clearDrawnGraph();
-                // }
-            }
+      }
+
+      if (graphicType === 'polyline') {
+        if (editGraphic) {
+          mapLines.push(editGraphic);
+          drawProps = null;
         }
-    }, {
-        key: 'clearDrawnGraph',
-        value: function clearDrawnGraph() {
-            var _this3 = this;
-
-            this.isDrawStatus = true;
-            this.setState({
-                isDraw: this.state.graphicType !== 'point',
-                graphicValue: null,
-                isEndEdit: this.state.graphicType !== 'point'
-            }, function () {
-                _this3.setState({ isEndEdit: false });
-            });
+      }
+
+      if (graphicType === 'rectangle') {
+        if (editGraphic) {
+          mapPolygons.push(editGraphic);
+          drawProps = null;
         }
-    }, {
-        key: 'render',
-        value: function render() {
-            var _this4 = this;
-
-            var t = this;
-            var _state2 = this.state,
-                isShowList = _state2.isShowList,
-                searchValue = _state2.searchValue,
-                locationPoint = _state2.locationPoint,
-                listPoint = _state2.listPoint,
-                listMess = _state2.listMess,
-                mapZoomLevel = _state2.mapZoomLevel,
-                setZoomLevel = _state2.setZoomLevel,
-                maxZoom = _state2.maxZoom,
-                minZoom = _state2.minZoom,
-                wkid = _state2.wkid,
-                mapServer = _state2.mapServer,
-                mapCenter = _state2.mapCenter,
-                setCenter = _state2.setCenter,
-                mapType = _state2.mapType,
-                mapVisiblePoints = _state2.mapVisiblePoints,
-                setVisiblePoints = _state2.setVisiblePoints,
-                isDoEdit = _state2.isDoEdit,
-                editGraphicId = _state2.editGraphicId,
-                isEndEdit = _state2.isEndEdit,
-                modal1Visible = _state2.modal1Visible,
-                drawGraphID = _state2.drawGraphID,
-                isShowOther = _state2.isShowOther,
-                otherText = _state2.otherText,
-                isShowOtherGraph = _state2.isShowOtherGraph,
-                editGraphic = _state2.editGraphic,
-                graphicType = _state2.graphicType,
-                olProps = _state2.olProps;
-
-            var InputProps = {
-                style: { 'width': '200px' },
-                placeholder: '输入关键字',
-                value: searchValue,
-                onChange: this.changeValue.bind(this),
-                onPressEnter: this.searchList.bind(this),
-                onKeyDown: this.changeValue.bind(this)
-            };
-            var drawProps = this.state.graphicType == 'point' || t.isinit ? {
-                isDraw: this.state.isDraw,
-                isCloseDraw: this.state.isCloseDraw
-            } : {
-                isDraw: this.state.isDraw,
-                isCloseDraw: this.state.isCloseDraw,
-                drawEnd: function drawEnd(obj) {
-                    _this4.isDrawStatus = false;
-                    _this4.isClickMap = false;
-                    var objparam = {
-                        graphicValue: obj,
-                        isDraw: false
-                    };
-                    if (obj.geometryType == 'polyline' || obj.geometryType == 'polygon') {
-                        objparam.editGraphicId = obj.id;
-                        objparam.isDoEdit = true;
-                    }
-                    _this4.setState(objparam, function () {
-                        _this4.setState({
-                            isDoEdit: false
-                        });
-                    });
-                },
-                mapDraw: {
-                    geometryType: this.state.graphicType,
-                    parameter: this.state.parameter || (this.state.graphicType == 'polyline' ? {
-                        color: '#108edf', //线颜色,
-                        pellucidity: 1, //线透明度,
-                        lineWidth: 3, //线宽度 
-                        lineType: 'solid'
-                    } : this.state.graphicType == 'polygon' || this.state.graphicType == 'circle' || this.state.graphicType == 'rectangle' ? {
-                        color: '#ffffff', //填充色, 
-                        lineColor: '#108edf', //线颜色, 
-                        lineOpacity: 1, //线透明度, 
-                        lineWidth: 3, //线宽度, 
-                        pellucidity: 0.8, //填充透明度 
-                        lineType: 'solid'
-                    } : {}),
-                    data: { id: drawGraphID }
-                }
-            };
-            var mapPoints = [],
-                mapLines = [],
-                mapPolygons = [],
-                mapCircles = [];
-            if (graphicType == 'point') {
-                mapPoints = [].concat(_toConsumableArray(locationPoint), _toConsumableArray(listPoint));
-            } else {
-                mapPoints = [].concat(_toConsumableArray(listPoint));
-            }
-            if (graphicType === 'polygon') {
-                if (editGraphic) {
-                    mapPolygons.push(editGraphic);
-                    drawProps = null;
-                }
-            }
-            if (graphicType === 'polyline') {
-                if (editGraphic) {
-                    mapLines.push(editGraphic);
-                    drawProps = null;
-                }
-            }
-            if (graphicType === 'rectangle') {
-                if (editGraphic) {
-                    mapPolygons.push(editGraphic);
-                    drawProps = null;
-                }
-            }
-            if (graphicType === 'circle') {
-                if (editGraphic) {
-                    mapCircles.push(editGraphic);
-                    drawProps = null;
-                }
-            }
-            if (isShowOtherGraph) {
-                var otherGraph = this.props.otherGraph;
-
-                if (otherGraph) {
-                    mapPoints = [].concat(_toConsumableArray(mapPoints), _toConsumableArray(otherGraph.point || []));
-                    mapLines = [].concat(_toConsumableArray(mapLines), _toConsumableArray(otherGraph.polyline || []));
-                    mapPolygons = [].concat(_toConsumableArray(mapPolygons), _toConsumableArray(otherGraph.polygon || []));
-                    mapCircles = [].concat(_toConsumableArray(mapCircles), _toConsumableArray(otherGraph.circle || []));
-                }
-            }
-            return _react2.default.createElement(
-                _VtxModal.VtxModal,
-                {
-                    title: this.state.graphicType == 'point' ? "定位" : "绘制",
-                    style: { top: 50 },
-                    visible: modal1Visible,
-                    maximize: true,
-                    isNotMoving: true,
-                    wrapClassName: styles.searchModal,
-                    bodyStyle: { height: window.innerHeight * 0.7 + 'px' },
-                    maskClosable: false,
-                    onCancel: this.closeModal.bind(this),
-                    footer: _react2.default.createElement(
-                        'div',
-                        { className: styles.bottom },
-                        _react2.default.createElement(
-                            _button2.default,
-                            { type: 'primary', onClick: function onClick() {
-                                    _this4.callback();
-                                }, icon: getIcon('check') },
-                            '\u786E\u5B9A'
-                        ),
-                        _react2.default.createElement(
-                            _button2.default,
-                            { onClick: this.closeModal.bind(this), icon: getIcon('close') },
-                            '\u5173\u95ED'
-                        )
-                    )
-                },
-                _react2.default.createElement(
-                    'div',
-                    { className: styles.searchMap },
-                    _react2.default.createElement(
-                        'div',
-                        { className: styles.top },
-                        mapType == 'gmap' || mapType == 'olmap' ? '' : [_react2.default.createElement(_input2.default, _extends({ key: '1' }, InputProps)), _react2.default.createElement(
-                            _button2.default,
-                            { key: '2', type: 'primary', onClick: this.searchList.bind(this), icon: getIcon('search') },
-                            '\u67E5\u8BE2'
-                        ), _react2.default.createElement(
-                            _button2.default,
-                            { key: '3', onClick: this.clearList.bind(this), icon: getIcon('close') },
-                            '\u6E05\u7A7A'
-                        )],
-                        this.state.graphicType == 'point' ? _react2.default.createElement(
-                            _button2.default,
-                            { onClick: this.correction.bind(this), icon: getIcon('environment') },
-                            '\u6821\u6B63'
-                        ) : null,
-                        this.state.graphicType != 'point' ? _react2.default.createElement(
-                            _button2.default,
-                            { disabled: this.isDrawStatus, onClick: function onClick() {
-                                    _this4.isDrawStatus = true;
-                                    _this4.setState({
-                                        isDraw: true,
-                                        graphicValue: null,
-                                        editGraphic: null,
-                                        isEndEdit: true
-                                    }, function () {
-                                        t.map.removeGraphic('drawnGraph', 'draw');
-                                        t.setState({
-                                            isEndEdit: false
-                                        });
-                                    });
-                                    _this4.callback('editDraw');
-                                }, icon: getIcon('edit') },
-                            '\u91CD\u65B0\u7ED8\u5236'
-                        ) : null,
-                        mapType == 'gmap' || mapType == 'olmap' ? '' : _react2.default.createElement(
-                            _button2.default,
-                            { onClick: this.setFitView.bind(this), icon: getIcon('sync') },
-                            '\u8FD4\u56DE\u5168\u5C40\u5730\u56FE'
-                        ),
-                        isShowOther ? _react2.default.createElement(
-                            'div',
-                            { className: styles.otherModal },
-                            _react2.default.createElement(
-                                _checkbox2.default,
-                                { checked: isShowOtherGraph, onChange: function onChange(e) {
-                                        _this4.setState({ isShowOtherGraph: e.target.checked });
-                                    } },
-                                otherText
-                            )
-                        ) : ''
-                    ),
-                    _react2.default.createElement(
-                        'div',
-                        { className: styles.content, style: { paddingLeft: mapType == 'gmap' || mapType == 'olmap' ? '0px' : '25px' } },
-                        mapType == 'gmap' || mapType == 'olmap' ? '' : _react2.default.createElement(
-                            'div',
-                            { className: styles.content_left + ' ' + (isShowList ? styles.w_l : '') },
-                            _react2.default.createElement(
-                                'div',
-                                { className: '' + (isShowList ? styles.show : styles.hidden) },
-                                _react2.default.createElement(
-                                    'div',
-                                    { className: styles.listTitle },
-                                    _react2.default.createElement(
-                                        'div',
-                                        { className: styles.title },
-                                        '\u67E5\u8BE2\u7ED3\u679C'
-                                    ),
-                                    _react2.default.createElement(
-                                        'div',
-                                        { onClick: function onClick() {
-                                                return _this4.showOrhidden(false);
-                                            }, className: styles.btn },
-                                        _react2.default.createElement(_default.VtxMapIcon, { type: 'icon-doubleleft' })
-                                    )
-                                ),
-                                _react2.default.createElement(
-                                    'div',
-                                    { className: styles.scrollauto },
-                                    listMess.map(function (item, index) {
-                                        return _react2.default.createElement(
-                                            'div',
-                                            {
-                                                key: index,
-                                                onClick: function onClick() {
-                                                    return _this4.chooseAddress(item.id);
-                                                },
-                                                className: styles.lists + ' ' + (item.isSelect ? styles.select : '')
-                                            },
-                                            item.title
-                                        );
-                                    })
-                                )
-                            ),
-                            _react2.default.createElement(
-                                'div',
-                                { onClick: function onClick() {
-                                        return _this4.showOrhidden(true);
-                                    }, className: styles.btn + ' ' + (!isShowList ? styles.show : styles.hidden) },
-                                _react2.default.createElement(_default.VtxMapIcon, { type: 'icon-doubleright' })
-                            )
-                        ),
-                        _react2.default.createElement(
-                            'div',
-                            { className: styles.content_right },
-                            _react2.default.createElement(_VtxMap.VtxMap, _extends({
-                                getMapInstance: function getMapInstance(map) {
-                                    if (map) _this4.map = map;
-                                },
-                                mapType: mapType,
-                                mapServer: mapServer,
-                                wkid: wkid,
-                                mapId: t.mapId,
-                                setCenter: setCenter,
-                                mapCenter: mapCenter,
-                                minZoom: minZoom,
-                                maxZoom: maxZoom,
-                                mapZoomLevel: mapZoomLevel,
-                                setZoomLevel: setZoomLevel,
-                                mapPoints: mapPoints,
-                                mapLines: mapLines,
-                                mapPolygons: mapPolygons,
-                                mapCircles: mapCircles,
-                                mapVisiblePoints: mapVisiblePoints,
-                                setVisiblePoints: setVisiblePoints,
-                                isDoEdit: isDoEdit,
-                                isEndEdit: isEndEdit,
-                                editGraphicId: editGraphicId,
-                                editGraphicChange: function editGraphicChange() {},
-                                clickGraphic: this.clickGraphic.bind(this),
-                                clickMap: function clickMap() {
-                                    t.isClickMap = true;
-                                },
-                                olProps: olProps
-                            }, drawProps))
-                        )
-                    )
-                )
-            );
+      }
+
+      if (graphicType === 'circle') {
+        if (editGraphic) {
+          mapCircles.push(editGraphic);
+          drawProps = null;
         }
-    }, {
-        key: 'initSearchMap',
-        value: function initSearchMap() {
-            var _this5 = this;
-
-            if (this.props.modal1Visible /*&& !this.state.locationPoint[0]*/) {
-                    if (this.map) {
-                        this.map.loadMapComplete.then(function () {
-                            if (!_this5.mapLoaded) {
-                                _this5.mapLoaded = true;
-                                _this5.drawLocationPoint();
-                            }
-                        });
-                    }
-                }
+      }
+
+      if (isShowOtherGraph) {
+        var otherGraph = this.props.otherGraph;
+
+        if (otherGraph) {
+          mapPoints = [].concat(_toConsumableArray(mapPoints), _toConsumableArray(otherGraph.point || []));
+          mapLines = [].concat(_toConsumableArray(mapLines), _toConsumableArray(otherGraph.polyline || []));
+          mapPolygons = [].concat(_toConsumableArray(mapPolygons), _toConsumableArray(otherGraph.polygon || []));
+          mapCircles = [].concat(_toConsumableArray(mapCircles), _toConsumableArray(otherGraph.circle || []));
         }
-    }, {
-        key: 'componentDidMount',
-        value: function componentDidMount() {
-            //绘制定位点(以当前的中心点位参照=>初始化好后才有ref可以获取中心点)
-            this.initSearchMap();
+      }
+
+      return /*#__PURE__*/_react["default"].createElement(_VtxModal.VtxModal, {
+        title: this.state.graphicType == 'point' ? "定位" : "绘制",
+        style: {
+          top: 50
+        },
+        visible: modal1Visible,
+        maximize: true,
+        isNotMoving: true,
+        wrapClassName: styles.searchModal,
+        bodyStyle: {
+          height: "".concat(window.innerHeight * 0.7, "px")
+        },
+        maskClosable: false,
+        onCancel: this.closeModal.bind(this),
+        footer: /*#__PURE__*/_react["default"].createElement("div", {
+          className: styles.bottom
+        }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
+          type: "primary",
+          onClick: function onClick() {
+            _this4.callback();
+          },
+          icon: getIcon('check')
+        }, "\u786E\u5B9A"), /*#__PURE__*/_react["default"].createElement(_button["default"], {
+          onClick: this.closeModal.bind(this),
+          icon: getIcon('close')
+        }, "\u5173\u95ED"))
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: styles.searchMap
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: styles.top
+      }, mapType == 'gmap' || mapType == 'olmap' ? '' : [/*#__PURE__*/_react["default"].createElement(_input["default"], _extends({
+        key: "1"
+      }, InputProps)), /*#__PURE__*/_react["default"].createElement(_button["default"], {
+        key: "2",
+        type: "primary",
+        onClick: this.searchList.bind(this),
+        icon: getIcon('search')
+      }, "\u67E5\u8BE2"), /*#__PURE__*/_react["default"].createElement(_button["default"], {
+        key: "3",
+        onClick: this.clearList.bind(this),
+        icon: getIcon('close')
+      }, "\u6E05\u7A7A")], this.state.graphicType == 'point' ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
+        onClick: this.correction.bind(this),
+        icon: getIcon('environment')
+      }, "\u6821\u6B63") : null, this.state.graphicType != 'point' ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
+        disabled: this.isDrawStatus,
+        onClick: function onClick() {
+          _this4.isDrawStatus = true;
+
+          _this4.setState({
+            isDraw: true,
+            graphicValue: null,
+            editGraphic: null,
+            isEndEdit: true
+          }, function () {
+            t.map.removeGraphic('drawnGraph', 'draw');
+            t.setState({
+              isEndEdit: false
+            });
+          });
+
+          _this4.callback('editDraw');
+        },
+        icon: getIcon('edit')
+      }, "\u91CD\u65B0\u7ED8\u5236") : null, mapType == 'gmap' || mapType == 'olmap' ? '' : /*#__PURE__*/_react["default"].createElement(_button["default"], {
+        onClick: this.setFitView.bind(this),
+        icon: getIcon('sync')
+      }, "\u8FD4\u56DE\u5168\u5C40\u5730\u56FE"), isShowOther ? /*#__PURE__*/_react["default"].createElement("div", {
+        className: styles.otherModal
+      }, /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+        checked: isShowOtherGraph,
+        onChange: function onChange(e) {
+          _this4.setState({
+            isShowOtherGraph: e.target.checked
+          });
         }
-    }, {
-        key: 'componentDidUpdate',
-        value: function componentDidUpdate(prevProps, prevState) {
-            //重新渲染结束
-            this.initSearchMap();
+      }, otherText)) : ''), /*#__PURE__*/_react["default"].createElement("div", {
+        className: styles.content,
+        style: {
+          paddingLeft: mapType == 'gmap' || mapType == 'olmap' ? '0px' : '25px'
         }
-    }, {
-        key: 'componentWillReceiveProps',
-        value: function componentWillReceiveProps(nextProps) {
-            var _this6 = this;
-
-            var t = this;
-            this.isClickMap = false;
-            if (t.state.graphicType !== nextProps.graphicType && !!this.map) {
-                this.map.clearAll();
-                t.mapLoaded = false;
-                t.isinit = true;
-            }
-            if (nextProps.editParam) {
-                t.mapLoaded = false;
+      }, mapType == 'gmap' || mapType == 'olmap' ? '' : /*#__PURE__*/_react["default"].createElement("div", {
+        className: "".concat(styles.content_left, " ").concat(isShowList ? styles.w_l : '')
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: "".concat(isShowList ? styles.show : styles.hidden)
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: styles.listTitle
+      }, /*#__PURE__*/_react["default"].createElement("div", {
+        className: styles.title
+      }, "\u67E5\u8BE2\u7ED3\u679C"), /*#__PURE__*/_react["default"].createElement("div", {
+        onClick: function onClick() {
+          return _this4.showOrhidden(false);
+        },
+        className: styles.btn
+      }, /*#__PURE__*/_react["default"].createElement(_default2.VtxMapIcon, {
+        type: "icon-doubleleft"
+      }))), /*#__PURE__*/_react["default"].createElement("div", {
+        className: styles.scrollauto
+      }, listMess.map(function (item, index) {
+        return /*#__PURE__*/_react["default"].createElement("div", {
+          key: index,
+          onClick: function onClick() {
+            return _this4.chooseAddress(item.id);
+          },
+          className: "".concat(styles.lists, " ").concat(item.isSelect ? styles.select : '')
+        }, item.title);
+      }))), /*#__PURE__*/_react["default"].createElement("div", {
+        onClick: function onClick() {
+          return _this4.showOrhidden(true);
+        },
+        className: "".concat(styles.btn, " ").concat(!isShowList ? styles.show : styles.hidden)
+      }, /*#__PURE__*/_react["default"].createElement(_default2.VtxMapIcon, {
+        type: "icon-doubleright"
+      }))), /*#__PURE__*/_react["default"].createElement("div", {
+        className: styles.content_right
+      }, /*#__PURE__*/_react["default"].createElement(_VtxMap.VtxMap, _extends({
+        getMapInstance: function getMapInstance(map) {
+          if (map) _this4.map = map;
+        },
+        mapType: mapType,
+        mapStyle: mapStyle,
+        mapServer: mapServer,
+        wkid: wkid,
+        mapId: t.mapId,
+        setCenter: setCenter,
+        mapCenter: mapCenter,
+        minZoom: minZoom,
+        maxZoom: maxZoom,
+        mapZoomLevel: mapZoomLevel,
+        setZoomLevel: setZoomLevel,
+        mapPoints: mapPoints,
+        mapLines: mapLines,
+        mapPolygons: mapPolygons,
+        mapCircles: mapCircles,
+        mapVisiblePoints: mapVisiblePoints,
+        setVisiblePoints: setVisiblePoints,
+        isDoEdit: isDoEdit,
+        isEndEdit: isEndEdit,
+        editGraphicId: editGraphicId,
+        editGraphicChange: function editGraphicChange() {},
+        clickGraphic: this.clickGraphic.bind(this),
+        clickMap: function clickMap() {
+          t.isClickMap = true;
+        },
+        olProps: olProps
+      }, drawProps))))));
+    }
+  }, {
+    key: "initSearchMap",
+    value: function initSearchMap() {
+      var _this5 = this;
+
+      if (this.props.modal1Visible
+      /*&& !this.state.locationPoint[0]*/
+      ) {
+        if (this.map) {
+          this.map.loadMapComplete.then(function () {
+            if (!_this5.mapLoaded) {
+              _this5.mapLoaded = true;
+
+              _this5.drawLocationPoint();
             }
-            t.isDrawStatus = nextProps.graphicType !== 'point' && !nextProps.editParam;
-            this.setState({
-                modal1Visible: nextProps.modal1Visible,
-                maxZoom: nextProps.maxZoom,
-                minZoom: nextProps.minZoom,
-                wkid: nextProps.wkid,
-                mapCenter: nextProps.mapCenter || '',
-                mapType: nextProps.mapType || 'bmap',
-                mapServer: nextProps.mapServer,
-                graphicType: nextProps.graphicType || 'point',
-                isDraw: nextProps.graphicType !== 'point' && !nextProps.editParam,
-                isCloseDraw: !(nextProps.graphicType !== 'point' && !nextProps.editParam),
-                editGraphicId: ''
-            }, function () {
-                t.setState({
-                    isCloseDraw: false
-                });
-                t.initSearchMap();
-            });
-            setTimeout(function () {
-                //实现2+次进入时,清理数据
-                if (nextProps.modal1Visible) {
-                    _this6.clearList();
-                    _this6.setState({
-                        setZoomLevel: true
-                    }, function () {
-                        _this6.setState({
-                            setZoomLevel: false
-                        });
-                    });
-                    if (!!_this6.map && !!_this6.state.locationPoint[0] && nextProps.mapCenter && !!nextProps.mapCenter[0]) {
-                        if (_this6.map.getGraphic('locationPoint')) {
-                            switch (nextProps.mapType) {
-                                case 'bmap':
-                                    _this6.map.getGraphic('locationPoint').mapLayer.setPosition(new BMap.Point(nextProps.mapCenter[0], nextProps.mapCenter[1]));
-                                    break;
-                                case 'amap':
-                                    _this6.map.getGraphic('locationPoint').mapLayer.setPosition(new AMap.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
-                                    break;
-                                case 'tmap':
-                                    _this6.map.getGraphic('locationPoint').mapLayer.setLngLat(new T.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
-                                    break;
-                                case 'gmap':
-                                    _this6.map.getGraphic('locationPoint').mapLayer.geometry.setLatitude(nextProps.mapCenter[1]);
-                                    _this6.map.getGraphic('locationPoint').mapLayer.geometry.setLongitude(nextProps.mapCenter[0]);
-                                    _this6.map.state.gis.graphics.refresh();
-                                case 'olMap':
-                                    _this6.map.getGraphic('locationPoint').mapLayer.setGeometry(new ol.geom.Point(nextProps.mapCenter));
-                                    break;
-                            }
-                        }
-                        _this6.map.setCenter(nextProps.mapCenter);
-                    }
-                }
-            }, 100);
+          });
         }
-    }, {
-        key: 'componentWillUnmount',
-        value: function componentWillUnmount() {
-            //关闭moveTo定时
-            var t = this;
-            if (t.loadExtent) {
-                clearInterval(t.loadExtent);
+      }
+    }
+  }, {
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      //绘制定位点(以当前的中心点位参照=>初始化好后才有ref可以获取中心点)
+      this.initSearchMap();
+    }
+  }, {
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps, prevState) {
+      //重新渲染结束
+      this.initSearchMap();
+    }
+  }, {
+    key: "componentWillReceiveProps",
+    value: function componentWillReceiveProps(nextProps) {
+      var _this6 = this;
+
+      var t = this;
+      this.isClickMap = false;
+
+      if (t.state.graphicType !== nextProps.graphicType && !!this.map) {
+        this.map.clearAll();
+        t.mapLoaded = false;
+        t.isinit = true;
+      }
+
+      if (nextProps.editParam) {
+        t.mapLoaded = false;
+      }
+
+      t.isDrawStatus = nextProps.graphicType !== 'point' && !nextProps.editParam;
+      this.setState({
+        modal1Visible: nextProps.modal1Visible,
+        maxZoom: nextProps.maxZoom,
+        minZoom: nextProps.minZoom,
+        wkid: nextProps.wkid,
+        mapCenter: nextProps.mapCenter || '',
+        mapType: nextProps.mapType || 'bmap',
+        mapStyle: nextProps.mapStyle,
+        mapServer: nextProps.mapServer,
+        graphicType: nextProps.graphicType || 'point',
+        isDraw: nextProps.graphicType !== 'point' && !nextProps.editParam,
+        isCloseDraw: !(nextProps.graphicType !== 'point' && !nextProps.editParam),
+        editGraphicId: ''
+      }, function () {
+        t.setState({
+          isCloseDraw: false
+        });
+        t.initSearchMap();
+      });
+      setTimeout(function () {
+        //实现2+次进入时,清理数据
+        if (nextProps.modal1Visible) {
+          _this6.clearList();
+
+          _this6.setState({
+            setZoomLevel: true
+          }, function () {
+            _this6.setState({
+              setZoomLevel: false
+            });
+          });
+
+          if (!!_this6.map && !!_this6.state.locationPoint[0] && nextProps.mapCenter && !!nextProps.mapCenter[0]) {
+            if (_this6.map.getGraphic('locationPoint')) {
+              switch (nextProps.mapType) {
+                case 'bmap':
+                  _this6.map.getGraphic('locationPoint').mapLayer.setPosition(new BMap.Point(nextProps.mapCenter[0], nextProps.mapCenter[1]));
+
+                  break;
+
+                case 'amap':
+                  _this6.map.getGraphic('locationPoint').mapLayer.setPosition(new AMap.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
+
+                  break;
+
+                case 'tmap':
+                  _this6.map.getGraphic('locationPoint').mapLayer.setLngLat(new T.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
+
+                  break;
+
+                case 'gmap':
+                  _this6.map.getGraphic('locationPoint').mapLayer.geometry.setLatitude(nextProps.mapCenter[1]);
+
+                  _this6.map.getGraphic('locationPoint').mapLayer.geometry.setLongitude(nextProps.mapCenter[0]);
+
+                  _this6.map.state.gis.graphics.refresh();
+
+                case 'olMap':
+                  _this6.map.getGraphic('locationPoint').mapLayer.setGeometry(new ol.geom.Point(nextProps.mapCenter));
+
+                  break;
+              }
             }
+
+            _this6.map.setCenter(nextProps.mapCenter);
+          }
         }
-    }]);
+      }, 100);
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      //关闭moveTo定时
+      var t = this;
+
+      if (t.loadExtent) {
+        clearInterval(t.loadExtent);
+      }
+    }
+  }]);
 
-    return VtxSearchMap;
-}(_react2.default.Component);
+  return VtxSearchMap;
+}(_react["default"].Component);
 
-exports.default = VtxSearchMap;
-module.exports = exports['default'];
+var _default = VtxSearchMap;
+exports["default"] = _default;
+module.exports = exports["default"];
+//# sourceMappingURL=VtxSearchMap.js.map