@vtx/map 1.1.35 → 1.1.37

package/lib/VtxSearchMap/VtxSearchMap.js

@@ -1,78 +1,45 @@
 "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); }
-
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _button = _interopRequireDefault(require("antd/lib/button"));
-
 var _input = _interopRequireDefault(require("antd/lib/input"));
-
 var _message = _interopRequireDefault(require("antd/lib/message"));
-
 var _checkbox = _interopRequireDefault(require("antd/lib/checkbox"));
-
 var _popover = _interopRequireDefault(require("antd/lib/popover"));
-
 var _VtxModal = require("../VtxModal");
-
 var _VtxMap = require("../VtxMap");
-
 var _default2 = _interopRequireWildcard(require("../default"));
-
 var _mapping = require("./mapping");
-
-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); }
-
-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; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 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); }
-
-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; }
-
-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; }
-
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a 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); } }
-
+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, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
 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); }
-
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 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 _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 _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return 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 _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-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; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 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); }
-
 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; }
-
+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',
@@ -94,18 +61,17 @@ var styles = {
   hiddenLabel: 'vtx-ui-searchmap-hiddenlabel',
   otherModal: 'vtx-ui-searchmap-othermodal',
   mapTxt: 'vtx-ui-searchmap-mapTxt'
-}; // message.config({
+};
+
+// message.config({
 //   top: document.getElementById('root').offsetHeight/3,
 //   duration: 5,
 // });
-
 var warning = function warning() {
   _message["default"].warning('位置点查询失败,请缩小比例尺或切换关键字后再重新查询!');
 };
-
 function distinct(ary) {
   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);
@@ -113,31 +79,24 @@ function distinct(ary) {
     return pts;
   }
 }
-
 var getIcon = function getIcon(type) {
   return _default2.antdMajorVersion === '4' ? /*#__PURE__*/_react["default"].createElement(_default2.VtxMapIcon, {
     type: "icon-".concat(_mapping.iconMapping[type])
   }) : type;
 };
-
 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);
-
+    // 绘制多个图元时返回参数
     _defineProperty(_assertThisInitialized(_this), "getMultiRes", function (graphicType) {
       var resData = [];
       var _this$state = _this.state,
-          graphicValue = _this$state.graphicValue,
-          editGraphic = _this$state.editGraphic;
-
+        graphicValue = _this$state.graphicValue,
+        editGraphic = _this$state.editGraphic;
       switch (graphicType) {
         case 'polygon':
           [].concat(_toConsumableArray(graphicValue || []), _toConsumableArray(editGraphic || [])).forEach(function (item) {
@@ -147,25 +106,28 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
             });
           });
           break;
-
+        case 'polyline':
+          [].concat(_toConsumableArray(graphicValue || []), _toConsumableArray(editGraphic || [])).forEach(function (item) {
+            resData.push({
+              paths: item.geometry.paths,
+              length: _this.map.calculateDistance(item.geometry.paths)
+            });
+          });
         default:
           break;
       }
-
       return resData.length ? resData : null;
     });
-
     _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.multiDraw = props.multiDraw && ['polygon'].includes(props.graphicType);
-    _this.clickable = false, // 多个面绘制时，是否可以点击面进行编辑
+    _this.multiDraw = props.multiDraw && ['polygon', 'polyline'].includes(props.graphicType);
+    _this.clickable = false,
+    // 多个面绘制时，是否可以点击面进行编辑
     _this.state = {
       //列表和地图宽度切换的动画需要
       isShowList: false,
@@ -184,7 +146,6 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
       graphicValue: _this.multiDraw ? [] : null,
       // 绘制图元id集合
       drawGraphID: _this.multiDraw ? ['drawnGraph'] : 'drawnGraph',
-
       /*地图Api参数*/
       mapCenter: props.mapCenter || '',
       maxZoom: props.maxZoom,
@@ -205,7 +166,6 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
       editGraphic: _this.multiDraw ? [] : null,
       mapZoomLevel: props.mapZoomLevel || 11,
       setZoomLevel: false,
-
       /*modal参数*/
       modal1Visible: props.modal1Visible || false,
       isShowOther: props.isShowOther || false,
@@ -219,35 +179,28 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
       showControl: props.showControl || false
     };
     return _this;
-  } // 绘制多个图元时返回参数
-
-
+  }
   _createClass(VtxSearchMap, [{
     key: "callback",
-    value: //经纬度回调
+    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':
             if (this.map.getGraphic(editGraphicId)) {
               var _p = this.map.getGraphic(editGraphicId);
-
               this.props[fun]({
                 x: _p.geometry.x,
                 y: _p.geometry.y,
@@ -262,18 +215,14 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
                 area: this.state.graphicValue.area
               } : null);
             }
-
             break;
-
           case 'polygon':
             if (this.multiDraw) {
               this.props[fun](this.getMultiRes('polygon'));
               return;
             }
-
             if (this.map.getGraphic(editGraphicId)) {
               var _p2 = this.map.getGraphic(editGraphicId);
-
               this.props[fun]({
                 rings: distinct(_p2.geometry.rings),
                 area: this.map.getPolygonArea(distinct(_p2.geometry.rings))
@@ -284,20 +233,20 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
                 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.multiDraw) {
+              this.props[fun](this.getMultiRes('polyline'));
+              return;
+            }
             if (this.map.getGraphic(editGraphicId)) {
               var _p3 = this.map.getGraphic(editGraphicId);
-
               this.props[fun]({
                 paths: _p3.geometry.paths,
                 length: this.map.calculateDistance(_p3.geometry.paths)
@@ -308,11 +257,9 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
                 length: this.map.calculateDistance(this.state.graphicValue.geometry.paths)
               } : null);
             }
-
             break;
         }
       }
-
       if (this.props.clearDrawnGraph) {
         this.clearDrawnGraph();
       }
@@ -323,18 +270,17 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
       this.setState({
         isShowList: bealoon
       });
-    } //绘制定位点(以当前的中心点位参照 => 同时开启点位编辑)
-
+    }
+    //绘制定位点(以当前的中心点位参照 => 同时开启点位编辑)
   }, {
     key: "drawLocationPoint",
     value: function drawLocationPoint() {
-      var t = this; //判断arcgis,是: 判断中心点是否已经确定,确定,继续走逻辑.不确认.轮询等待
-
+      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';
-
+          editGraphic = null,
+          editGraphicId = 'locationPoint';
         if (!this.multiDraw && this.props.editParam) {
           // && (this.props.graphicType == 'polyline' || this.props.graphicType == 'polygon')
           editGraphic = _objectSpread(_objectSpread({}, this.props.editParam), {}, {
@@ -342,7 +288,6 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
           });
           editGraphicId = 'drawnGraph';
         }
-
         if (this.multiDraw && Array.isArray(this.props.editParam) && this.props.editParam.length) {
           // && (this.props.graphicType == 'polyline' || this.props.graphicType == 'polygon')
           editGraphic = this.props.editParam.map(function (item, index) {
@@ -352,7 +297,6 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
           });
           editGraphicId = null;
         }
-
         this.isinit = false;
         this.setState({
           editGraphic: editGraphic,
@@ -383,13 +327,13 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
           t.drawLocationPoint();
         }, 50);
       }
-    } //校正定位的点位位置到当前的中心点
-
+    }
+    //校正定位的点位位置到当前的中心点
   }, {
     key: "correction",
     value: function correction() {
-      var t = this; //获取当前中心点经纬度
-
+      var t = this;
+      //获取当前中心点经纬度
       var lglt = this.map.getMapExtent();
       var locationPoint = t.state.locationPoint;
       locationPoint = locationPoint.map(function (item, index) {
@@ -399,16 +343,16 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         });
       });
       this.map.updatePoint(locationPoint);
-    } //搜索关键字切换
-
+    }
+    //搜索关键字切换
   }, {
     key: "changeValue",
     value: function changeValue(e) {
       this.setState({
         searchValue: e.target.value
       });
-    } //根据关键字搜索数据
-
+    }
+    //根据关键字搜索数据
   }, {
     key: "searchList",
     value: function searchList() {
@@ -418,9 +362,8 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
       searchPoints.then(function (results) {
         if (results.length > 0) {
           var lsp = [],
-              lsm = [];
+            lsm = [];
           t.apid = [];
-
           for (var i = 0; i < results.length; i++) {
             var r = results[i];
             lsp.push(_objectSpread(_objectSpread({}, results[i]), {}, {
@@ -435,7 +378,6 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
             });
             t.apid.push(r.id);
           }
-
           t.setState({
             listPoint: lsp,
             listMess: lsm,
@@ -446,13 +388,12 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
           warning();
         }
       });
-    } //返回最佳位置(zoom,center)
-
+    }
+    //返回最佳位置(zoom,center)
   }, {
     key: "setFitView",
     value: function setFitView() {
       var _this2 = this;
-
       this.setState({
         mapVisiblePoints: {
           fitView: this.apid,
@@ -464,8 +405,8 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
           setVisiblePoints: false
         });
       });
-    } //清空列表的所有数据(包括点位)
-
+    }
+    //清空列表的所有数据(包括点位)
   }, {
     key: "clearList",
     value: function clearList() {
@@ -476,15 +417,15 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         listMess: [],
         isShowList: false
       });
-    } //列表选中地址
-
+    }
+    //列表选中地址
   }, {
     key: "chooseAddress",
     value: function chooseAddress(id) {
       var t = this;
       var _this$state2 = this.state,
-          listPoint = _this$state2.listPoint,
-          listMess = _this$state2.listMess;
+        listPoint = _this$state2.listPoint,
+        listMess = _this$state2.listMess;
       var mapCenter = [];
       listPoint = listPoint.map(function (item, index) {
         if (item.id === id) {
@@ -520,7 +461,6 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         t.setState({
           setCenter: false
         });
-
         if (t.state.graphicType == 'point') {
           t.correction();
         }
@@ -530,14 +470,11 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
     key: "clickGraphic",
     value: function clickGraphic(obj) {
       var _this3 = this;
-
       if (obj.type === 'point' && obj.attributes.other === 'search') {
         this.chooseAddress(obj.attributes.id);
       }
-
-      if (this.clickable && obj.type === 'polygon') {
+      if (this.clickable && ['polygon', 'polyline'].includes(obj.type)) {
         var _obj$param$attributes;
-
         // 开启编辑
         this.setState({
           editGraphicId: obj.param.id || ((_obj$param$attributes = obj.param.attributes) === null || _obj$param$attributes === void 0 ? void 0 : _obj$param$attributes.id),
@@ -561,17 +498,16 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
           this.setState({
             modal1Visible: false
           });
-        } // if(this.props.clearDrawnGraph){
-
-
-        this.clearDrawnGraph(); // }
+        }
+        // if(this.props.clearDrawnGraph){
+        this.clearDrawnGraph();
+        // }
       }
     }
   }, {
     key: "clearDrawnGraph",
     value: function clearDrawnGraph() {
       var _this4 = this;
-
       this.isDrawStatus = true;
       this.setState({
         isDraw: this.state.graphicType !== 'point',
@@ -587,7 +523,6 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
     key: "continueDraw",
     value: function continueDraw(func) {
       var _this5 = this;
-
       this.clickable = false;
       this.setState({
         isDraw: false,
@@ -610,15 +545,11 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
     key: "editGraphic",
     value: function editGraphic() {
       var _this6 = this;
-
       if (this.isDrawStatus && this.isClickMap) {
         _message["default"].warning('请双击结束图元编辑');
-
         return;
       }
-
       _message["default"].info('请点击图元进行编辑');
-
       this.clickable = true;
       this.isDrawStatus = false;
       this.setState({
@@ -638,8 +569,8 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
     value: function editGraphicChange(obj) {
       if (!this.multiDraw) return;
       var _this$state3 = this.state,
-          graphicValue = _this$state3.graphicValue,
-          editGraphic = _this$state3.editGraphic;
+        graphicValue = _this$state3.graphicValue,
+        editGraphic = _this$state3.editGraphic;
       this.setState({
         graphicValue: (graphicValue || []).map(function (item) {
           return item.id === obj.id ? obj : item;
@@ -658,7 +589,6 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         currentMap: str
       });
       var layers = [];
-
       switch (mapType) {
         case 'amap':
         case 'bmap':
@@ -668,12 +598,9 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
           } else {
             t.map.setMapType('wx');
           }
-
           break;
-
         case 'gmap':
           break;
-
         default:
           break;
       }
@@ -682,41 +609,40 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var _this7 = this;
-
       var t = this;
       var _this$state4 = this.state,
-          isShowList = _this$state4.isShowList,
-          searchValue = _this$state4.searchValue,
-          locationPoint = _this$state4.locationPoint,
-          listPoint = _this$state4.listPoint,
-          listMess = _this$state4.listMess,
-          mapZoomLevel = _this$state4.mapZoomLevel,
-          setZoomLevel = _this$state4.setZoomLevel,
-          maxZoom = _this$state4.maxZoom,
-          minZoom = _this$state4.minZoom,
-          wkid = _this$state4.wkid,
-          mapServer = _this$state4.mapServer,
-          mapCenter = _this$state4.mapCenter,
-          setCenter = _this$state4.setCenter,
-          mapType = _this$state4.mapType,
-          mapStyle = _this$state4.mapStyle,
-          mapVisiblePoints = _this$state4.mapVisiblePoints,
-          setVisiblePoints = _this$state4.setVisiblePoints,
-          isDoEdit = _this$state4.isDoEdit,
-          editGraphicId = _this$state4.editGraphicId,
-          isEndEdit = _this$state4.isEndEdit,
-          modal1Visible = _this$state4.modal1Visible,
-          drawGraphID = _this$state4.drawGraphID,
-          isShowOther = _this$state4.isShowOther,
-          otherText = _this$state4.otherText,
-          isShowOtherGraph = _this$state4.isShowOtherGraph,
-          editGraphic = _this$state4.editGraphic,
-          graphicType = _this$state4.graphicType,
-          graphicValue = _this$state4.graphicValue,
-          olProps = _this$state4.olProps,
-          isChangeMapType = _this$state4.isChangeMapType,
-          currentMap = _this$state4.currentMap,
-          showControl = _this$state4.showControl;
+        isShowList = _this$state4.isShowList,
+        searchValue = _this$state4.searchValue,
+        locationPoint = _this$state4.locationPoint,
+        listPoint = _this$state4.listPoint,
+        listMess = _this$state4.listMess,
+        mapZoomLevel = _this$state4.mapZoomLevel,
+        setZoomLevel = _this$state4.setZoomLevel,
+        maxZoom = _this$state4.maxZoom,
+        minZoom = _this$state4.minZoom,
+        wkid = _this$state4.wkid,
+        mapServer = _this$state4.mapServer,
+        mapCenter = _this$state4.mapCenter,
+        setCenter = _this$state4.setCenter,
+        mapType = _this$state4.mapType,
+        mapStyle = _this$state4.mapStyle,
+        mapVisiblePoints = _this$state4.mapVisiblePoints,
+        setVisiblePoints = _this$state4.setVisiblePoints,
+        isDoEdit = _this$state4.isDoEdit,
+        editGraphicId = _this$state4.editGraphicId,
+        isEndEdit = _this$state4.isEndEdit,
+        modal1Visible = _this$state4.modal1Visible,
+        drawGraphID = _this$state4.drawGraphID,
+        isShowOther = _this$state4.isShowOther,
+        otherText = _this$state4.otherText,
+        isShowOtherGraph = _this$state4.isShowOtherGraph,
+        editGraphic = _this$state4.editGraphic,
+        graphicType = _this$state4.graphicType,
+        graphicValue = _this$state4.graphicValue,
+        olProps = _this$state4.olProps,
+        isChangeMapType = _this$state4.isChangeMapType,
+        currentMap = _this$state4.currentMap,
+        showControl = _this$state4.showControl;
       var InputProps = {
         style: {
           'width': '200px'
@@ -741,11 +667,9 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
             isDoEdit: !_this7.multiDraw,
             isDraw: _this7.multiDraw
           };
-
           if (!_this7.multiDraw && (obj.geometryType == 'polyline' || obj.geometryType == 'polygon')) {
             objparam.editGraphicId = obj.id;
           }
-
           _this7.setState(objparam);
         },
         mapDraw: {
@@ -777,49 +701,42 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         }
       };
       var mapPoints = [],
-          mapLines = [],
-          mapPolygons = [],
-          mapCircles = [];
-
+        mapLines = [],
+        mapPolygons = [],
+        mapCircles = [];
       if (graphicType == 'point') {
         mapPoints = [].concat(_toConsumableArray(locationPoint), _toConsumableArray(listPoint));
       } else {
         mapPoints = _toConsumableArray(listPoint);
       }
-
       if (graphicType === 'polygon') {
         if (editGraphic) {
           var _mapPolygons;
-
           Array.isArray(editGraphic) ? (_mapPolygons = mapPolygons).push.apply(_mapPolygons, _toConsumableArray(editGraphic)) : mapPolygons.push(editGraphic);
           !this.multiDraw && (drawProps = null);
         }
       }
-
       if (graphicType === 'polyline') {
         if (editGraphic) {
-          mapLines.push(editGraphic);
-          drawProps = null;
+          var _mapLines;
+          Array.isArray(editGraphic) ? (_mapLines = mapLines).push.apply(_mapLines, _toConsumableArray(editGraphic)) : mapLines.push(editGraphic);
+          !this.multiDraw && (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 || []));
@@ -827,7 +744,6 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
           mapCircles = [].concat(_toConsumableArray(mapCircles), _toConsumableArray(otherGraph.circle || []));
         }
       }
-
       var mapTypeContent = /*#__PURE__*/_react["default"].createElement("div", {
         style: {
           width: '170px',
@@ -863,7 +779,6 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
       }, /*#__PURE__*/_react["default"].createElement("img", {
         src: "".concat(_default2["default"].mapServerURL, "/images/wx.png")
       })));
-
       return /*#__PURE__*/_react["default"].createElement(_VtxModal.VtxModal, {
         title: this.state.graphicType == 'point' ? "定位" : "绘制",
         style: {
@@ -885,10 +800,8 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
           onClick: function onClick() {
             if (_this7.multiDraw && _this7.state.isDoEdit && !_this7.state.isEndEdit) {
               _this7.continueDraw(_this7.callback.bind(_this7));
-
               return;
             }
-
             _this7.callback();
           },
           icon: getIcon('check')
@@ -918,16 +831,14 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         disabled: this.isDrawStatus,
         onClick: function onClick() {
           _this7.isDrawStatus = true;
-
           if (_this7.multiDraw) {
             _this7.clickable = false;
-            graphicValue === null || graphicValue === void 0 ? void 0 : graphicValue.forEach(function (item) {
+            graphicValue === null || graphicValue === void 0 || graphicValue.forEach(function (item) {
               return t.map.removeGraphic(item.id, 'draw');
             });
-            editGraphic === null || editGraphic === void 0 ? void 0 : editGraphic.forEach(function (item) {
+            editGraphic === null || editGraphic === void 0 || editGraphic.forEach(function (item) {
               return t.map.removeGraphic(item.id, 'draw');
             });
-
             _this7.setState({
               isDraw: false,
               isCloseDraw: true,
@@ -954,7 +865,6 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
               });
             });
           }
-
           _this7.callback('editDraw');
         },
         icon: getIcon('edit')
@@ -1059,15 +969,11 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
     key: "initSearchMap",
     value: function initSearchMap() {
       var _this8 = this;
-
-      if (this.props.modal1Visible
-      /*&& !this.state.locationPoint[0]*/
-      ) {
+      if (this.props.modal1Visible /*&& !this.state.locationPoint[0]*/) {
         if (this.map) {
           this.map.loadMapComplete.then(function () {
             if (!_this8.mapLoaded) {
               _this8.mapLoaded = true;
-
               _this8.drawLocationPoint();
             }
           });
@@ -1090,20 +996,16 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
     key: "componentWillReceiveProps",
     value: function componentWillReceiveProps(nextProps) {
       var _this9 = 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,
@@ -1128,7 +1030,6 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         //实现2+次进入时,清理数据
         if (nextProps.modal1Visible) {
           _this9.clearList();
-
           _this9.setState({
             setZoomLevel: true
           }, function () {
@@ -1136,39 +1037,27 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
               setZoomLevel: false
             });
           });
-
           if (!!_this9.map && !!_this9.state.locationPoint[0] && nextProps.mapCenter && !!nextProps.mapCenter[0]) {
             if (_this9.map.getGraphic('locationPoint')) {
               switch (nextProps.mapType) {
                 case 'bmap':
                   _this9.map.getGraphic('locationPoint').mapLayer.setPosition(new BMap.Point(nextProps.mapCenter[0], nextProps.mapCenter[1]));
-
                   break;
-
                 case 'amap':
                   _this9.map.getGraphic('locationPoint').mapLayer.setPosition(new AMap.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
-
                   break;
-
                 case 'tmap':
                   _this9.map.getGraphic('locationPoint').mapLayer.setLngLat(new T.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
-
                   break;
-
                 case 'gmap':
                   _this9.map.getGraphic('locationPoint').mapLayer.geometry.setLatitude(nextProps.mapCenter[1]);
-
                   _this9.map.getGraphic('locationPoint').mapLayer.geometry.setLongitude(nextProps.mapCenter[0]);
-
                   _this9.map.state.gis.graphics.refresh();
-
                 case 'olMap':
                   _this9.map.getGraphic('locationPoint').mapLayer.setGeometry(new ol.geom.Point(nextProps.mapCenter));
-
                   break;
               }
             }
-
             _this9.map.setCenter(nextProps.mapCenter);
           }
         }
@@ -1179,17 +1068,13 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
     value: function componentWillUnmount() {
       //关闭moveTo定时
       var t = this;
-
       if (t.loadExtent) {
         clearInterval(t.loadExtent);
       }
     }
   }]);
-
   return VtxSearchMap;
 }(_react["default"].Component);
-
-var _default = VtxSearchMap;
-exports["default"] = _default;
+var _default = exports["default"] = VtxSearchMap;
 module.exports = exports["default"];
 //# sourceMappingURL=VtxSearchMap.js.map