@kq_npm/client3d_webgl_vue 4.5.43 → 4.5.44

package/isolineanalysis/index.js

@@ -369,28 +369,31 @@ class IsolineAnalysisViewModel {
 
   //开始分析
   start() {
+    this.remove();
     var that = this;
     // 判断是否添加了地形
     if (that._options.viewer.terrainProvider.availability) {
-      that._drawManager?.startDraw("polygon", { clampToGround: true }, (feature, { shape }) => {
-        if (!shape.groupName || shape.groupName !== "IsolineAnalysisDraw") return;
-        if (shape) {
-          that._options.positions = shape._controlPoints;
-          switch (that._options.filltype) {
-            case 0:
-              that._options.type = Cesium.Kq3dContourAnalysisType.LINE;
-              break;
-            case 1:
-              that._options.type = Cesium.Kq3dContourAnalysisType.SURFACE;
-              break;
-            case 2:
-              that._options.type = Cesium.Kq3dContourAnalysisType.SUFACE_LINE;
-              break;
+      if(that._drawManager) {
+        that._drawManager?.startDraw("polygon", { clampToGround: true }, (feature, { shape }) => {
+          if (!shape.groupName || shape.groupName !== "IsolineAnalysisDraw") return;
+          if (shape) {
+            that._options.positions = shape._controlPoints;
+            switch (that._options.filltype) {
+              case 0:
+                that._options.type = Cesium.Kq3dContourAnalysisType.LINE;
+                break;
+              case 1:
+                that._options.type = Cesium.Kq3dContourAnalysisType.SURFACE;
+                break;
+              case 2:
+                that._options.type = Cesium.Kq3dContourAnalysisType.SUFACE_LINE;
+                break;
+            }
+            that._elevation = new Cesium.Kq3dContourAnalysis(that._options);
           }
-          that._elevation = new Cesium.Kq3dContourAnalysis(that._options);
-        }
-        that._drawManager.clearDrawGroup("IsolineAnalysisDraw");
-      }, "IsolineAnalysisDraw");
+          that._drawManager.clearDrawGroup("IsolineAnalysisDraw");
+        }, "IsolineAnalysisDraw");
+      }
     } else {
       (0,message/* default */.A)({
         message: this._language["terrainAnalysisTips"],
@@ -398,18 +401,21 @@ class IsolineAnalysisViewModel {
       });
     }
   }
-
+  // 清除数据
+  remove() {
+    this._elevation && this._elevation.destroy();
+    this._elevation = null;
+  }
   //清除全部结果
   clear() {
-    this._drawManager && this._drawManager.stopDraw();
+    this._drawManager?.stopDraw();
+    this._drawManager?.clearDrawGroup("IsolineAnalysisDraw");
     this._elevation && this._elevation.destroy();
     this._elevation = null;
   }
   //销毁
   destroy() {
-    this._drawManager && this._drawManager.stopDraw();
-    this._elevation && this._elevation.destroy();
-    this._elevation = null;
+    this.clear();
   }
   //设置首曲线显隐
   setElevationMarking(show) {

package/light/index.js

@@ -52,11 +52,13 @@ class LightViewModel {
   _drawManager = null; //绘制管理对象
   _options = null; //灯光存储参数对象
   _lightList = []; //灯光对象集合
+  _language = null;
 
   constructor(scenceView, options) {
     this._options = options;
     this._viewer = scenceView._viewer;
     this._drawManager = scenceView._drawManager;
+    this._language = scenceView._language;
     this._drawHandler = this._drawManager._drawHandler.drawHandler;
     this._lightModelDs = new Cesium.CustomDataSource("LightModel");
 
@@ -79,6 +81,7 @@ class LightViewModel {
   addLight() {
     var that = this;
     if (this._options) {
+      if(!this._drawManager) return;
       if (this._options.mode == "point" || this._options.mode == "spot") {
         this._drawManager.startDraw("marker", { image: null }, (feature, { shape }) => {
           if (!shape.groupName || shape.groupName !== "LightDraw") return;
@@ -95,7 +98,9 @@ class LightViewModel {
           that._drawManager && that._drawManager.clearDrawGroup("LightDraw");
         }, "LightDraw");
       } else if (this._options.mode == "parallel") {
-        this._drawManager.startDraw("polyline", { clampToGround: false }, null, "LightDraw");
+        this._drawManager.startDraw("polyline", { clampToGround: false }, (feature, { shape }) => {
+          if (!shape.groupName || shape.groupName !== "parallelLightDraw") return;
+        }, "parallelLightDraw");
       }
     }
   }
@@ -201,6 +206,7 @@ class LightViewModel {
   clear() {
     this._drawManager.stopDraw();
     this._drawManager && this._drawManager.clearDrawGroup("LightDraw");
+    this._drawManager && this._drawManager.clearDrawGroup("parallelLightDraw");
     this._lightModelDs.entities.removeAll();
     this.clearLights();
     this._light = null;

package/limitheightanalysis/index.js

@@ -270,7 +270,7 @@ class LimitHeightAnalysisViewModel {
             that._options.positions = shape._controlPoints;
             that.drawPolygon();
           }
-          that._drawManager && that._drawManager.clearDrawGroup("LimitHeightAnalysisDraw");
+          that._drawManager.clearDrawGroup("LimitHeightAnalysisDraw");
         }, "LimitHeightAnalysisDraw");
       }
     } else {
@@ -308,6 +308,7 @@ class LimitHeightAnalysisViewModel {
   clear() {
     this._limitHeightAnalysis && this._limitHeightAnalysis.remove();
     this._drawManager && this._drawManager.stopDraw();
+    this._drawManager?.clearDrawGroup("LimitHeightAnalysisDraw");
   }
   // 销毁
   destroy() {

package/measure/index.js

@@ -93,15 +93,37 @@ class MeasureViewModel {
   measureEvent = null; //测量事件
   activeEvent = null; //活动事件
   nauticalMileUnit = "nmi";
-  constructor(viewer) {
-    this._measureHandler = new Cesium.Kq3dMeasureHandler(viewer, { exaggerateCompute: true });
-    this._viewer = viewer;
+  drawTipsStyle = null;
+  _language = null;
+  constructor(scenceView) {
+    this._viewer = scenceView._viewer;
+    this._measureHandler = new Cesium.Kq3dMeasureHandler(scenceView._viewer, { exaggerateCompute: true});
     this.measureEvent = this._measureHandler.measureEvent;
     this.activeEvent = this._measureHandler.activeEvent;
+    this.drawTipsStyle = scenceView._drawTipsStyle;
+    this._language = scenceView._language;
+    if(scenceView._props.showDrawTipsStyle){
+      this._measureHandler.showDrawTips = scenceView._props.showDrawTipsStyle;
+    }
+  }
+  // 设置绘制鼠标提示
+  setDrawTipsStyle(params = {}){
+    if (!this._measureHandler) return;
+    const processedParams = Object.entries(params).reduce((acc, [key, value]) => {
+      acc[key] = (value === '') ? null : value;
+      return acc;
+    }, {});
+    this._measureHandler.drawTipsStyle = {
+      ...(this.drawTipsStyle || {}),
+      ...processedParams
+    };
   }
-
   //距离测量
   distanceMeasure(mode) {
+    this.setDrawTipsStyle({
+      beforeDrawText: this._language?.measureBeforeDrawText,
+      duringDrawText: this._language?.measureDuringDrawText
+    });
     this._viewer.scene.globe.depthTestAgainstTerrain = true;
     if (mode === "ground") {
       this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.TerrainDistance);
@@ -114,12 +136,20 @@ class MeasureViewModel {
 
   //高度测量(三角测量)
   heightMeasure() {
+    this.setDrawTipsStyle({
+      beforeDrawText: this._language?.measureBeforeDrawText,
+      duringDrawText: this._language?.measureHeightDuringDrawText
+    });
     this._viewer.scene.globe.depthTestAgainstTerrain = true;
     this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.ComplexDistance);
   }
 
   //面积测量
   areaMeasure(mode) {
+    this.setDrawTipsStyle({
+      beforeDrawText: this._language?.measureBeforeDrawText,
+      duringDrawText: this._language?.measureDuringDrawText
+    });
     this._viewer.scene.globe.depthTestAgainstTerrain = true;
     if (mode === "ground") {
       this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.TerrainArea);
@@ -132,24 +162,40 @@ class MeasureViewModel {
 
   //方位角测量
   azimuthMeasure() {
+    this.setDrawTipsStyle({
+      beforeDrawText: this._language?.measureBeforeDrawText,
+      duringDrawText: this._language?.measureHeightDuringDrawText
+    });
     this._viewer.scene.globe.depthTestAgainstTerrain = true;
     this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.Azimuth);
   }
 
   //坐标测量
   coordinateMeasure() {
+    this.setDrawTipsStyle({
+      beforeDrawText: this._language?.measureCoordinateBeforeDrawText,
+      duringDrawText: this._language?.measureCoordinateBeforeDrawText
+    });
     this._viewer.scene.globe.depthTestAgainstTerrain = true;
     this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.Coordinate);
   }
 
   //地形坡度测量
   terrainSlopeMeasure() {
+    this.setDrawTipsStyle({
+      beforeDrawText: this._language?.measureBeforeDrawText,
+      duringDrawText: this._language?.measureSlopeBeforeDrawText
+    });
     this._viewer.scene.globe.depthTestAgainstTerrain = true;
     this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.TerrainSlope);
   }
 
   //场景坡度测量
   sceneSlopeMeasure() {
+    this.setDrawTipsStyle({
+      beforeDrawText: this._language?.measureBeforeDrawText,
+      duringDrawText: this._language?.measureSlopeBeforeDrawText
+    });
     this._viewer.scene.globe.depthTestAgainstTerrain = true;
     this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.SceneSlope);
   }
@@ -511,7 +557,7 @@ let headerTempRef = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref
 
   gis_utils_.utils.getWebMap(props.target, scenceView => {
     if (scenceView) {
-      viewModel = new MeasureViewModel/* default */.A(scenceView._viewer);
+      viewModel = new MeasureViewModel/* default */.A(scenceView);
       viewModel.nauticalMileUnit = nauticalMileUnit;
       //注册测量事件，以获取测量结果
       viewModel.measureEvent.addEventListener(function (res) {

package/modelFlat/index.js

@@ -252,6 +252,16 @@ class ModelFlatViewModel {
     //   }
     // });
     this._measureHandler = new Cesium.Kq3dMeasureHandler(this._viewer);
+    if(scenceView._props.showDrawTipsStyle){
+      this._measureHandler.showDrawTips = scenceView._props.showDrawTipsStyle;
+      this._measureHandler.drawTipsStyle = {
+        ...scenceView._drawTipsStyle,
+        ...{
+          beforeDrawText: this._language?.beforeDrawText,
+          duringDrawText: this._language?.duringDrawText
+        }
+      }
+    }
     this._measureHandler.measureEvent.addEventListener(function (result) {
       that._measureResult = result;
       result.measureResult.label.show = false;
@@ -303,7 +313,6 @@ class ModelFlatViewModel {
     if (flag) {
       this.remove(!this._options.showFlattenedPolygons);
       this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.HorizontalArea);
-      // this._drawManager.startDraw("polygon", { clampToGround: true });
     } else {
       (0,message/* default */.A)({
         message: this._language["addModelTips"],
@@ -339,7 +348,6 @@ class ModelFlatViewModel {
   }
   // 清除绘制
   remove(bool) {
-    this._drawManager.stopDraw();
     if(bool){
       this._flatteningPolygonTex && this._flatteningPolygonTex.removeAllFlattenedPolygon();
       for (var i = 0; i < this._assistPolygons.length; i++) {

package/modelexcavate/index.js

@@ -258,6 +258,16 @@ class ModelExcavateViewModel {
       }
     }
     this._measureHandler = new Cesium.Kq3dMeasureHandler(this._viewer);
+    if(scenceView._props.showDrawTipsStyle){
+      this._measureHandler.showDrawTips = scenceView._props.showDrawTipsStyle;
+      this._measureHandler.drawTipsStyle = {
+        ...scenceView._drawTipsStyle,
+        ...{
+          beforeDrawText: this._language?.beforeDrawText,
+          duringDrawText: this._language?.duringDrawText
+        }
+      }
+    }
     this._measureHandler.measureEvent.addEventListener(function (result) {
       that._measureResult = result;
       result.measureResult.label.show = false;

package/modelprofileanalysis/index.js

@@ -211,9 +211,9 @@ var message = __webpack_require__(1092);
  */
 //分析逻辑类
 let floatingPoint;
-let drawPoints = [];
+let drawPoints = (/* unused pure expression or super */ null && ([]));
 let activeShapePoints = [];
-let activeCartographicPoints = [];
+let activeCartographicPoints = (/* unused pure expression or super */ null && ([]));
 
 class ModelProfileAnalysisViewModel {
   _profileAnalysis = null; //剖面分析三维对象
@@ -225,8 +225,10 @@ class ModelProfileAnalysisViewModel {
     width: 360,
     height: 360
   };
+  _drawManager = null;
   constructor(scenceView, viewModel, chart) {
-    this._language = scenceView._language;
+    this._drawManager = scenceView._drawManager;
+    this._language = scenceView._language || {};
     this._globaOptions.viewModel = {
       angle: viewModel.perspectiveAngle || 90,
       frustumH: viewModel.targetAreaHeight || 200,
@@ -280,14 +282,7 @@ class ModelProfileAnalysisViewModel {
       this._globaOptions._handler.setInputAction(function (event) {
         var earthPosition = that._globaOptions.viewer.scene.pickPosition(event.position);
         if (window.Cesium.defined(earthPosition)) {
-          //绘制点
-          floatingPoint = that.createPoint(earthPosition);
-          drawPoints.push(floatingPoint);
-
           activeShapePoints.push(earthPosition);
-          let earthPositionCarto = window.Cesium.Cartographic.fromCartesian(earthPosition);
-          activeCartographicPoints.push(earthPositionCarto);
-
           //单线分析结果显示
           if (activeShapePoints.length == 2) {
             var newPositions = [];
@@ -295,20 +290,19 @@ class ModelProfileAnalysisViewModel {
               var newPosition = window.Cesium.Cartographic.fromCartesian(position);
               newPositions.push(newPosition);
             });
-
             that._profileAnalysis.elevation = newPositions;
             setTimeout(() => {
               that.updatePorfileAnalysis();
             }, 200);
-
-            drawPoints.forEach(function (point) {
-              that._globaOptions.viewer.entities.remove(point);
-            });
-            drawPoints = [];
             activeShapePoints = [];
+            that._drawManager?.stopDraw?.();
           }
         }
       }, window.Cesium.ScreenSpaceEventType.LEFT_CLICK);
+      this._drawManager?.startDraw?.("polyline", { clampToGround: true },  (feature, { shape }) => {
+        if (!shape.groupName || shape.groupName !== "ModelProfileAnalysis") return;
+        that._drawManager.clearDrawGroup("ModelProfileAnalysis");
+      }, "ModelProfileAnalysis");
     } else {
       (0,message/* default */.A)({
         message: this._language["addModelTips"],
@@ -430,8 +424,10 @@ class ModelProfileAnalysisViewModel {
   }
   // 清理剖面分析
   remove() {
+    this._drawManager?.clearDrawGroup("ModelProfileAnalysis");
     this._ProfileAnalysisChartVis.value = false;
     this._profileAnalysis && this._profileAnalysis.clearPrimitives();
+    this._drawManager?.stopDraw();
   }
   //清除全部结果
   clear() {

package/package.json

@@ -1 +1 @@
-{"jsdelivr":"./webgl.es.js","name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client WebGL for Vue.js","version":"4.5.43","homepage":"","keywords":["KQGIS","webGL","Vue"],"sdkNames":["@kq_npm/client_icons_vue"],"restrictedVersion":true,"validateSDK":true,"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"zhupc_npm","license":"Apache-2.0","dependencies":{"html2canvas-pro":"1.5.10","save":"2.5.0","papaparse":"5.4.1"}}
+{"jsdelivr":"./webgl.es.js","name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client WebGL for Vue.js","version":"4.5.44","homepage":"","keywords":["KQGIS","webGL","Vue"],"sdkNames":["@kq_npm/client_icons_vue"],"restrictedVersion":true,"validateSDK":true,"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"zhupc_npm","license":"Apache-2.0","dependencies":{"html2canvas-pro":"1.5.10","save":"2.5.0","papaparse":"5.4.1"}}

package/particleeffect/index.js

@@ -163,12 +163,13 @@ class ParticleEffectViewModel {
   _options = null; //粒子特效存储参数对象
   _fireImage = const_image_.FIRE_URL; //火焰图片url地址
   _smokeImage = const_image_.SMOKE_URL; //烟雾图片url地址
-
+  _language = null;
   constructor(scenceView) {
     scenceView._viewer.clock.shouldAnimate = true;
     scenceView._viewer.scene.globe.depthTestAgainstTerrain = true;
     this._scene = scenceView._viewer.scene;
     this._drawManager = scenceView._drawManager;
+    this._language = scenceView._language;
     _gravityScratch = new Cesium.Cartesian3();
   }
 

package/planeclip/index.js

@@ -299,7 +299,8 @@ class PlaneClipViewModel {
       }
     }
     if (flag) {
-      if (this._drawManager) this._drawManager.startDraw("marker", { image: null }, (feature, { shape }) => {
+      if (!this._drawManager) return;
+      this._drawManager.startDraw("marker", { image: null }, (feature, { shape }) => {
         if (!shape.groupName || shape.groupName !== "PlaneClipDraw") return;
         if (shape) {
           that._options.position = shape.position;

package/radarscananalysis/index.js

@@ -60,10 +60,12 @@ class RadarScanAnalysisViewModel {
   };
   _drawManager = null; // 绘制对象
   _radarScan = null; // 扫描对象
+  _language = null;
   constructor(scenceView, option) {
     this._viewer = scenceView._viewer;
     Object.assign(this._options, option);
     this._drawManager = scenceView._drawManager;
+    this._language = scenceView._language;
   }
   //获取颜色rgba值
   getRgba(color) {
@@ -165,7 +167,7 @@ class RadarScanAnalysisViewModel {
             });
           }
         }
-        that._drawManager && that._drawManager.clearDrawGroup("RadarScanAnalysis");
+        that._drawManager.clearDrawGroup("RadarScanAnalysis");
       }, "RadarScanAnalysis");
     }
   }
@@ -174,6 +176,7 @@ class RadarScanAnalysisViewModel {
     this._radarScan && this._radarScan.destroy?.();
     this._radarScan = null;
     this._drawManager && this._drawManager.stopDraw();
+    this._drawManager && this._drawManager.clearDrawGroup("RadarScanAnalysis");
   }
   // 销毁
   destroy() {