@kq_npm/client3d_webgl_vue 3.6.2-beta → 3.6.4-beta

package/floodanalysis/index.js

@@ -196,6 +196,8 @@ class FloodAnalysisViewModel {
   //测量结果
   //淹没模式
   constructor(scenceView, options) {
+    (0,defineProperty/* default */.Z)(this, "_options", {});
+
     (0,defineProperty/* default */.Z)(this, "_floodTerrainAnalysis", null);
 
     (0,defineProperty/* default */.Z)(this, "_floodModelAnalysis", null);
@@ -218,10 +220,11 @@ class FloodAnalysisViewModel {
       src: const_image_.GREEN_TO_BLUE_URL
     }]);
 
+    this._mode = options.mode;
     options.viewer = scenceView._viewer;
     options.viewer.scene.globe.depthTestAgainstTerrain = true;
-    this._mode = options.mode;
-    options.colorImage = this.getImagePath(options.colorImage); //this._floodModelAnalysis = new Cesium.Kq3dFloodModelAnalysis(options);
+    options.colorImage = this.getImagePath(options.colorImage);
+    this._options = options; //this._floodModelAnalysis = new Cesium.Kq3dFloodModelAnalysis(options);
 
     this._floodModelAnalysis = scenceView._floodModelAnalysis;
     this._floodModelAnalysis.moveMode = options.moveMode;
@@ -244,10 +247,10 @@ class FloodAnalysisViewModel {
       if (ret == false) {
         if (that._measureResult) {
           if (that._mode === 0) {
-            options.positions = that._measureResult.positions;
+            that._options.positions = that._measureResult.positions;
 
             if (!that._floodTerrainAnalysis) {
-              that._floodTerrainAnalysis = new Cesium.Kq3dFloodTerrainAnalysis(options);
+              that._floodTerrainAnalysis = new Cesium.Kq3dFloodTerrainAnalysis(that._options);
             } else {
               that._floodTerrainAnalysis.positions = that._measureResult.positions;
             }
@@ -374,36 +377,47 @@ class FloodAnalysisViewModel {
 
 
   setMoveDirection(direction) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.moveMode = Number(direction);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.moveMode = Number(direction);
+    direction = Number(direction);
+    this._options.moveMode = direction;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.moveMode = direction;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.moveMode = direction;
   } //设置淹没速度
 
 
   setMoveSpeed(speed) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.speed = Number(speed);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.speed = Number(speed);
+    speed = Number(speed);
+    this._options.speed = speed;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.speed = speed;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.speed = speed;
   } //设置淹没纹理透明度
 
 
   setMoveAlpha(alpha) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.alpha = Number(alpha);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.alpha = Number(alpha);
+    alpha = Number(alpha);
+    this._options.alpha = alpha;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.alpha = alpha;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.alpha = alpha;
   } //设置最小淹没高度
 
 
   setMoveMinHeight(minHeight) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.minHeight = Number(minHeight);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.minHeight = Number(minHeight);
+    minHeight = Number(minHeight);
+    this._options.minHeight = minHeight;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.minHeight = minHeight;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.minHeight = minHeight;
   } //设置最大淹没高度
 
 
   setMoveMaxHeight(maxHeight) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.maxHeight = Number(maxHeight);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.maxHeight = Number(maxHeight);
+    maxHeight = Number(maxHeight);
+    this._options.maxHeight = maxHeight;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.maxHeight = maxHeight;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.maxHeight = maxHeight;
   } //设置淹没填充纹理
 
 
   setMoveImage(image) {
+    this._options.colorImage = image;
     if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.colorImage = image;
     if (this._floodModelAnalysis) this._floodModelAnalysis.colorImage = image;
   }

package/index.js

@@ -564,7 +564,9 @@ var const_image_namespaceObject = require("@kq_npm/client_common_vue/_utils/cons
  //绘制操作类
 
 class DrawManager {
-  //图层分组
+  // 图层分组
+  // 地理编码绘制点图标点击事件
+  // 地理编码绘制点图层分组
   // 默认绘制样式提供给绘图组件绑定
   // 默认绘制样式
   constructor(viewer) {
@@ -576,6 +578,10 @@ class DrawManager {
 
     _defineProperty(this, "_layerGroup", []);
 
+    _defineProperty(this, "_handler", null);
+
+    _defineProperty(this, "_pointGroup", []);
+
     _defineProperty(this, "_defaultStyle", {
       color: "#ff0000",
       fillColor: "#1E90FF",
@@ -619,7 +625,7 @@ class DrawManager {
         //线宽
         color: "#ff0000",
         //线颜色
-        opacity: 0.5,
+        opacity: 1,
         //线颜色透明度
         arcType: 1,
         clampToGround: true //是否贴地
@@ -637,7 +643,7 @@ class DrawManager {
         //边框宽度
         color: "#ff0000",
         //边框颜色
-        opacity: 0.5,
+        opacity: 1,
         //边框颜色透明度
         clampToGround: true //是否贴地
 
@@ -712,7 +718,8 @@ class DrawManager {
     this._drawStyle.freehandpolygon = this._drawStyle.polygon; //手绘面
 
     this._drawStyle.rectangle = this._drawStyle.polygon; //矩形
-  }
+  } // 获取三维填充样式
+
 
   getFillStyle(fillStyle) {
     let lineColor = fillStyle.lineColor || "rgba(0, 0, 255, 1)";
@@ -785,7 +792,9 @@ class DrawManager {
         if (groupName) shape.groupName = groupName;
         that._viewer.scene.globe.depthTestAgainstTerrain = false;
         var feature = that.shapeToGeoFeature(shape);
-        callback(feature.geometry);
+        callback(feature.geometry, {
+          layer: shape.guid
+        });
         removeEventListener();
       });
     }
@@ -1104,7 +1113,7 @@ class DrawManager {
     }
 
     return geoFeature;
-  } // 获取所有绘制图层，geojson数据格式 (普通点线面绘制接口使用)
+  } // 获取所有绘制图层, geojson数据格式 (普通点线面绘制接口使用)
 
 
   getAllGeometry() {
@@ -1124,7 +1133,144 @@ class DrawManager {
       features: features
     };
     return geojson;
+  } // 设置交互绘制样式, 只设置最后一个图形样式, 绘图组件使用
+
+
+  setDrawStyleById(id, style) {
+    let primitive = this._drawLayer.getById(id);
+
+    if (!primitive) return;
+    let type = primitive.geoType;
+
+    if (type === 'point') {// 绘制点暂时不需要修改样式
+    } else if (type === 'polyline' || type === 'polygon') {
+      if (style.weight) primitive.width = style.weight;
+      if (style.color) primitive.color = Cesium.Color.fromCssColorString(style.color);
+      if (style.dashArray) primitive.dashArray = style.dashArray;
+    }
+
+    if (type === 'polygon') {
+      primitive.fill = style.fill;
+
+      if (style.fill) {
+        let opacity = style.fillOpacity || this._drawStyle.polygon.fillOpacity;
+        if (style.fillColor) primitive.fillColor = Cesium.Color.fromCssColorString(style.fillColor).withAlpha(opacity);
+      }
+    }
+  }
+  /********** 地理编码通用组件使用 start ************/
+  // 绘制点图标自带点击弹出气泡, 地理编码通用组件使用
+
+
+  drawPointWithPoup(data, idCustom = "geocode") {
+    if (!this._handler) {
+      // 注册点击事件
+      let scene = this._viewer.scene;
+      this._handler = new Cesium.ScreenSpaceEventHandler(scene.canvas);
+      let that = this;
+
+      this._handler.setInputAction(function (movement) {
+        var pickedObject = scene.pick(movement.position);
+
+        if (pickedObject && pickedObject.id && pickedObject.id instanceof Cesium.Entity) {
+          let entity = pickedObject.id;
+          that.createPointPoup(entity);
+        }
+      }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+
+      this._handler.setInputAction(function (movement) {
+        // that.closePointPoup();
+        that.openPointPoup('1002', 'AAA'); //  that.removePointAll();
+        //that.clearPointByIdCustom();
+      }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+    }
+
+    let pointDs = this._viewer.dataSources.getByName(idCustom);
+
+    if (pointDs.length === 0) {
+      pointDs = new Cesium.CustomDataSource(idCustom);
+
+      this._viewer.dataSources.add(pointDs);
+
+      this._pointGroup.push(idCustom);
+    } else {
+      pointDs = pointDs[0];
+    }
+
+    let position = Cesium.Cartesian3.fromDegrees(data.lat, data.lon);
+    pointDs.entities.add({
+      position: position,
+      billboard: {
+        image: data.image,
+        width: data.width,
+        height: data.height,
+        verticalOrigin: Cesium.VerticalOrigin.BOTTOM
+      } // properties: data
+
+    });
+  } // 通过entity创建关联气泡
+
+
+  createPointPoup(entity) {
+    if (this._htmlTag) this._htmlTag.destroy();
+    this._htmlTag = new Cesium.Kq3dHtmlTag(this._viewer, {
+      html: '<div>' + entity.properties.id._value + '</div>',
+      position: entity.position,
+      anchor: [0, -entity.properties.height._value],
+      alignmentMode: 7
+    });
+  } // 通过id打开地理编码图标气泡
+
+
+  openPointPoup(id, idCustom = "geocode") {
+    if (id) {
+      let pointDs = this._viewer.dataSources.getByName(idCustom);
+
+      if (pointDs.length > 0) {
+        let entities = pointDs[0].entities.values;
+
+        for (let i = 0; i < entities.length; i++) {
+          if (entities[i].properties.id && entities[i].properties.id._value === id) {
+            this.createPointPoup(entities[i]);
+            break;
+          }
+        }
+      }
+    }
+  } // 关闭地理编码图标点击气泡
+
+
+  closePointPoup() {
+    if (this._htmlTag) this._htmlTag.destroy();
+  } // 清除地理编码指定分组的所有图标
+
+
+  clearPointByIdCustom(idCustom = "geocode") {
+    let pointDs = this._viewer.dataSources.getByName(idCustom);
+
+    if (pointDs.length > 0) {
+      for (let i = 0; i < pointDs.length; i++) {
+        pointDs[i].entities.removeAll();
+      }
+    }
+  } // 删除所有地理编码图标, 包含分组图层
+
+
+  removePointAll() {
+    let that = this;
+
+    this._pointGroup.forEach(group => {
+      let dsList = that._viewer.dataSources.getByName(group);
+
+      for (let i = 0; i < dsList.length; i++) {
+        that._viewer.dataSources.remove(dsList[i], true);
+      }
+    });
+
+    this._pointGroup = [];
   }
+  /********** 地理编码通用组件使用 end ************/
+
 
 }
 ;// CONCATENATED MODULE: external "element-plus/es"
@@ -14818,6 +14964,8 @@ class FloodAnalysisViewModel {
   //测量结果
   //淹没模式
   constructor(scenceView, options) {
+    _defineProperty(this, "_options", {});
+
     _defineProperty(this, "_floodTerrainAnalysis", null);
 
     _defineProperty(this, "_floodModelAnalysis", null);
@@ -14840,10 +14988,11 @@ class FloodAnalysisViewModel {
       src: const_image_namespaceObject.GREEN_TO_BLUE_URL
     }]);
 
+    this._mode = options.mode;
     options.viewer = scenceView._viewer;
     options.viewer.scene.globe.depthTestAgainstTerrain = true;
-    this._mode = options.mode;
-    options.colorImage = this.getImagePath(options.colorImage); //this._floodModelAnalysis = new Cesium.Kq3dFloodModelAnalysis(options);
+    options.colorImage = this.getImagePath(options.colorImage);
+    this._options = options; //this._floodModelAnalysis = new Cesium.Kq3dFloodModelAnalysis(options);
 
     this._floodModelAnalysis = scenceView._floodModelAnalysis;
     this._floodModelAnalysis.moveMode = options.moveMode;
@@ -14866,10 +15015,10 @@ class FloodAnalysisViewModel {
       if (ret == false) {
         if (that._measureResult) {
           if (that._mode === 0) {
-            options.positions = that._measureResult.positions;
+            that._options.positions = that._measureResult.positions;
 
             if (!that._floodTerrainAnalysis) {
-              that._floodTerrainAnalysis = new Cesium.Kq3dFloodTerrainAnalysis(options);
+              that._floodTerrainAnalysis = new Cesium.Kq3dFloodTerrainAnalysis(that._options);
             } else {
               that._floodTerrainAnalysis.positions = that._measureResult.positions;
             }
@@ -14996,36 +15145,47 @@ class FloodAnalysisViewModel {
 
 
   setMoveDirection(direction) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.moveMode = Number(direction);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.moveMode = Number(direction);
+    direction = Number(direction);
+    this._options.moveMode = direction;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.moveMode = direction;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.moveMode = direction;
   } //设置淹没速度
 
 
   setMoveSpeed(speed) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.speed = Number(speed);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.speed = Number(speed);
+    speed = Number(speed);
+    this._options.speed = speed;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.speed = speed;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.speed = speed;
   } //设置淹没纹理透明度
 
 
   setMoveAlpha(alpha) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.alpha = Number(alpha);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.alpha = Number(alpha);
+    alpha = Number(alpha);
+    this._options.alpha = alpha;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.alpha = alpha;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.alpha = alpha;
   } //设置最小淹没高度
 
 
   setMoveMinHeight(minHeight) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.minHeight = Number(minHeight);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.minHeight = Number(minHeight);
+    minHeight = Number(minHeight);
+    this._options.minHeight = minHeight;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.minHeight = minHeight;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.minHeight = minHeight;
   } //设置最大淹没高度
 
 
   setMoveMaxHeight(maxHeight) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.maxHeight = Number(maxHeight);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.maxHeight = Number(maxHeight);
+    maxHeight = Number(maxHeight);
+    this._options.maxHeight = maxHeight;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.maxHeight = maxHeight;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.maxHeight = maxHeight;
   } //设置淹没填充纹理
 
 
   setMoveImage(image) {
+    this._options.colorImage = image;
     if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.colorImage = image;
     if (this._floodModelAnalysis) this._floodModelAnalysis.colorImage = image;
   }

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.6.2-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"9.2.0-beta.36","xlsx":"^0.18.5","css-vars-ponyfill":"^2.4.8","html2canvas":"^1.4.1","xe-utils":"^3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.6.4-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"9.2.0-beta.36","xlsx":"^0.18.5","css-vars-ponyfill":"^2.4.8","html2canvas":"^1.4.1","xe-utils":"^3.5.4"}}

package/scenceview/index.js

@@ -8769,6 +8769,8 @@ class FloodAnalysisViewModel {
   //测量结果
   //淹没模式
   constructor(scenceView, options) {
+    (0,defineProperty/* default */.Z)(this, "_options", {});
+
     (0,defineProperty/* default */.Z)(this, "_floodTerrainAnalysis", null);
 
     (0,defineProperty/* default */.Z)(this, "_floodModelAnalysis", null);
@@ -8791,10 +8793,11 @@ class FloodAnalysisViewModel {
       src: const_image_.GREEN_TO_BLUE_URL
     }]);
 
+    this._mode = options.mode;
     options.viewer = scenceView._viewer;
     options.viewer.scene.globe.depthTestAgainstTerrain = true;
-    this._mode = options.mode;
-    options.colorImage = this.getImagePath(options.colorImage); //this._floodModelAnalysis = new Cesium.Kq3dFloodModelAnalysis(options);
+    options.colorImage = this.getImagePath(options.colorImage);
+    this._options = options; //this._floodModelAnalysis = new Cesium.Kq3dFloodModelAnalysis(options);
 
     this._floodModelAnalysis = scenceView._floodModelAnalysis;
     this._floodModelAnalysis.moveMode = options.moveMode;
@@ -8817,10 +8820,10 @@ class FloodAnalysisViewModel {
       if (ret == false) {
         if (that._measureResult) {
           if (that._mode === 0) {
-            options.positions = that._measureResult.positions;
+            that._options.positions = that._measureResult.positions;
 
             if (!that._floodTerrainAnalysis) {
-              that._floodTerrainAnalysis = new Cesium.Kq3dFloodTerrainAnalysis(options);
+              that._floodTerrainAnalysis = new Cesium.Kq3dFloodTerrainAnalysis(that._options);
             } else {
               that._floodTerrainAnalysis.positions = that._measureResult.positions;
             }
@@ -8947,36 +8950,47 @@ class FloodAnalysisViewModel {
 
 
   setMoveDirection(direction) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.moveMode = Number(direction);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.moveMode = Number(direction);
+    direction = Number(direction);
+    this._options.moveMode = direction;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.moveMode = direction;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.moveMode = direction;
   } //设置淹没速度
 
 
   setMoveSpeed(speed) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.speed = Number(speed);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.speed = Number(speed);
+    speed = Number(speed);
+    this._options.speed = speed;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.speed = speed;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.speed = speed;
   } //设置淹没纹理透明度
 
 
   setMoveAlpha(alpha) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.alpha = Number(alpha);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.alpha = Number(alpha);
+    alpha = Number(alpha);
+    this._options.alpha = alpha;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.alpha = alpha;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.alpha = alpha;
   } //设置最小淹没高度
 
 
   setMoveMinHeight(minHeight) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.minHeight = Number(minHeight);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.minHeight = Number(minHeight);
+    minHeight = Number(minHeight);
+    this._options.minHeight = minHeight;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.minHeight = minHeight;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.minHeight = minHeight;
   } //设置最大淹没高度
 
 
   setMoveMaxHeight(maxHeight) {
-    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.maxHeight = Number(maxHeight);
-    if (this._floodModelAnalysis) this._floodModelAnalysis.maxHeight = Number(maxHeight);
+    maxHeight = Number(maxHeight);
+    this._options.maxHeight = maxHeight;
+    if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.maxHeight = maxHeight;
+    if (this._floodModelAnalysis) this._floodModelAnalysis.maxHeight = maxHeight;
   } //设置淹没填充纹理
 
 
   setMoveImage(image) {
+    this._options.colorImage = image;
     if (this._floodTerrainAnalysis) this._floodTerrainAnalysis.colorImage = image;
     if (this._floodModelAnalysis) this._floodModelAnalysis.colorImage = image;
   }
@@ -25880,7 +25894,9 @@ var const_image_ = __webpack_require__(9702);
  //绘制操作类
 
 class DrawManager {
-  //图层分组
+  // 图层分组
+  // 地理编码绘制点图标点击事件
+  // 地理编码绘制点图层分组
   // 默认绘制样式提供给绘图组件绑定
   // 默认绘制样式
   constructor(viewer) {
@@ -25892,6 +25908,10 @@ class DrawManager {
 
     (0,defineProperty/* default */.Z)(this, "_layerGroup", []);
 
+    (0,defineProperty/* default */.Z)(this, "_handler", null);
+
+    (0,defineProperty/* default */.Z)(this, "_pointGroup", []);
+
     (0,defineProperty/* default */.Z)(this, "_defaultStyle", {
       color: "#ff0000",
       fillColor: "#1E90FF",
@@ -25935,7 +25955,7 @@ class DrawManager {
         //线宽
         color: "#ff0000",
         //线颜色
-        opacity: 0.5,
+        opacity: 1,
         //线颜色透明度
         arcType: 1,
         clampToGround: true //是否贴地
@@ -25953,7 +25973,7 @@ class DrawManager {
         //边框宽度
         color: "#ff0000",
         //边框颜色
-        opacity: 0.5,
+        opacity: 1,
         //边框颜色透明度
         clampToGround: true //是否贴地
 
@@ -26028,7 +26048,8 @@ class DrawManager {
     this._drawStyle.freehandpolygon = this._drawStyle.polygon; //手绘面
 
     this._drawStyle.rectangle = this._drawStyle.polygon; //矩形
-  }
+  } // 获取三维填充样式
+
 
   getFillStyle(fillStyle) {
     let lineColor = fillStyle.lineColor || "rgba(0, 0, 255, 1)";
@@ -26101,7 +26122,9 @@ class DrawManager {
         if (groupName) shape.groupName = groupName;
         that._viewer.scene.globe.depthTestAgainstTerrain = false;
         var feature = that.shapeToGeoFeature(shape);
-        callback(feature.geometry);
+        callback(feature.geometry, {
+          layer: shape.guid
+        });
         removeEventListener();
       });
     }
@@ -26420,7 +26443,7 @@ class DrawManager {
     }
 
     return geoFeature;
-  } // 获取所有绘制图层，geojson数据格式 (普通点线面绘制接口使用)
+  } // 获取所有绘制图层, geojson数据格式 (普通点线面绘制接口使用)
 
 
   getAllGeometry() {
@@ -26440,7 +26463,144 @@ class DrawManager {
       features: features
     };
     return geojson;
+  } // 设置交互绘制样式, 只设置最后一个图形样式, 绘图组件使用
+
+
+  setDrawStyleById(id, style) {
+    let primitive = this._drawLayer.getById(id);
+
+    if (!primitive) return;
+    let type = primitive.geoType;
+
+    if (type === 'point') {// 绘制点暂时不需要修改样式
+    } else if (type === 'polyline' || type === 'polygon') {
+      if (style.weight) primitive.width = style.weight;
+      if (style.color) primitive.color = Cesium.Color.fromCssColorString(style.color);
+      if (style.dashArray) primitive.dashArray = style.dashArray;
+    }
+
+    if (type === 'polygon') {
+      primitive.fill = style.fill;
+
+      if (style.fill) {
+        let opacity = style.fillOpacity || this._drawStyle.polygon.fillOpacity;
+        if (style.fillColor) primitive.fillColor = Cesium.Color.fromCssColorString(style.fillColor).withAlpha(opacity);
+      }
+    }
+  }
+  /********** 地理编码通用组件使用 start ************/
+  // 绘制点图标自带点击弹出气泡, 地理编码通用组件使用
+
+
+  drawPointWithPoup(data, idCustom = "geocode") {
+    if (!this._handler) {
+      // 注册点击事件
+      let scene = this._viewer.scene;
+      this._handler = new Cesium.ScreenSpaceEventHandler(scene.canvas);
+      let that = this;
+
+      this._handler.setInputAction(function (movement) {
+        var pickedObject = scene.pick(movement.position);
+
+        if (pickedObject && pickedObject.id && pickedObject.id instanceof Cesium.Entity) {
+          let entity = pickedObject.id;
+          that.createPointPoup(entity);
+        }
+      }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+
+      this._handler.setInputAction(function (movement) {
+        // that.closePointPoup();
+        that.openPointPoup('1002', 'AAA'); //  that.removePointAll();
+        //that.clearPointByIdCustom();
+      }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+    }
+
+    let pointDs = this._viewer.dataSources.getByName(idCustom);
+
+    if (pointDs.length === 0) {
+      pointDs = new Cesium.CustomDataSource(idCustom);
+
+      this._viewer.dataSources.add(pointDs);
+
+      this._pointGroup.push(idCustom);
+    } else {
+      pointDs = pointDs[0];
+    }
+
+    let position = Cesium.Cartesian3.fromDegrees(data.lat, data.lon);
+    pointDs.entities.add({
+      position: position,
+      billboard: {
+        image: data.image,
+        width: data.width,
+        height: data.height,
+        verticalOrigin: Cesium.VerticalOrigin.BOTTOM
+      } // properties: data
+
+    });
+  } // 通过entity创建关联气泡
+
+
+  createPointPoup(entity) {
+    if (this._htmlTag) this._htmlTag.destroy();
+    this._htmlTag = new Cesium.Kq3dHtmlTag(this._viewer, {
+      html: '<div>' + entity.properties.id._value + '</div>',
+      position: entity.position,
+      anchor: [0, -entity.properties.height._value],
+      alignmentMode: 7
+    });
+  } // 通过id打开地理编码图标气泡
+
+
+  openPointPoup(id, idCustom = "geocode") {
+    if (id) {
+      let pointDs = this._viewer.dataSources.getByName(idCustom);
+
+      if (pointDs.length > 0) {
+        let entities = pointDs[0].entities.values;
+
+        for (let i = 0; i < entities.length; i++) {
+          if (entities[i].properties.id && entities[i].properties.id._value === id) {
+            this.createPointPoup(entities[i]);
+            break;
+          }
+        }
+      }
+    }
+  } // 关闭地理编码图标点击气泡
+
+
+  closePointPoup() {
+    if (this._htmlTag) this._htmlTag.destroy();
+  } // 清除地理编码指定分组的所有图标
+
+
+  clearPointByIdCustom(idCustom = "geocode") {
+    let pointDs = this._viewer.dataSources.getByName(idCustom);
+
+    if (pointDs.length > 0) {
+      for (let i = 0; i < pointDs.length; i++) {
+        pointDs[i].entities.removeAll();
+      }
+    }
+  } // 删除所有地理编码图标, 包含分组图层
+
+
+  removePointAll() {
+    let that = this;
+
+    this._pointGroup.forEach(group => {
+      let dsList = that._viewer.dataSources.getByName(group);
+
+      for (let i = 0; i < dsList.length; i++) {
+        that._viewer.dataSources.remove(dsList[i], true);
+      }
+    });
+
+    this._pointGroup = [];
   }
+  /********** 地理编码通用组件使用 end ************/
+
 
 }
 // EXTERNAL MODULE: ./src/common/_ui/message/index.js + 1 modules