gis-map-universal 0.3.0 → 0.3.1

package/gismap.umd.js

@@ -457236,7 +457236,7 @@ var LatlonPick_component = normalizeComponent(
         zIndex: 1,
         projection: "EPSG:3857",
       });
-      // this.map.addLayer(baselayer);
+      this.map.addLayer(baselayer);
       // 加载4市区划高亮WMS服务
       let wmslayer = new Tile["default"]({
         layerName: "wmslayer",
@@ -457249,9 +457249,9 @@ var LatlonPick_component = normalizeComponent(
         }),
         zIndex: 2,
         projection: "EPSG:3857",
-        opacity: 0.2,
+        opacity: 0.7,
       });
-      // this.map.addLayer(wmslayer);
+      this.map.addLayer(wmslayer);
       // 加载全省道路线
       let baseRoadlayer = new Tile["default"]({
         layerName: "baseRoadlayer",
@@ -457265,7 +457265,7 @@ var LatlonPick_component = normalizeComponent(
         zIndex: 4,
         projection: "EPSG:3857",
       });
-      // this.map.addLayer(baseRoadlayer);
+      this.map.addLayer(baseRoadlayer);
       // 加载G35高亮线
       let G35layer = new Tile["default"]({
         layerName: "G35layer",
@@ -457327,20 +457327,10 @@ var LatlonPick_component = normalizeComponent(
         element: elPopup,
         positioning: "bottom-center",
         stopEvent: true,
-        autoPan: false,
-        // autoPanAnimation: {
-        //   duration: 250,
-        // },
+        autoPan: false
       });
       this.map.addOverlay(this.overlayPopup);
       this.map.on("click", (e) => {
-        // e.preventDefault();
-        // this.map.getView().animate({
-        //   center: this.mapCenter,
-        //   zoom: this.map.getView().getZoom(),
-        //   duration: 10
-        // });
-        console.log('点击事件',this.map.getView().getCenter(),this.map.getView().getZoom());
         if (
           !this.map.getInteractions().getArray().includes(this.measuredraw) &&
           // !this.$refs.measureTool.measuredraw.getActive() &&
@@ -457375,6 +457365,7 @@ var LatlonPick_component = normalizeComponent(
                     -this.popupWidth / 2,
                     -this.popupHeight,
                   ]);
+                  this.overlayPopup.set('popupBS','clusterList')
                 } else {
                   this.map.getView().animate({
                     center: feature.getGeometry().getCoordinates(),
@@ -457503,6 +457494,25 @@ var LatlonPick_component = normalizeComponent(
           }
         }
       });
+      this.map.getView().on('change', (event) => {
+        if (this.map.getView().getZoom() < 18) {
+          let popupBS = this.overlayPopup.get('popupBS')
+          if (popupBS === 'clusterList') {
+            this.closePopup()
+          }
+          this.gongganTextLayerList.forEach(e => {
+            e.setVisible(false)
+          });
+        }else{
+          if(this.gongganTextLayerShow){
+            this.gongganTextLayerList.forEach(e => {
+              if(e.get("isvis")){
+                e.setVisible(true)
+              }
+            });
+          }
+        }
+      });
     },
     initRadarLayers(url) {
       let radarLayer = new layer_Image["default"]({
@@ -457871,7 +457881,12 @@ var Cluster_Cluster = /** @class */ (function (_super) {
 
 /* harmony default export */ var utills = ({
   data() {
-    return {};
+    return {
+      gongganTextLayerShow: false,
+      gongganTextLayerList: [],
+      sourceWithoutTextList: [],
+      sourceWithTextList: [],
+    };
   },
   methods: {
     openPopupByattr(LayerType, attr) {
@@ -457928,6 +457943,7 @@ var Cluster_Cluster = /** @class */ (function (_super) {
       });
     },
     addPointByArr(pointsObj, id, isCluster) {
+      let that = this;
       this.isCluster = isCluster;
       let arry = this.map.getLayers().getArray();
       let foundLayer = null;
@@ -457938,8 +457954,17 @@ var Cluster_Cluster = /** @class */ (function (_super) {
           break;
         }
       }
-      this.sourceWithoutText = new source_Vector["default"]();
-      this.sourceWithText = new source_Vector["default"]();
+      let sourceWithoutText = new source_Vector["default"]();
+      let sourceWithText = new source_Vector["default"]();
+      let gongganTextLayer = new layer_Vector["default"]({
+        layerName: id + "_Text",
+        zIndex: 999,
+        visible: false,
+      });
+      gongganTextLayer.set("isvis", false)
+      let gongganTextSource = new source_Vector["default"]();
+      this.gongganTextLayerList.push(gongganTextLayer);
+      this.map.addLayer(gongganTextLayer);
       pointsObj.pointList.forEach((data) => {
         let feature = new ol_Feature["a" /* default */]({
           title: "要素点",
@@ -457952,14 +457977,19 @@ var Cluster_Cluster = /** @class */ (function (_super) {
         feature.set("longitude", data.longitude);
         feature.set("latitude", data.latitude);
         feature.set("isVisible", false);
+        feature.set("layerId", id);
         let styleWithoutText = new Style["default"]({
           image: new Icon["default"]({
             src: data.iconUrl,
             scale: data.scale,
+            offset: data.offset,
+            offsetOrigin: "bottom-right",
+            size: data.size,
           }),
         });
         feature.setStyle(styleWithoutText);
-        this.sourceWithoutText.addFeature(feature);
+        sourceWithoutText.addFeature(feature);
+        this.sourceWithoutTextList.push(sourceWithoutText);
       });
       pointsObj.pointList.forEach((data) => {
         let feature = new ol_Feature["a" /* default */]({
@@ -457973,10 +458003,14 @@ var Cluster_Cluster = /** @class */ (function (_super) {
         feature.set("longitude", data.longitude);
         feature.set("latitude", data.latitude);
         feature.set("isVisible", false);
+        feature.set("layerId", id);
         let styleWithText = new Style["default"]({
           image: new Icon["default"]({
             src: data.iconUrl,
             scale: data.scale,
+            offset: data.offset,
+            offsetOrigin: "bottom-right",
+            size: data.size,
           }),
           text: new style_Text["default"]({
             text: data.otherInfo.stake,
@@ -457995,7 +458029,8 @@ var Cluster_Cluster = /** @class */ (function (_super) {
           }),
         });
         feature.setStyle(styleWithText);
-        this.sourceWithText.addFeature(feature);
+        sourceWithText.addFeature(feature);
+        this.sourceWithTextList.push(sourceWithText);
       });
       if (isCluster) {
         this.customLayer = new layer_Vector["default"]({
@@ -458005,12 +458040,15 @@ var Cluster_Cluster = /** @class */ (function (_super) {
             const size = feature.get("features").length;
             let style;
             if (size > 1) {
-              style = new Style["default"]({
+              let circleStyle = new Style["default"]({
                 image: new style_Circle["default"]({
-                  // 圆形
-                  radius: 18,
+                  radius: 20,
                   fill: new Fill["default"]({
-                    color: [255, 160, 0, 0.7],
+                    color: [255, 255, 255, 0.4],
+                  }),
+                  stroke: new Stroke["default"]({
+                    color: [255, 255, 255, 0.7],
+                    width: 1,
                   }),
                 }),
                 text: new style_Text["default"]({
@@ -458018,14 +458056,81 @@ var Cluster_Cluster = /** @class */ (function (_super) {
                     color: "#ffffff",
                   }),
                   offsetY: 2,
-                  font: "bold 14px sans-serif",
-                  text:
-                    size > 1
-                      ? size.toString()
-                      : feature.get("features")[0].values_.name,
+                  font: "14px sans-serif",
+                  text: size.toString(),
                 }),
               });
-              return style;
+              let imageStyle1 = new Style["default"]({
+                image: new Icon["default"]({
+                  src: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzQiIGhlaWdodD0iNDIiIHZpZXdCb3g9IjAgMCAzNCA0MiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPGcgaWQ9IiYjMjMwOyYjMTUwOyYjMTg5OyYjMjI5OyYjMTgzOyYjMTY1OyIgY2xpcC1wYXRoPSJ1cmwoI2NsaXAwXzQ0M18zNDkpIj4KPGcgaWQ9IiYjMjMzOyYjMTYxOyYjMTgxOyYjMjMzOyYjMTU3OyYjMTYyOy0xIj4KPGcgaWQ9IiYjMjMzOyYjMTY2OyYjMTUwOyYjMjMzOyYjMTYxOyYjMTgxOy0mIzIzMTsmIzE1MzsmIzE4OTsmIzIzMjsmIzEzNzsmIzE3ODsmIzIyOTsmIzE4NTsmIzE3OTsmIzIzMzsmIzE1NzsmIzE2MjsxIj4KPGcgaWQ9IiYjMjI5OyYjMTU1OyYjMTkwOyYjMjMwOyYjMTYwOyYjMTM1OyI+CjxnIGlkPSImIzIzMDsmIzE1MDsmIzE4OTsmIzIyOTsmIzE4MzsmIzE2NTtfMiI+CjxnIGlkPSImIzIzMDsmIzE2NDsmIzE3MzsmIzIyOTsmIzE1NjsmIzEzNDsmIzIyOTsmIzE4OTsmIzE2MjsiPgo8cGF0aCBpZD0iVmVjdG9yIiBkPSJNMTcgMzNDMjUuODM2NiAzMyAzMyAyNS44MzY2IDMzIDE3QzMzIDguMTYzNDQgMjUuODM2NiAxIDE3IDFDOC4xNjM0NCAxIDEgOC4xNjM0NCAxIDE3QzEgMjUuODM2NiA4LjE2MzQ0IDMzIDE3IDMzWiIgZmlsbD0id2hpdGUiLz4KPGcgaWQ9IlZlY3Rvcl8yIiBmaWx0ZXI9InVybCgjZmlsdGVyMF9pXzQ0M18zNDkpIj4KPHBhdGggZD0iTTE3IDMzQzI1LjgzNjYgMzMgMzMgMjUuODM2NiAzMyAxN0MzMyA4LjE2MzQ0IDI1LjgzNjYgMSAxNyAxQzguMTYzNDQgMSAxIDguMTYzNDQgMSAxN0MxIDI1LjgzNjYgOC4xNjM0NCAzMyAxNyAzM1oiIGZpbGw9ImJsYWNrIi8+CjwvZz4KPHBhdGggaWQ9IlZlY3Rvcl8zIiBkPSJNMTcgMzNDMjUuODM2NiAzMyAzMyAyNS44MzY2IDMzIDE3QzMzIDguMTYzNDQgMjUuODM2NiAxIDE3IDFDOC4xNjM0NCAxIDEgOC4xNjM0NCAxIDE3QzEgMjUuODM2NiA4LjE2MzQ0IDMzIDE3IDMzWiIgc3Ryb2tlPSIjQkVBMDE5IiBzdHJva2Utd2lkdGg9IjAuNSIvPgo8L2c+CjxnIGlkPSImIzIyODsmIzE4NDsmIzEzNzsmIzIzMjsmIzE2NzsmIzE0NjsmIzIyOTsmIzE4OTsmIzE2MjsiPgo8cGF0aCBpZD0iVmVjdG9yXzQiIGQ9Ik0xNyA0MUwyMSAzNUgxM0wxNyA0MVoiIGZpbGw9IndoaXRlIi8+CjxnIGlkPSJWZWN0b3JfNSIgZmlsdGVyPSJ1cmwoI2ZpbHRlcjFfaV80NDNfMzQ5KSI+CjxwYXRoIGQ9Ik0xNyA0MUwyMSAzNUgxM0wxNyA0MVoiIGZpbGw9ImJsYWNrIi8+CjwvZz4KPHBhdGggaWQ9IlZlY3Rvcl82IiBkPSJNMTcgNDFMMjEgMzVIMTNMMTcgNDFaIiBzdHJva2U9IiNCRUEwMTkiIHN0cm9rZS13aWR0aD0iMC41Ii8+CjwvZz4KPGcgaWQ9IiYjMjMwOyYjMTY0OyYjMTczOyYjMjI5OyYjMTU2OyYjMTM0OyYjMjI5OyYjMTg5OyYjMTYyO18yIj4KPHBhdGggaWQ9IlZlY3Rvcl83IiBkPSJNMTcgMzBDMjQuMTc5NyAzMCAzMCAyNC4xNzk3IDMwIDE3QzMwIDkuODIwMyAyNC4xNzk3IDQgMTcgNEM5LjgyMDMgNCA0IDkuODIwMyA0IDE3QzQgMjQuMTc5NyA5LjgyMDMgMzAgMTcgMzBaIiBmaWxsPSIjQkVBMDE5Ii8+CjxnIGlkPSJWZWN0b3JfOCIgZmlsdGVyPSJ1cmwoI2ZpbHRlcjJfaV80NDNfMzQ5KSI+CjxwYXRoIGQ9Ik0xNyAzMEMyNC4xNzk3IDMwIDMwIDI0LjE3OTcgMzAgMTdDMzAgOS44MjAzIDI0LjE3OTcgNCAxNyA0QzkuODIwMyA0IDQgOS44MjAzIDQgMTdDNCAyNC4xNzk3IDkuODIwMyAzMCAxNyAzMFoiIGZpbGw9ImJsYWNrIi8+CjwvZz4KPHBhdGggaWQ9IlZlY3Rvcl85IiBkPSJNMTcgMzBDMjQuMTc5NyAzMCAzMCAyNC4xNzk3IDMwIDE3QzMwIDkuODIwMyAyNC4xNzk3IDQgMTcgNEM5LjgyMDMgNCA0IDkuODIwMyA0IDE3QzQgMjQuMTc5NyA5LjgyMDMgMzAgMTcgMzBaIiBzdHJva2U9IiNENEM0N0YiLz4KPC9nPgo8L2c+CjwvZz4KPC9nPgo8L2c+CjwvZz4KPGRlZnM+CjxmaWx0ZXIgaWQ9ImZpbHRlcjBfaV80NDNfMzQ5IiB4PSIxIiB5PSIxIiB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY29sb3ItaW50ZXJwb2xhdGlvbi1maWx0ZXJzPSJzUkdCIj4KPGZlRmxvb2QgZmxvb2Qtb3BhY2l0eT0iMCIgcmVzdWx0PSJCYWNrZ3JvdW5kSW1hZ2VGaXgiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbj0iU291cmNlR3JhcGhpYyIgaW4yPSJCYWNrZ3JvdW5kSW1hZ2VGaXgiIHJlc3VsdD0ic2hhcGUiLz4KPGZlQ29sb3JNYXRyaXggaW49IlNvdXJjZUFscGhhIiB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMTI3IDAiIHJlc3VsdD0iaGFyZEFscGhhIi8+CjxmZU9mZnNldC8+CjxmZUdhdXNzaWFuQmx1ciBzdGREZXZpYXRpb249IjIiLz4KPGZlQ29tcG9zaXRlIGluMj0iaGFyZEFscGhhIiBvcGVyYXRvcj0iYXJpdGhtZXRpYyIgazI9Ii0xIiBrMz0iMSIvPgo8ZmVDb2xvck1hdHJpeCB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAwLjc0NTA5OCAwIDAgMCAwIDAuNjI3NDUxIDAgMCAwIDAgMC4wOTgwMzkyIDAgMCAwIDEgMCIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluMj0ic2hhcGUiIHJlc3VsdD0iZWZmZWN0MV9pbm5lclNoYWRvd180NDNfMzQ5Ii8+CjwvZmlsdGVyPgo8ZmlsdGVyIGlkPSJmaWx0ZXIxX2lfNDQzXzM0OSIgeD0iMTMiIHk9IjM1IiB3aWR0aD0iOCIgaGVpZ2h0PSI2IiBmaWx0ZXJVbml0cz0idXNlclNwYWNlT25Vc2UiIGNvbG9yLWludGVycG9sYXRpb24tZmlsdGVycz0ic1JHQiI+CjxmZUZsb29kIGZsb29kLW9wYWNpdHk9IjAiIHJlc3VsdD0iQmFja2dyb3VuZEltYWdlRml4Ii8+CjxmZUJsZW5kIG1vZGU9Im5vcm1hbCIgaW49IlNvdXJjZUdyYXBoaWMiIGluMj0iQmFja2dyb3VuZEltYWdlRml4IiByZXN1bHQ9InNoYXBlIi8+CjxmZUNvbG9yTWF0cml4IGluPSJTb3VyY2VBbHBoYSIgdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDEyNyAwIiByZXN1bHQ9ImhhcmRBbHBoYSIvPgo8ZmVPZmZzZXQvPgo8ZmVHYXVzc2lhbkJsdXIgc3RkRGV2aWF0aW9uPSIyIi8+CjxmZUNvbXBvc2l0ZSBpbjI9ImhhcmRBbHBoYSIgb3BlcmF0b3I9ImFyaXRobWV0aWMiIGsyPSItMSIgazM9IjEiLz4KPGZlQ29sb3JNYXRyaXggdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMC43NDUwOTggMCAwIDAgMCAwLjYyNzQ1MSAwIDAgMCAwIDAuMDk4MDM5MiAwIDAgMCAxIDAiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbjI9InNoYXBlIiByZXN1bHQ9ImVmZmVjdDFfaW5uZXJTaGFkb3dfNDQzXzM0OSIvPgo8L2ZpbHRlcj4KPGZpbHRlciBpZD0iZmlsdGVyMl9pXzQ0M18zNDkiIHg9IjQiIHk9IjQiIHdpZHRoPSIyNiIgaGVpZ2h0PSIyNiIgZmlsdGVyVW5pdHM9InVzZXJTcGFjZU9uVXNlIiBjb2xvci1pbnRlcnBvbGF0aW9uLWZpbHRlcnM9InNSR0IiPgo8ZmVGbG9vZCBmbG9vZC1vcGFjaXR5PSIwIiByZXN1bHQ9IkJhY2tncm91bmRJbWFnZUZpeCIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluPSJTb3VyY2VHcmFwaGljIiBpbjI9IkJhY2tncm91bmRJbWFnZUZpeCIgcmVzdWx0PSJzaGFwZSIvPgo8ZmVDb2xvck1hdHJpeCBpbj0iU291cmNlQWxwaGEiIHR5cGU9Im1hdHJpeCIgdmFsdWVzPSIwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAxMjcgMCIgcmVzdWx0PSJoYXJkQWxwaGEiLz4KPGZlT2Zmc2V0Lz4KPGZlR2F1c3NpYW5CbHVyIHN0ZERldmlhdGlvbj0iNC41Ii8+CjxmZUNvbXBvc2l0ZSBpbjI9ImhhcmRBbHBoYSIgb3BlcmF0b3I9ImFyaXRobWV0aWMiIGsyPSItMSIgazM9IjEiLz4KPGZlQ29sb3JNYXRyaXggdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMC44MzEzNzMgMCAwIDAgMCAwLjc2ODYyNyAwIDAgMCAwIDAuNDk4MDM5IDAgMCAwIDEgMCIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluMj0ic2hhcGUiIHJlc3VsdD0iZWZmZWN0MV9pbm5lclNoYWRvd180NDNfMzQ5Ii8+CjwvZmlsdGVyPgo8Y2xpcFBhdGggaWQ9ImNsaXAwXzQ0M18zNDkiPgo8cmVjdCB3aWR0aD0iMzQiIGhlaWdodD0iNDIiIGZpbGw9IndoaXRlIi8+CjwvY2xpcFBhdGg+CjwvZGVmcz4KPC9zdmc+Cg==",
+                }),
+                text: new style_Text["default"]({
+                  fill: new Fill["default"]({
+                    color: "#ffffff",
+                  }),
+                  offsetY: -2,
+                  font: "14px sans-serif",
+                  text: size.toString(),
+                }),
+              });
+              let imageStyle2 = new Style["default"]({
+                image: new Icon["default"]({
+                  src: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzQiIGhlaWdodD0iNDIiIHZpZXdCb3g9IjAgMCAzNCA0MiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPGcgaWQ9IiYjMjMwOyYjMTQ5OyYjMTMzOyYjMjMzOyYjMTU0OyYjMTU2OyIgY2xpcC1wYXRoPSJ1cmwoI2NsaXAwXzQ0M18zMTApIj4KPGcgaWQ9IiYjMjMzOyYjMTYxOyYjMTgxOyYjMjMzOyYjMTU3OyYjMTYyOy0xIj4KPGcgaWQ9IiYjMjMzOyYjMTY2OyYjMTUwOyYjMjMzOyYjMTYxOyYjMTgxOy0mIzIzMTsmIzE1MzsmIzE4OTsmIzIzMjsmIzEzNzsmIzE3ODsmIzIyOTsmIzE4NTsmIzE3OTsmIzIzMzsmIzE1NzsmIzE2MjsxIj4KPGcgaWQ9IiYjMjI5OyYjMTU1OyYjMTkwOyYjMjMwOyYjMTYwOyYjMTM1OyI+CjxnIGlkPSImIzIzMDsmIzE0OTsmIzEzMzsmIzIzMzsmIzE1NDsmIzE1NjtfMiI+CjxnIGlkPSImIzIzMDsmIzE2NDsmIzE3MzsmIzIyOTsmIzE1NjsmIzEzNDsmIzIyOTsmIzE4OTsmIzE2MjsiPgo8cGF0aCBpZD0iVmVjdG9yIiBkPSJNMTcgMzNDMjUuODM2NiAzMyAzMyAyNS44MzY2IDMzIDE3QzMzIDguMTYzNDQgMjUuODM2NiAxIDE3IDFDOC4xNjM0NCAxIDEgOC4xNjM0NCAxIDE3QzEgMjUuODM2NiA4LjE2MzQ0IDMzIDE3IDMzWiIgZmlsbD0id2hpdGUiLz4KPGcgaWQ9IlZlY3Rvcl8yIiBmaWx0ZXI9InVybCgjZmlsdGVyMF9pXzQ0M18zMTApIj4KPHBhdGggZD0iTTE3IDMzQzI1LjgzNjYgMzMgMzMgMjUuODM2NiAzMyAxN0MzMyA4LjE2MzQ0IDI1LjgzNjYgMSAxNyAxQzguMTYzNDQgMSAxIDguMTYzNDQgMSAxN0MxIDI1LjgzNjYgOC4xNjM0NCAzMyAxNyAzM1oiIGZpbGw9ImJsYWNrIi8+CjwvZz4KPHBhdGggaWQ9IlZlY3Rvcl8zIiBkPSJNMTcgMzNDMjUuODM2NiAzMyAzMyAyNS44MzY2IDMzIDE3QzMzIDguMTYzNDQgMjUuODM2NiAxIDE3IDFDOC4xNjM0NCAxIDEgOC4xNjM0NCAxIDE3QzEgMjUuODM2NiA4LjE2MzQ0IDMzIDE3IDMzWiIgc3Ryb2tlPSIjRTQ0QjAwIiBzdHJva2Utd2lkdGg9IjAuNSIvPgo8L2c+CjxnIGlkPSImIzIyODsmIzE4NDsmIzEzNzsmIzIzMjsmIzE2NzsmIzE0NjsmIzIyOTsmIzE4OTsmIzE2MjsiPgo8cGF0aCBpZD0iVmVjdG9yXzQiIGQ9Ik0xNyA0MUwyMSAzNUgxM0wxNyA0MVoiIGZpbGw9IndoaXRlIi8+CjxnIGlkPSJWZWN0b3JfNSIgZmlsdGVyPSJ1cmwoI2ZpbHRlcjFfaV80NDNfMzEwKSI+CjxwYXRoIGQ9Ik0xNyA0MUwyMSAzNUgxM0wxNyA0MVoiIGZpbGw9ImJsYWNrIi8+CjwvZz4KPHBhdGggaWQ9IlZlY3Rvcl82IiBkPSJNMTcgNDFMMjEgMzVIMTNMMTcgNDFaIiBzdHJva2U9IiNFNDRCMDAiIHN0cm9rZS13aWR0aD0iMC41Ii8+CjwvZz4KPGcgaWQ9IiYjMjMwOyYjMTY0OyYjMTczOyYjMjI5OyYjMTU2OyYjMTM0OyYjMjI5OyYjMTg5OyYjMTYyO18yIj4KPHBhdGggaWQ9IlZlY3Rvcl83IiBkPSJNMTcgMzBDMjQuMTc5NyAzMCAzMCAyNC4xNzk3IDMwIDE3QzMwIDkuODIwMyAyNC4xNzk3IDQgMTcgNEM5LjgyMDMgNCA0IDkuODIwMyA0IDE3QzQgMjQuMTc5NyA5LjgyMDMgMzAgMTcgMzBaIiBmaWxsPSIjRTQ0QjAwIi8+CjxnIGlkPSJWZWN0b3JfOCIgZmlsdGVyPSJ1cmwoI2ZpbHRlcjJfaV80NDNfMzEwKSI+CjxwYXRoIGQ9Ik0xNyAzMEMyNC4xNzk3IDMwIDMwIDI0LjE3OTcgMzAgMTdDMzAgOS44MjAzIDI0LjE3OTcgNCAxNyA0QzkuODIwMyA0IDQgOS44MjAzIDQgMTdDNCAyNC4xNzk3IDkuODIwMyAzMCAxNyAzMFoiIGZpbGw9ImJsYWNrIi8+CjwvZz4KPHBhdGggaWQ9IlZlY3Rvcl85IiBkPSJNMTcgMzBDMjQuMTc5NyAzMCAzMCAyNC4xNzk3IDMwIDE3QzMwIDkuODIwMyAyNC4xNzk3IDQgMTcgNEM5LjgyMDMgNCA0IDkuODIwMyA0IDE3QzQgMjQuMTc5NyA5LjgyMDMgMzAgMTcgMzBaIiBzdHJva2U9IiNGRjY3MDAiLz4KPC9nPgo8L2c+CjwvZz4KPC9nPgo8L2c+CjwvZz4KPGRlZnM+CjxmaWx0ZXIgaWQ9ImZpbHRlcjBfaV80NDNfMzEwIiB4PSIxIiB5PSIxIiB3aWR0aD0iMzIiIGhlaWdodD0iMzIiIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY29sb3ItaW50ZXJwb2xhdGlvbi1maWx0ZXJzPSJzUkdCIj4KPGZlRmxvb2QgZmxvb2Qtb3BhY2l0eT0iMCIgcmVzdWx0PSJCYWNrZ3JvdW5kSW1hZ2VGaXgiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbj0iU291cmNlR3JhcGhpYyIgaW4yPSJCYWNrZ3JvdW5kSW1hZ2VGaXgiIHJlc3VsdD0ic2hhcGUiLz4KPGZlQ29sb3JNYXRyaXggaW49IlNvdXJjZUFscGhhIiB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMTI3IDAiIHJlc3VsdD0iaGFyZEFscGhhIi8+CjxmZU9mZnNldC8+CjxmZUdhdXNzaWFuQmx1ciBzdGREZXZpYXRpb249IjIiLz4KPGZlQ29tcG9zaXRlIGluMj0iaGFyZEFscGhhIiBvcGVyYXRvcj0iYXJpdGhtZXRpYyIgazI9Ii0xIiBrMz0iMSIvPgo8ZmVDb2xvck1hdHJpeCB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAxIDAgMCAwIDAgMC40MDM5MjIgMCAwIDAgMCAwIDAgMCAwIDEgMCIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluMj0ic2hhcGUiIHJlc3VsdD0iZWZmZWN0MV9pbm5lclNoYWRvd180NDNfMzEwIi8+CjwvZmlsdGVyPgo8ZmlsdGVyIGlkPSJmaWx0ZXIxX2lfNDQzXzMxMCIgeD0iMTMiIHk9IjM1IiB3aWR0aD0iOCIgaGVpZ2h0PSI2IiBmaWx0ZXJVbml0cz0idXNlclNwYWNlT25Vc2UiIGNvbG9yLWludGVycG9sYXRpb24tZmlsdGVycz0ic1JHQiI+CjxmZUZsb29kIGZsb29kLW9wYWNpdHk9IjAiIHJlc3VsdD0iQmFja2dyb3VuZEltYWdlRml4Ii8+CjxmZUJsZW5kIG1vZGU9Im5vcm1hbCIgaW49IlNvdXJjZUdyYXBoaWMiIGluMj0iQmFja2dyb3VuZEltYWdlRml4IiByZXN1bHQ9InNoYXBlIi8+CjxmZUNvbG9yTWF0cml4IGluPSJTb3VyY2VBbHBoYSIgdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDEyNyAwIiByZXN1bHQ9ImhhcmRBbHBoYSIvPgo8ZmVPZmZzZXQvPgo8ZmVHYXVzc2lhbkJsdXIgc3RkRGV2aWF0aW9uPSIyIi8+CjxmZUNvbXBvc2l0ZSBpbjI9ImhhcmRBbHBoYSIgb3BlcmF0b3I9ImFyaXRobWV0aWMiIGsyPSItMSIgazM9IjEiLz4KPGZlQ29sb3JNYXRyaXggdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMC44OTQxMTggMCAwIDAgMCAwLjI5NDExOCAwIDAgMCAwIDAgMCAwIDAgMSAwIi8+CjxmZUJsZW5kIG1vZGU9Im5vcm1hbCIgaW4yPSJzaGFwZSIgcmVzdWx0PSJlZmZlY3QxX2lubmVyU2hhZG93XzQ0M18zMTAiLz4KPC9maWx0ZXI+CjxmaWx0ZXIgaWQ9ImZpbHRlcjJfaV80NDNfMzEwIiB4PSI0IiB5PSI0IiB3aWR0aD0iMjYiIGhlaWdodD0iMjYiIGZpbHRlclVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgY29sb3ItaW50ZXJwb2xhdGlvbi1maWx0ZXJzPSJzUkdCIj4KPGZlRmxvb2QgZmxvb2Qtb3BhY2l0eT0iMCIgcmVzdWx0PSJCYWNrZ3JvdW5kSW1hZ2VGaXgiLz4KPGZlQmxlbmQgbW9kZT0ibm9ybWFsIiBpbj0iU291cmNlR3JhcGhpYyIgaW4yPSJCYWNrZ3JvdW5kSW1hZ2VGaXgiIHJlc3VsdD0ic2hhcGUiLz4KPGZlQ29sb3JNYXRyaXggaW49IlNvdXJjZUFscGhhIiB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMTI3IDAiIHJlc3VsdD0iaGFyZEFscGhhIi8+CjxmZU9mZnNldC8+CjxmZUdhdXNzaWFuQmx1ciBzdGREZXZpYXRpb249IjQuNSIvPgo8ZmVDb21wb3NpdGUgaW4yPSJoYXJkQWxwaGEiIG9wZXJhdG9yPSJhcml0aG1ldGljIiBrMj0iLTEiIGszPSIxIi8+CjxmZUNvbG9yTWF0cml4IHR5cGU9Im1hdHJpeCIgdmFsdWVzPSIwIDAgMCAwIDEgMCAwIDAgMCAwLjQwMzkyMiAwIDAgMCAwIDAgMCAwIDAgMSAwIi8+CjxmZUJsZW5kIG1vZGU9Im5vcm1hbCIgaW4yPSJzaGFwZSIgcmVzdWx0PSJlZmZlY3QxX2lubmVyU2hhZG93XzQ0M18zMTAiLz4KPC9maWx0ZXI+CjxjbGlwUGF0aCBpZD0iY2xpcDBfNDQzXzMxMCI+CjxyZWN0IHdpZHRoPSIzNCIgaGVpZ2h0PSI0MiIgZmlsbD0id2hpdGUiLz4KPC9jbGlwUGF0aD4KPC9kZWZzPgo8L3N2Zz4K",
+                }),
+                text: new style_Text["default"]({
+                  fill: new Fill["default"]({
+                    color: "#ffffff",
+                  }),
+                  offsetY: -2,
+                  font: "14px sans-serif",
+                  text: size.toString(),
+                }),
+              });
+              if (that.map.getView().getZoom() < 18) {
+                return circleStyle;
+              } else {
+                let point = feature.get("features")[0].getProperties();
+                let stakeFeature = new ol_Feature["a" /* default */]({
+                  title: "共杆桩号",
+                  geometry: new geom_Point["default"](
+                    Object(ol_proj["fromLonLat"])([point.longitude, point.latitude])
+                  ),
+                });
+                let featrueWithText = new Style["default"]({
+                  text: new style_Text["default"]({
+                    text: point.otherInfo.stake,
+                    offsetY: 30,
+                    fill: new Fill["default"]({ color: "#f8f6e6" }),
+                    font: "13px Calibri,sans-serif",
+                    backgroundFill: new Fill["default"]({ color: "rgba(50, 35, 5, 0.7)" }),
+                    backgroundStroke: new Stroke["default"]({
+                      color: "#c7b838",
+                      width: 1,
+                      lineDash: [4, 4],
+                    }),
+                    textAlign: "center",
+                    textBaseline: "middle",
+                    padding: [2, 1, 1, 2],
+                  }),
+                });
+                stakeFeature.setStyle(featrueWithText);
+                gongganTextSource.addFeature(stakeFeature);
+                gongganTextLayer.setSource(gongganTextSource);
+                let bz = 1;
+                feature.get("features").forEach((e) => {
+                  let state = e.getProperties().otherInfo.state;
+                  if (state === 1) {
+                    bz = 1;
+                  } else {
+                    bz = 0;
+                  }
+                });
+                if (bz === 1) {
+                  return imageStyle1;
+                } else {
+                  return imageStyle2;
+                }
+              }
             } else {
               style = feature.get("features")[0].getStyle();
               return style;
@@ -458035,7 +458140,7 @@ var Cluster_Cluster = /** @class */ (function (_super) {
         const clusterSource = new source_Cluster({
           distance: 50,
           minDistance: 200,
-          source: this.sourceWithoutText,
+          source: sourceWithoutText,
         });
         if (foundLayer) {
           foundLayer.setSource(clusterSource);
@@ -458048,9 +458153,9 @@ var Cluster_Cluster = /** @class */ (function (_super) {
           zIndex: 999,
         });
         if (foundLayer) {
-          foundLayer.setSource(this.sourceWithoutText);
+          foundLayer.setSource(sourceWithoutText);
         } else {
-          this.customLayer.setSource(this.sourceWithoutText);
+          this.customLayer.setSource(sourceWithoutText);
         }
       }
       if (!foundLayer) {
@@ -458095,6 +458200,12 @@ var Cluster_Cluster = /** @class */ (function (_super) {
         }
       }
       this.map.removeLayer(foundLayer);
+      this.findLayerByName(layerName + "_Text").setVisible(false);
+      this.gongganTextLayerList.forEach(e => {
+        if (e.getProperties().layerName === layerName+"_Text") {
+          e.set("isvis", false)
+        }
+      });
       this.closePopup();
     },
     findLayerByName(layerName) {
@@ -458109,34 +458220,70 @@ var Cluster_Cluster = /** @class */ (function (_super) {
       }
       return foundLayer;
     },
+    isLayerInMap(layer) {
+      var layersArray = this.map.getLayers().getArray();
+      return layersArray.some(function (mapLayer) {
+        return mapLayer === layer;
+      });
+    },
     pileIsShow(layerName, isShow) {
-      if(this.findLayerByName(layerName)){
+      if (this.findLayerByName(layerName)) {
+        let newSourceWithout = null;
+        let newSourceWith = null;
+        this.sourceWithoutTextList.forEach((e) => {
+          let lid = e.getFeatures()[0].getProperties().layerId;
+          if (lid === layerName) {
+            newSourceWithout = e;
+          }
+        });
+        this.sourceWithTextList.forEach((e) => {
+          let lid = e.getFeatures()[0].getProperties().layerId;
+          if (lid === layerName) {
+            newSourceWith = e;
+          }
+        });
         if (this.isCluster) {
           if (!isShow) {
             const newclusterSource = new source_Cluster({
               distance: 50,
               minDistance: 200,
-              source: this.sourceWithoutText,
+              source: newSourceWithout,
             });
             this.findLayerByName(layerName).setSource(newclusterSource);
+            this.findLayerByName(layerName + "_Text").setVisible(false);
+            this.gongganTextLayerList.forEach(e => {
+              if (e.getProperties().layerName === layerName+"_Text") {
+                e.set("isvis", false)
+              }
+            });
+            this.gongganTextLayerShow = false;
           } else {
             const newclusterSource = new source_Cluster({
               distance: 50,
               minDistance: 200,
-              source: this.sourceWithText,
+              source: newSourceWith,
             });
             this.findLayerByName(layerName).setSource(newclusterSource);
+            if (this.map.getView().getZoom() >= 18) {
+              this.findLayerByName(layerName + "_Text").setVisible(true);
+              this.gongganTextLayerList.forEach(e => {
+                if (e.getProperties().layerName === layerName+"_Text") {
+                  e.set("isvis", true)
+                }
+              });
+            }
+            this.gongganTextLayerShow = true;
           }
         } else {
           if (!isShow) {
-            this.findLayerByName(layerName).setSource(this.sourceWithoutText);
+            this.findLayerByName(layerName).setSource(newSourceWithout);
           } else {
-            this.findLayerByName(layerName).setSource(this.sourceWithText);
+            this.findLayerByName(layerName).setSource(newSourceWith);
           }
         }
-      }else{
-        console.log('未找到该图层');
-        return '未找到该图层'
+      } else {
+        console.log("未找到该图层");
+        return "未找到该图层";
       }
     },
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gis-map-universal",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "GIS通用组件",
   "main": "gismap.umd.js",
   "private": false,