@vtx/map 1.2.32 → 2.0.0-beta.1

package/lib/VtxMap/OlMap/Map.less

@@ -1,231 +1,231 @@
-.map{
-    width: 100%;
-    height: 100%;
-    background-color: #f1f1f1;
-}
-.vtx_gmap_html_points,.vtx_gmap_html_pointCollection{
-    position: absolute;
-    top: 0px;
-    left: 0px;
-}
-.esriSimpleSlider{
-    z-index: 10000000 !important;
-}
-.label-content{
-    /*margin-left: 0;
-    width: 100px;
-    line-height: 25px;
-    text-align: center;
-    position: relative;
-    left: -43px;
-    background-color: #fff;
-    opacity: 1;
-    border-radius: 5px;
-    color: #5DD0EE;
-    word-break: break-all;
-    white-space: normal;
-    padding: 2px 8px;*/
-    display: inline-block;
-    padding: 5px;
-    line-height: 22px;
-    text-align: center;
-    border-radius: 5px;
-    background-color: #fff;
-    opacity: 1;
-    color: #5DD0EE;
-}
-.vtx-g-rangingPoint{
-    width: 7px;
-    height: 7px;
-    background-color: #fff;
-    border: 2px solid #ff0000;
-    display: inline-block;
-    border-radius: 7px;
-}
-.vtx-g-rangingDistance{
-    position: relative;
-    top: -36px;
-    left: 15px;
-    height: 30px;
-    line-height: 28px;
-    background-color: #fff;
-    border: 1px solid #ff0000;
-    font-size: 12px;
-    word-break: keep-all;
-    padding: 0px 3px;
-}
-.vtx-g-rang-exit{
-    width: 9px;
-    height: 9px;
-    background-color: #fff;
-    border: 2px solid #ff0000;
-    color: #ff0000;
-    line-height: 7px;
-    text-align: center;
-    font-size: 12px;
-    cursor: pointer;
-}
-.vtx-g-rang-showRangTool{
-    line-height: 18px;
-    font-size: 12px;
-    border: 1px solid #ff0000;
-    word-break: keep-all;
-    background-color: #fff;
-    padding: 0px 5px;
-}
-.zoom_slider_show_scale{
-    padding: 1px 8px;
-    font-size: 12px;
-    text-align: center;
-}
-.zoom_slider_show_bottom{
-    width: 100%;
-    height: 3px;
-    border: 1px solid #000;
-    border-bottom: 3px solid #000;
-    border-top: 0px;
-}
-.ol-tooltip {
-    position: relative;
-    background: rgba(0, 0, 0, 0.5);
-    border-radius: 4px;
-    color: white;
-    padding: 4px 8px;
-    opacity: 0.7;
-    white-space: nowrap;
-    font-size: 12px;
-    cursor: default;
-    user-select: none;
-}
-.ol-tooltip-measure {
-    opacity: 1;
-    font-weight: bold;
-}
-.ol-tooltip-static {
-    background-color: #ffcc33;
-    color: black;
-    border: 1px solid white;
-}
-.ol-tooltip-measure:before,
-.ol-tooltip-static:before {
-    border-top: 6px solid rgba(0, 0, 0, 0.5);
-    border-right: 6px solid transparent;
-    border-left: 6px solid transparent;
-    content: "";
-    position: absolute;
-    bottom: -6px;
-    margin-left: -7px;
-    left: 50%;
-}
-.ol-tooltip-static:before {
-    border-top-color: #ffcc33;
-}
-
-// 核心就是绝对定位
-.ol-popup {
-    position: absolute;
-    background-color: white;
-    box-shadow: 0 1px 4px rgba(0,0,0,0.2);
-    padding: 15px;
-    border-radius: 10px;
-    border: 1px solid #cccccc;
-    bottom: 12px;
-    left: -50px;
-    min-width: 280px;
-}
-  .ol-popup:after, .ol-popup:before {
-    top: 100%;
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-}
-  .ol-popup:after {
-    border-top-color: white;
-    border-width: 10px;
-    left: 48px;
-    margin-left: -10px;
-}
-  .ol-popup:before {
-    border-top-color: #cccccc;
-    border-width: 11px;
-    left: 48px;
-    margin-left: -11px;
-}
-  .ol-popup-closer {
-    text-decoration: none;
-    position: absolute;
-    top: 2px;
-    right: 8px;
-}
-  .ol-popup-closer:after {
-    content: "✖";
-}
-
-.ol-scale-line{
-    background-color: transparent;
-    width: 113px;
-    height: 30px;
-    border-left: 1px solid #000;
-    border-right: 1px solid #000;
-    border-bottom: 1px solid #000;
-    position: absolute !important;
-    bottom: 20px !important;
-    right: 20px !important;
-    text-align: center;
-}
-
-// 左上
-.ol-scale-line-tl{
-    position: absolute;
-    top: 20px;
-    left: 20px;
-    background-color: transparent;
-    width: 113px;
-    height: 30px;
-    border-left: 1px solid #000;
-    border-right: 1px solid #000;
-    border-bottom: 1px solid #000;
-    text-align: center;
-}
-// 左下
-.ol-scale-line-bl{
-    position: absolute;
-    bottom: 20px;
-    left: 20px;
-    background-color: transparent;
-    width: 113px;
-    height: 30px;
-    border-left: 1px solid #000;
-    border-right: 1px solid #000;
-    border-bottom: 1px solid #000;
-    text-align: center;
-}
-// 右上
-.ol-scale-line-tr{
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    background-color: transparent;
-    width: 113px;
-    height: 30px;
-    border-left: 1px solid #000;
-    border-right: 1px solid #000;
-    border-bottom: 1px solid #000;
-    text-align: center;
-}
-// 右下
-.ol-scale-line-bl{
-    position: absolute;
-    bottom: 20px;
-    right: 20px;
-    background-color: transparent;
-    width: 113px;
-    height: 30px;
-    border-left: 1px solid #000;
-    border-right: 1px solid #000;
-    border-bottom: 1px solid #000;
-    text-align: center;
+.map{
+    width: 100%;
+    height: 100%;
+    background-color: #f1f1f1;
+}
+.vtx_gmap_html_points,.vtx_gmap_html_pointCollection{
+    position: absolute;
+    top: 0px;
+    left: 0px;
+}
+.esriSimpleSlider{
+    z-index: 10000000 !important;
+}
+.label-content{
+    /*margin-left: 0;
+    width: 100px;
+    line-height: 25px;
+    text-align: center;
+    position: relative;
+    left: -43px;
+    background-color: #fff;
+    opacity: 1;
+    border-radius: 5px;
+    color: #5DD0EE;
+    word-break: break-all;
+    white-space: normal;
+    padding: 2px 8px;*/
+    display: inline-block;
+    padding: 5px;
+    line-height: 22px;
+    text-align: center;
+    border-radius: 5px;
+    background-color: #fff;
+    opacity: 1;
+    color: #5DD0EE;
+}
+.vtx-g-rangingPoint{
+    width: 7px;
+    height: 7px;
+    background-color: #fff;
+    border: 2px solid #ff0000;
+    display: inline-block;
+    border-radius: 7px;
+}
+.vtx-g-rangingDistance{
+    position: relative;
+    top: -36px;
+    left: 15px;
+    height: 30px;
+    line-height: 28px;
+    background-color: #fff;
+    border: 1px solid #ff0000;
+    font-size: 12px;
+    word-break: keep-all;
+    padding: 0px 3px;
+}
+.vtx-g-rang-exit{
+    width: 9px;
+    height: 9px;
+    background-color: #fff;
+    border: 2px solid #ff0000;
+    color: #ff0000;
+    line-height: 7px;
+    text-align: center;
+    font-size: 12px;
+    cursor: pointer;
+}
+.vtx-g-rang-showRangTool{
+    line-height: 18px;
+    font-size: 12px;
+    border: 1px solid #ff0000;
+    word-break: keep-all;
+    background-color: #fff;
+    padding: 0px 5px;
+}
+.zoom_slider_show_scale{
+    padding: 1px 8px;
+    font-size: 12px;
+    text-align: center;
+}
+.zoom_slider_show_bottom{
+    width: 100%;
+    height: 3px;
+    border: 1px solid #000;
+    border-bottom: 3px solid #000;
+    border-top: 0px;
+}
+.ol-tooltip {
+    position: relative;
+    background: rgba(0, 0, 0, 0.5);
+    border-radius: 4px;
+    color: white;
+    padding: 4px 8px;
+    opacity: 0.7;
+    white-space: nowrap;
+    font-size: 12px;
+    cursor: default;
+    user-select: none;
+}
+.ol-tooltip-measure {
+    opacity: 1;
+    font-weight: bold;
+}
+.ol-tooltip-static {
+    background-color: #ffcc33;
+    color: black;
+    border: 1px solid white;
+}
+.ol-tooltip-measure:before,
+.ol-tooltip-static:before {
+    border-top: 6px solid rgba(0, 0, 0, 0.5);
+    border-right: 6px solid transparent;
+    border-left: 6px solid transparent;
+    content: "";
+    position: absolute;
+    bottom: -6px;
+    margin-left: -7px;
+    left: 50%;
+}
+.ol-tooltip-static:before {
+    border-top-color: #ffcc33;
+}
+
+// 核心就是绝对定位
+.ol-popup {
+    position: absolute;
+    background-color: white;
+    box-shadow: 0 1px 4px rgba(0,0,0,0.2);
+    padding: 15px;
+    border-radius: 10px;
+    border: 1px solid #cccccc;
+    bottom: 12px;
+    left: -50px;
+    min-width: 280px;
+}
+  .ol-popup:after, .ol-popup:before {
+    top: 100%;
+    border: solid transparent;
+    content: " ";
+    height: 0;
+    width: 0;
+    position: absolute;
+    pointer-events: none;
+}
+  .ol-popup:after {
+    border-top-color: white;
+    border-width: 10px;
+    left: 48px;
+    margin-left: -10px;
+}
+  .ol-popup:before {
+    border-top-color: #cccccc;
+    border-width: 11px;
+    left: 48px;
+    margin-left: -11px;
+}
+  .ol-popup-closer {
+    text-decoration: none;
+    position: absolute;
+    top: 2px;
+    right: 8px;
+}
+  .ol-popup-closer:after {
+    content: "✖";
+}
+
+.ol-scale-line{
+    background-color: transparent;
+    width: 113px;
+    height: 30px;
+    border-left: 1px solid #000;
+    border-right: 1px solid #000;
+    border-bottom: 1px solid #000;
+    position: absolute !important;
+    bottom: 20px !important;
+    right: 20px !important;
+    text-align: center;
+}
+
+// 左上
+.ol-scale-line-tl{
+    position: absolute;
+    top: 20px;
+    left: 20px;
+    background-color: transparent;
+    width: 113px;
+    height: 30px;
+    border-left: 1px solid #000;
+    border-right: 1px solid #000;
+    border-bottom: 1px solid #000;
+    text-align: center;
+}
+// 左下
+.ol-scale-line-bl{
+    position: absolute;
+    bottom: 20px;
+    left: 20px;
+    background-color: transparent;
+    width: 113px;
+    height: 30px;
+    border-left: 1px solid #000;
+    border-right: 1px solid #000;
+    border-bottom: 1px solid #000;
+    text-align: center;
+}
+// 右上
+.ol-scale-line-tr{
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    background-color: transparent;
+    width: 113px;
+    height: 30px;
+    border-left: 1px solid #000;
+    border-right: 1px solid #000;
+    border-bottom: 1px solid #000;
+    text-align: center;
+}
+// 右下
+.ol-scale-line-bl{
+    position: absolute;
+    bottom: 20px;
+    right: 20px;
+    background-color: transparent;
+    width: 113px;
+    height: 30px;
+    border-left: 1px solid #000;
+    border-right: 1px solid #000;
+    border-bottom: 1px solid #000;
+    text-align: center;
 }

package/lib/VtxMap/TMap/TMap.js

@@ -108,52 +108,54 @@ var TMap = /*#__PURE__*/function (_React$Component) {
     value: function loadMapJs() {
       var t = this;
       this.loadMapComplete = new Promise(function (resolve, reject) {
-        if (window.T) {
-          resolve(window.T);
-        } else {
-          $.getScript("".concat(_default2["default"].mapServerURL, "/T_content.js"), function () {
-            $.getScript(_default2["default"].tmapScriptUrl, function () {
-              var Heatmap = new Promise(function (resolve, reject) {
-                //对象问题  和arcgis使用不同的热力图
-                $.getScript("".concat(_default2["default"].mapServerURL, "/Theatmap.js"), function () {
-                  resolve();
+        (0, _default2.ensurejQuery)().then(function () {
+          if (window.T) {
+            resolve(window.T);
+          } else {
+            $.getScript("".concat(_default2["default"].mapServerURL, "/T_content.js"), function () {
+              $.getScript(_default2["default"].tmapScriptUrl, function () {
+                var Heatmap = new Promise(function (resolve, reject) {
+                  //对象问题  和arcgis使用不同的热力图
+                  $.getScript("".concat(_default2["default"].mapServerURL, "/Theatmap.js"), function () {
+                    resolve();
+                  });
                 });
-              });
-              var HeatmapNew = new Promise(function (resolve, reject) {
-                //新版的热力图--老的暂不废弃，但是有问题
-                $.getScript("".concat(_default2["default"].mapServerURL, "/HeatmapOverlay.js"), function () {
-                  resolve();
+                var HeatmapNew = new Promise(function (resolve, reject) {
+                  //新版的热力图--老的暂不废弃，但是有问题
+                  $.getScript("".concat(_default2["default"].mapServerURL, "/HeatmapOverlay.js"), function () {
+                    resolve();
+                  });
                 });
-              });
-              var PointCollection = new Promise(function (resolve, reject) {
-                $.getScript("".concat(_default2["default"].mapServerURL, "/GPointCollection.js"), function () {
-                  resolve();
+                var PointCollection = new Promise(function (resolve, reject) {
+                  $.getScript("".concat(_default2["default"].mapServerURL, "/GPointCollection.js"), function () {
+                    resolve();
+                  });
                 });
-              });
-              var ImageOverlays = new Promise(function (resolve, reject) {
-                $.getScript("".concat(_default2["default"].mapServerURL, "/TImageOverlay.js"), function () {
-                  resolve();
+                var ImageOverlays = new Promise(function (resolve, reject) {
+                  $.getScript("".concat(_default2["default"].mapServerURL, "/TImageOverlay.js"), function () {
+                    resolve();
+                  });
                 });
-              });
-              // let components = new Promise((resolve,reject)=>{
-              //     $.getScript(`${configUrl.mapServerURL}/T_toolComponents.js`,()=>{
-              //         resolve();
-              //     })
-              // });
-              Promise.all([Heatmap, PointCollection, ImageOverlays, HeatmapNew /*,components*/]).then(function () {
-                if (t.waitInit) {
-                  clearInterval(t.waitInit);
-                }
-                t.waitInit = setInterval(function () {
-                  if (T.Tool) {
+                // let components = new Promise((resolve,reject)=>{
+                //     $.getScript(`${configUrl.mapServerURL}/T_toolComponents.js`,()=>{
+                //         resolve();
+                //     })
+                // });
+                Promise.all([Heatmap, PointCollection, ImageOverlays, HeatmapNew /*,components*/]).then(function () {
+                  if (t.waitInit) {
                     clearInterval(t.waitInit);
-                    resolve(window.T);
                   }
-                }, 50);
+                  t.waitInit = setInterval(function () {
+                    if (T.Tool) {
+                      clearInterval(t.waitInit);
+                      resolve(window.T);
+                    }
+                  }, 50);
+                });
               });
             });
-          });
-        }
+          }
+        });
       });
     }
   }, {
@@ -1770,11 +1772,11 @@ var TMap = /*#__PURE__*/function (_React$Component) {
       }
       t.popupWindow = null;
     }
-    /*
-        参数
-        geometryType:point/polyline/polygon/circle/rectangle  默认point
-        parameter 样式 默认null 对象{}写入方式跟add方法一样(对应点线圆面)
-        data //初始化数据   默认{id:'add'}
+    /*
+        参数
+        geometryType:point/polyline/polygon/circle/rectangle  默认point
+        parameter 样式 默认null 对象{}写入方式跟add方法一样(对应点线圆面)
+        data //初始化数据   默认{id:'add'}
     */
   }, {
     key: "draw",
@@ -3032,10 +3034,10 @@ var TMap = /*#__PURE__*/function (_React$Component) {
           t.clearAllPointCollection();
         }
 
-        /*点数据处理
-            pointData[2]相同的点,执行刷新
-            pointData[1]的数据在idsForGraphicId中不存在的,执行新增
-            pointData[0]数据中多余的id,执行删除
+        /*点数据处理
+            pointData[2]相同的点,执行刷新
+            pointData[1]的数据在idsForGraphicId中不存在的,执行新增
+            pointData[0]数据中多余的id,执行删除
         */
         if (mapPoints instanceof Array && t.props.mapPoints instanceof Array && !t.deepEqual(mapPoints, t.props.mapPoints)) {
           var oldMapPoints = t.props.mapPoints;
@@ -3077,9 +3079,9 @@ var TMap = /*#__PURE__*/function (_React$Component) {
           //更新
           t.updatePoint([].concat(_toConsumableArray(upds), _toConsumableArray(otherupds)));
         }
-        /*
-            面数据处理
-            先全删除,再新增
+        /*
+            面数据处理
+            先全删除,再新增
         */
         if (mapPolygons instanceof Array && t.props.mapPolygons instanceof Array && !t.deepEqual(mapPolygons, t.props.mapPolygons)) {
           var oldMapPolygons = t.props.mapPolygons;
@@ -3120,9 +3122,9 @@ var TMap = /*#__PURE__*/function (_React$Component) {
           //更新
           t.updatePolygon([].concat(_toConsumableArray(_upds), _toConsumableArray(_otherupds)));
         }
-        /*
-            圆数据处理
-            先全删除,再新增
+        /*
+            圆数据处理
+            先全删除,再新增
         */
         if (mapCircles instanceof Array && t.props.mapCircles instanceof Array && !t.deepEqual(mapCircles, t.props.mapCircles)) {
           var oldMapCircles = t.props.mapCircles;
@@ -3163,9 +3165,9 @@ var TMap = /*#__PURE__*/function (_React$Component) {
           //更新
           t.updateCircle([].concat(_toConsumableArray(_upds2), _toConsumableArray(_otherupds2)));
         }
-        /*
-            线数据处理
-            先全删除,再新增
+        /*
+            线数据处理
+            先全删除,再新增
         */
         if (mapLines instanceof Array && t.props.mapLines instanceof Array && !t.deepEqual(mapLines, t.props.mapLines)) {
           var oldMapLines = t.props.mapLines;