@vtx/map 1.2.38 → 2.0.0-beta.2

package/lib/VtxSearchMap/VtxSearchMap.js

@@ -6,16 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _antd = require("antd");
 var _VtxModal = require("../VtxModal");
 var _VtxMap = require("../VtxMap");
 var _default2 = _interopRequireWildcard(require("../default"));
 var _mapping = require("./mapping");
 var _util = require("../utils/util");
-var _antd = require("antd");
 var _defaultMarker = _interopRequireDefault(require("../VtxMap/images/defaultMarker.png"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
@@ -84,7 +80,7 @@ var CoverageTypes = [{
 //   duration: 5,
 // });
 var warning = function warning() {
-  _message["default"].warning('位置点查询失败,请缩小比例尺或切换关键字后再重新查询!');
+  _antd.message.warning('位置点查询失败,请缩小比例尺或切换关键字后再重新查询!');
 };
 function distinct(ary) {
   if ((ary === null || ary === void 0 ? void 0 : ary.length) < 2) {
@@ -99,9 +95,9 @@ function distinct(ary) {
   }
 }
 var getIcon = function getIcon(type) {
-  return _default2.antdMajorVersion === '4' ? /*#__PURE__*/_react["default"].createElement(_default2.VtxMapIcon, {
+  return /*#__PURE__*/_react["default"].createElement(_default2.VtxMapIcon, {
     type: "icon-".concat(_mapping.iconMapping[type])
-  }) : type;
+  });
 };
 var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
   function VtxSearchMap(props) {
@@ -426,7 +422,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
     value: function locateByLnglat() {
       var t = this;
       if (!t.state.searchValue) {
-        _message["default"].warn(t.TextEnum.msgConfirmInputLnglatText);
+        _antd.message.warn(t.TextEnum.msgConfirmInputLnglatText);
         return;
       }
       var _t$state$searchValue$ = t.state.searchValue.split(','),
@@ -434,7 +430,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         longitude = _t$state$searchValue$2[0],
         latitude = _t$state$searchValue$2[1];
       t.setState({
-        mapCenter: [Number(longitude), Number(latitude)],
+        mapCenter: [longitude, latitude],
         setCenter: true
       }, function () {
         t.setState({
@@ -451,7 +447,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
     value: function searchList() {
       var t = this;
       if (!t.state.searchValue) {
-        _message["default"].warn(this.TextEnum.msgConfirmInputText);
+        _antd.message.warn(this.TextEnum.msgConfirmInputText);
         return;
       }
       if (t.state.searchMode === 'lnglat') {
@@ -476,23 +472,15 @@ 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: _objectSpread({
+          data: {
             location: lnglat,
             coordtype: _util.MapTypeEnum[t.state.mapType],
             batch: false
-          }, config),
+          },
           headers: {
             'authorization': "Bearer ".concat((0, _util.getToken)())
           },
@@ -505,7 +493,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
             }
           },
           fail: function fail(res) {
-            _message["default"].warn("");
+            _antd.message.warn("");
           }
         });
       }
@@ -531,7 +519,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
               var lnglat = (0, _util.transform)({
                 lng: item.lngDone,
                 lat: item.latDone
-              }, t.state.mapType, t.state.olProps);
+              }, t.state.mapType);
               return {
                 id: item.id,
                 longitude: lnglat.lng,
@@ -548,7 +536,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
           }
         },
         fail: function fail(res) {
-          _message["default"].warn("");
+          _antd.message.warn("");
         }
       });
     }
@@ -708,7 +696,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
       var _this3 = this;
       var disableEditIds = this.getAllOtherGraphId();
       if (obj.attributes && disableEditIds.includes(obj.attributes.id)) {
-        _message["default"].warn(this.TextEnum.msgDoNotAllowOtherGraph);
+        _antd.message.warn(this.TextEnum.msgDoNotAllowOtherGraph);
       } else {
         if (obj.type === 'point' && obj.attributes.other === 'search') {
           this.chooseAddress(obj.attributes.id);
@@ -733,7 +721,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
       this.isDrawStatus = false;
       this.isClickMap = false;
       if (this.isDrawStatus && this.isClickMap) {
-        _message["default"].warning(this.TextEnum.msgEndEditingDrawText);
+        _antd.message.warning(this.TextEnum.msgEndEditingDrawText);
       } else {
         if ('closeModal' in this.props) {
           this.props.closeModal();
@@ -789,10 +777,10 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
     value: function editGraphic() {
       var _this6 = this;
       if (this.isDrawStatus && this.isClickMap) {
-        _message["default"].warning(this.TextEnum.msgEndEditingDrawText);
+        _antd.message.warning(this.TextEnum.msgEndEditingDrawText);
         return;
       }
-      _message["default"].info(this.TextEnum.msgClickGraphicEditText);
+      _antd.message.info(this.TextEnum.msgClickGraphicEditText);
       this.clickable = true;
       this.isDrawStatus = false;
       this.setState({
@@ -1061,12 +1049,16 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         style: {
           top: 50
         },
-        visible: modal1Visible,
+        open: modal1Visible,
         maximize: true,
         isNotMoving: true,
-        wrapClassName: styles.searchModal,
-        bodyStyle: {
-          height: "".concat(window.innerHeight * 0.7, "px")
+        classNames: {
+          wrapper: styles.searchModal
+        },
+        styles: {
+          body: {
+            height: "".concat(window.innerHeight * 0.7, "px")
+          }
         },
         maskClosable: false,
         onModalResize: function onModalResize() {
@@ -1079,7 +1071,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
           className: styles.bottom
         }, /*#__PURE__*/_react["default"].createElement("div", {
           className: styles.address
-        }, this.state.lbsAddress || ''), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_button["default"], {
+        }, this.state.lbsAddress || ''), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
           type: "primary",
           onClick: function onClick() {
             if (_this8.multiDraw && _this8.state.isDoEdit && !_this8.state.isEndEdit) {
@@ -1089,7 +1081,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
             _this8.callback();
           },
           icon: getIcon('check')
-        }, TextEnum.footerConfirmBtnText), /*#__PURE__*/_react["default"].createElement(_button["default"], {
+        }, TextEnum.footerConfirmBtnText), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
           onClick: this.closeModal.bind(this),
           icon: getIcon('close')
         }, TextEnum.footerCancelBtnText)))
@@ -1111,25 +1103,25 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         value: 'keyword'
       }, this.TextEnum.radioLabelKeywordText), /*#__PURE__*/_react["default"].createElement(_antd.Radio, {
         value: 'lnglat'
-      }, this.TextEnum.radioLabelLnglatText)), /*#__PURE__*/_react["default"].createElement(_input["default"], _extends({
+      }, this.TextEnum.radioLabelLnglatText)), /*#__PURE__*/_react["default"].createElement(_antd.Input, _extends({
         key: "1"
-      }, InputProps)), this.state.searchMode === 'keyword' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_button["default"], {
+      }, InputProps)), this.state.searchMode === 'keyword' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
         key: "2",
         type: "primary",
         onClick: this.searchList.bind(this),
         icon: getIcon('search')
-      }, TextEnum.searchConfirmBtnText), /*#__PURE__*/_react["default"].createElement(_button["default"], {
+      }, TextEnum.searchConfirmBtnText), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
         key: "3",
         onClick: this.clearList.bind(this),
         icon: getIcon('close')
-      }, TextEnum.searchResetBtnText)) : /*#__PURE__*/_react["default"].createElement(_button["default"], {
+      }, TextEnum.searchResetBtnText)) : /*#__PURE__*/_react["default"].createElement(_antd.Button, {
         key: "4",
         type: "primary",
         onClick: this.locateByLnglat.bind(this)
-      }, TextEnum.locateLnglatText)), this.state.graphicType == 'point' ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
+      }, TextEnum.locateLnglatText)), this.state.graphicType == 'point' ? /*#__PURE__*/_react["default"].createElement(_antd.Button, {
         onClick: this.correction.bind(this),
         icon: getIcon('environment')
-      }, TextEnum.searchRelocateBtnText) : null, this.state.graphicType != 'point' ? /*#__PURE__*/_react["default"].createElement(_button["default"], {
+      }, TextEnum.searchRelocateBtnText) : null, this.state.graphicType != 'point' ? /*#__PURE__*/_react["default"].createElement(_antd.Button, {
         disabled: this.isDrawStatus,
         onClick: function onClick() {
           _this8.isDrawStatus = true;
@@ -1170,20 +1162,20 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
           _this8.callback('editDraw');
         },
         icon: getIcon('edit')
-      }, TextEnum.searchRedrawBtnText) : null, this.multiDraw && /*#__PURE__*/_react["default"].createElement(_button["default"], {
+      }, TextEnum.searchRedrawBtnText) : null, this.multiDraw && /*#__PURE__*/_react["default"].createElement(_antd.Button, {
         onClick: this.continueDraw.bind(this),
         icon: getIcon('edit')
-      }, TextEnum.searchContinueDrawBtnText), this.multiDraw && /*#__PURE__*/_react["default"].createElement(_button["default"], {
+      }, TextEnum.searchContinueDrawBtnText), this.multiDraw && /*#__PURE__*/_react["default"].createElement(_antd.Button, {
         onClick: this.editGraphic.bind(this),
         icon: getIcon('edit')
-      }, TextEnum.searchEditGraphicBtnText), /*#__PURE__*/_react["default"].createElement(_button["default"], {
+      }, TextEnum.searchEditGraphicBtnText), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
         onClick: this.setFitView.bind(this),
         icon: getIcon('sync')
       }, TextEnum.searchGlobalBtnText), !this.multiDraw && this.map && this.computeGraphic()), /*#__PURE__*/_react["default"].createElement("div", {
         className: styles.top_right
       }, typeof customNodes == 'function' && customNodes(t.map), isShowOther ? /*#__PURE__*/_react["default"].createElement("div", {
         className: styles.otherModal
-      }, /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+      }, /*#__PURE__*/_react["default"].createElement(_antd.Checkbox, {
         checked: isShowOtherGraph,
         onChange: function onChange(e) {
           _this8.setState({
@@ -1192,7 +1184,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         }
       }, otherText)) : '', isChangeMapType && ['amap', 'bmap', 'tmap'].includes(mapType) && /*#__PURE__*/_react["default"].createElement(_antd.Dropdown, {
         placement: "bottom",
-        overlay: /*#__PURE__*/_react["default"].createElement(_antd.Menu, {
+        menu: {
           onClick: function onClick(_ref) {
             var key = _ref.key;
             _this8.setState({
@@ -1200,19 +1192,19 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
             });
           },
           items: [{
-            label: TextEnum.labelBaseMapStyleImgText,
+            label: TextEnum.labelBaseMapStyleVecText,
             key: 'sl'
           }, {
-            label: TextEnum.labelBaseMapStyleVecText,
+            label: TextEnum.labelBaseMapStyleImgText,
             key: 'wx'
           }]
-        })
+        }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: styles.mapTxt,
         style: {
           width: 'fit-content'
         }
-      }, /*#__PURE__*/_react["default"].createElement(_button["default"], null, coverageType == 'wx' ? TextEnum.labelBaseMapStyleVecText : TextEnum.labelBaseMapStyleImgText, /*#__PURE__*/_react["default"].createElement("img", {
+      }, /*#__PURE__*/_react["default"].createElement(_antd.Button, null, coverageType == 'wx' ? TextEnum.labelBaseMapStyleImgText : TextEnum.labelBaseMapStyleVecText, /*#__PURE__*/_react["default"].createElement("img", {
         src: require("../VtxMap/images/downoutlined.png"),
         width: "20px"
       })))))), /*#__PURE__*/_react["default"].createElement("div", {
@@ -1327,10 +1319,11 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "UNSAFE_componentWillReceiveProps",
     value: function UNSAFE_componentWillReceiveProps(nextProps) {
+      var _this0 = this;
       var t = this;
-      t.isClickMap = false;
-      if (t.state.graphicType !== nextProps.graphicType && !!t.map) {
-        t.map.clearAll();
+      this.isClickMap = false;
+      if (t.state.graphicType !== nextProps.graphicType && !!this.map) {
+        this.map.clearAll();
         t.mapLoaded = false;
         t.isinit = true;
       }
@@ -1338,7 +1331,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         t.mapLoaded = false;
       }
       t.isDrawStatus = nextProps.graphicType !== 'point' && !nextProps.editParam;
-      t.setState({
+      this.setState({
         modal1Visible: nextProps.modal1Visible,
         maxZoom: nextProps.maxZoom,
         minZoom: nextProps.minZoom,
@@ -1361,38 +1354,36 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
       setTimeout(function () {
         //实现2+次进入时,清理数据
         if (nextProps.modal1Visible) {
-          t.clearList();
-          t.setState({
+          _this0.clearList();
+          _this0.setState({
             setZoomLevel: true
           }, function () {
-            t.setState({
+            _this0.setState({
               setZoomLevel: false
             });
           });
-          if (!!t.map && !!t.state.locationPoint[0] && nextProps.mapCenter && !!nextProps.mapCenter[0]) {
-            if (t.map.getGraphic('locationPoint')) {
+          if (!!_this0.map && !!_this0.state.locationPoint[0] && nextProps.mapCenter && !!nextProps.mapCenter[0]) {
+            if (_this0.map.getGraphic('locationPoint')) {
               switch (nextProps.mapType) {
                 case 'bmap':
-                  t.map.getGraphic('locationPoint').mapLayer.setPosition(new BMap.Point(nextProps.mapCenter[0], nextProps.mapCenter[1]));
+                  _this0.map.getGraphic('locationPoint').mapLayer.setPosition(new BMap.Point(nextProps.mapCenter[0], nextProps.mapCenter[1]));
                   break;
                 case 'amap':
-                  t.map.getGraphic('locationPoint').mapLayer.setPosition(new AMap.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
+                  _this0.map.getGraphic('locationPoint').mapLayer.setPosition(new AMap.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
                   break;
                 case 'tmap':
-                  t.map.getGraphic('locationPoint').mapLayer.setLngLat(new T.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
+                  _this0.map.getGraphic('locationPoint').mapLayer.setLngLat(new T.LngLat(nextProps.mapCenter[0], nextProps.mapCenter[1]));
                   break;
                 case 'gmap':
-                  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();
-                  }
+                  _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();
                 case 'olMap':
-                  window.ol && t.map.getGraphic('locationPoint').mapLayer.setGeometry(new ol.geom.Point(nextProps.mapCenter));
+                  window.ol && _this0.map.getGraphic('locationPoint').mapLayer.setGeometry(new ol.geom.Point(nextProps.mapCenter));
                   break;
               }
             }
-            t.map.setCenter(nextProps.mapCenter);
+            _this0.map.setCenter(nextProps.mapCenter);
           }
         }
       }, 100);