@vtx/map 1.2.33 → 1.2.35

package/lib/VtxSearchMap/VtxSearchMap.js

@@ -434,7 +434,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         longitude = _t$state$searchValue$2[0],
         latitude = _t$state$searchValue$2[1];
       t.setState({
-        mapCenter: [longitude, latitude],
+        mapCenter: [Number(longitude), Number(latitude)],
         setCenter: true
       }, function () {
         t.setState({
@@ -476,15 +476,23 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
       } else if (obj.geometry && obj.geometry.rings) {
         lnglat = getAvg(obj.geometry.rings);
       }
+      var olProps = t.props.olProps;
+      var config = {};
+      if (olProps !== null && olProps !== void 0 && olProps.epsg) {
+        config = {
+          epsg: olProps === null || olProps === void 0 ? void 0 : olProps.epsg,
+          coordtype: 'cgcs2000'
+        };
+      }
       if (!!lnglat) {
         $.ajax({
           url: "".concat(t.prefixUrl, "/cloudLbs/vortexapi/rest/lbs/geoconvert/v2"),
           method: "GET",
-          data: {
+          data: _objectSpread({
             location: lnglat,
             coordtype: _util.MapTypeEnum[t.state.mapType],
             batch: false
-          },
+          }, config),
           headers: {
             'authorization': "Bearer ".concat((0, _util.getToken)())
           },
@@ -1319,11 +1327,10 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "UNSAFE_componentWillReceiveProps",
     value: function UNSAFE_componentWillReceiveProps(nextProps) {
-      var _this0 = this;
       var t = this;
-      this.isClickMap = false;
-      if (t.state.graphicType !== nextProps.graphicType && !!this.map) {
-        this.map.clearAll();
+      t.isClickMap = false;
+      if (t.state.graphicType !== nextProps.graphicType && !!t.map) {
+        t.map.clearAll();
         t.mapLoaded = false;
         t.isinit = true;
       }
@@ -1331,7 +1338,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         t.mapLoaded = false;
       }
       t.isDrawStatus = nextProps.graphicType !== 'point' && !nextProps.editParam;
-      this.setState({
+      t.setState({
         modal1Visible: nextProps.modal1Visible,
         maxZoom: nextProps.maxZoom,
         minZoom: nextProps.minZoom,
@@ -1354,36 +1361,38 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
       setTimeout(function () {
         //实现2+次进入时,清理数据
         if (nextProps.modal1Visible) {
-          _this0.clearList();
-          _this0.setState({
+          t.clearList();
+          t.setState({
             setZoomLevel: true
           }, function () {
-            _this0.setState({
+            t.setState({
               setZoomLevel: false
             });
           });
-          if (!!_this0.map && !!_this0.state.locationPoint[0] && nextProps.mapCenter && !!nextProps.mapCenter[0]) {
-            if (_this0.map.getGraphic('locationPoint')) {
+          if (!!t.map && !!t.state.locationPoint[0] && nextProps.mapCenter && !!nextProps.mapCenter[0]) {
+            if (t.map.getGraphic('locationPoint')) {
               switch (nextProps.mapType) {
                 case 'bmap':
-                  _this0.map.getGraphic('locationPoint').mapLayer.setPosition(new BMap.Point(nextProps.mapCenter[0], nextProps.mapCenter[1]));
+                  t.map.getGraphic('locationPoint').mapLayer.setPosition(new BMap.Point(nextProps.mapCenter[0], nextProps.mapCenter[1]));
                   break;
                 case 'amap':
-                  _this0.map.getGraphic('locationPoint').mapLayer.setPosition(new AMap.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
+                  t.map.getGraphic('locationPoint').mapLayer.setPosition(new AMap.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
                   break;
                 case 'tmap':
-                  _this0.map.getGraphic('locationPoint').mapLayer.setLngLat(new T.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
+                  t.map.getGraphic('locationPoint').mapLayer.setLngLat(new T.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
                   break;
                 case 'gmap':
-                  _this0.map.getGraphic('locationPoint').mapLayer.geometry.setLatitude(nextProps.mapCenter[1]);
-                  _this0.map.getGraphic('locationPoint').mapLayer.geometry.setLongitude(nextProps.mapCenter[0]);
-                  _this0.map.state.gis.graphics.refresh();
+                  if (t.map.getGraphic('locationPoint').mapLayer.geometry.setLatitude) {
+                    t.map.getGraphic('locationPoint').mapLayer.geometry.setLatitude(nextProps.mapCenter[1]);
+                    t.map.getGraphic('locationPoint').mapLayer.geometry.setLongitude(nextProps.mapCenter[0]);
+                    t.map.state.gis.graphics.refresh();
+                  }
                 case 'olMap':
-                  window.ol && _this0.map.getGraphic('locationPoint').mapLayer.setGeometry(new ol.geom.Point(nextProps.mapCenter));
+                  window.ol && t.map.getGraphic('locationPoint').mapLayer.setGeometry(new ol.geom.Point(nextProps.mapCenter));
                   break;
               }
             }
-            _this0.map.setCenter(nextProps.mapCenter);
+            t.map.setCenter(nextProps.mapCenter);
           }
         }
       }, 100);