@vtx/map 1.2.17 → 1.2.19

package/lib/VtxSearchMap/VtxSearchMap.css

@@ -189,3 +189,14 @@
 .vtx-ui-searchmap-hiddenlabel {
   display: none;
 }
+.vtx-ui-searchmap-bottom {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+}

package/lib/VtxSearchMap/VtxSearchMap.js

@@ -110,7 +110,8 @@ var styles = {
   hiddenLabel: 'vtx-ui-searchmap-hiddenlabel',
   otherModal: 'vtx-ui-searchmap-othermodal',
   mapTxt: 'vtx-ui-searchmap-mapTxt',
-  switchMap: 'vtx-ui-searchmap-switch-map'
+  switchMap: 'vtx-ui-searchmap-switch-map',
+  address: 'vtx-ui-searchmap-address'
 };
 var CoverageTypes = [{
   name: '矢量底图',
@@ -199,7 +200,10 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
     _this.loadExtent = null;
     _this.mapId = "searchMap".concat(new Date().getTime());
     _this.multiDraw = props.multiDraw && ['polygon', 'polyline'].includes(props.graphicType);
-    _this.clickable = false, // 多个面绘制时，是否可以点击面进行编辑
+    _this.clickable = false; // 多个面绘制时，是否可以点击面进行编辑
+
+    _this.prefixUrl = props.prefixUrl || '';
+    _this.searchPoiUrl = props.searchPoiUrl || '';
     _this.state = {
       //列表和地图宽度切换的动画需要
       isShowList: false,
@@ -257,7 +261,9 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
       // 自定义右上角功能
       customNodes: props.customNodes || null,
       // 查询模式
-      searchMode: props.searchMode || 'keyword'
+      searchMode: props.searchMode || 'keyword',
+      // LBS解析后的地址
+      lbsAddress: ''
     };
     _this.TextEnum = _objectSpread({
       locationTitleText: '定位',
@@ -540,6 +546,52 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
       } else {
         t.searchPointsLBS();
       }
+    } // lbs解析经纬度为地址
+
+  }, {
+    key: "convertAddressByLnglat",
+    value: function convertAddressByLnglat() {
+      var obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      console.log(obj);
+      var t = this;
+      var lnglat = '';
+
+      if (obj.geometry && obj.geometry.type && ['point', 'circle'].includes(obj.geometry.type)) {
+        lnglat = "".concat(obj.geometry.x, ",").concat(obj.geometry.y);
+      } else if (obj.geometry && obj.geometry.paths) {
+        lnglat = getAvg(obj.geometry.paths);
+      } else if (obj.geometry && obj.geometry.rings) {
+        lnglat = getAvg(obj.geometry.rings);
+      } else if (obj.geometry && obj.geometry.rings) {
+        lnglat = getAvg(obj.geometry.rings);
+      }
+
+      if (!!lnglat) {
+        $.ajax({
+          url: "".concat(t.prefixUrl, "/vortexapi/rest/lbs/geoconvert/v2"),
+          method: "GET",
+          data: {
+            location: lnglat,
+            coordtype: _util.MapTypeEnum[t.state.mapType],
+            batch: false
+          },
+          headers: {
+            'authorization': "Bearer ".concat((0, _util.getToken)())
+          },
+          success: function success(res) {
+            if ((res === null || res === void 0 ? void 0 : res.result) === 0) {
+              var _res$data;
+
+              t.setState({
+                lbsAddress: ((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.address) || ''
+              });
+            }
+          },
+          fail: function fail(res) {
+            _message["default"].warn("");
+          }
+        });
+      }
     } // 从lbs中查询
 
   }, {
@@ -547,7 +599,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
     value: function searchPointsLBS() {
       var t = this;
       $.ajax({
-        url: "/vortexapi/rest/lbs/poi",
+        url: t.searchPoiUrl || "".concat(t.prefixUrl, "/vortexapi/rest/lbs/poi"),
         method: "GET",
         data: {
           keywords: t.state.searchValue,
@@ -748,7 +800,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
 
       var disableEditIds = this.getAllOtherGraphId();
 
-      if (disableEditIds.includes(obj.attributes.id)) {
+      if (obj.attributes && disableEditIds.includes(obj.attributes.id)) {
         _message["default"].warn(this.TextEnum.msgDoNotAllowOtherGraph);
       } else {
         if (obj.type === 'point' && obj.attributes.other === 'search') {
@@ -860,6 +912,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
   }, {
     key: "editGraphicChange",
     value: function editGraphicChange(obj) {
+      this.convertAddressByLnglat(obj);
       if (!this.multiDraw) return;
       var _this$state3 = this.state,
           graphicValue = _this$state3.graphicValue,
@@ -1040,6 +1093,8 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
           }
 
           _this8.setState(objparam);
+
+          _this8.convertAddressByLnglat(obj);
         },
         mapDraw: {
           geometryType: this.state.graphicType,
@@ -1144,7 +1199,9 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         onCancel: this.closeModal.bind(this),
         footer: /*#__PURE__*/_react["default"].createElement("div", {
           className: styles.bottom
-        }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
+        }, /*#__PURE__*/_react["default"].createElement("div", {
+          className: styles.address
+        }, this.state.lbsAddress || ''), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_button["default"], {
           type: "primary",
           onClick: function onClick() {
             if (_this8.multiDraw && _this8.state.isDoEdit && !_this8.state.isEndEdit) {
@@ -1159,7 +1216,7 @@ var VtxSearchMap = /*#__PURE__*/function (_React$Component) {
         }, TextEnum.footerConfirmBtnText), /*#__PURE__*/_react["default"].createElement(_button["default"], {
           onClick: this.closeModal.bind(this),
           icon: getIcon('close')
-        }, TextEnum.footerCancelBtnText))
+        }, TextEnum.footerCancelBtnText)))
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: styles.searchMap
       }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -1514,5 +1571,16 @@ function formatNumber(num) {
   return Number(num).toFixed(2);
 }
 
+function getAvg() {
+  var arr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var sumLng = 0,
+      sumLat = 0;
+  arr.forEach(function (item) {
+    sumLng += Number(item[0]);
+    sumLat += Number(item[1]);
+  });
+  return "".concat(sumLng / arr.length, ",").concat(sumLat / arr.length);
+}
+
 module.exports = exports["default"];
 //# sourceMappingURL=VtxSearchMap.js.map