@kq_npm/client3d_webgl_vue 3.3.0-beta → 3.3.1-beta

package/adddata/index.js

@@ -897,6 +897,27 @@ class AddDataViewModel {
         cb && cb(node);
         break;
 
+      case "mvt":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dMvtImageryProviderExt({
+          name: name,
+          style: url
+        }));
+        this.flyToLayer(layer);
+        node = {
+          guid: layer.guid,
+          name: name,
+          visible: true,
+          serverType: "imagerylayer",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        cb && cb(node);
+        break;
+
       case "wms":
         this._viewer.addWMSLayerGroup(url).then(group => {
           node = {
@@ -933,6 +954,7 @@ class AddDataViewModel {
         break;
 
       case "wmts":
+      case "kqgistileserver":
         this._viewer.addWMTSLayerGroup(url).then(group => {
           node = {
             guid: group.guid,
@@ -1332,9 +1354,9 @@ const __default__ = {
             description: language.value.imagertyDataflowServerdescription
           }, {
             type: "kqgistileserver",
-            name: language.value.KQGISTileServer + "（未实现）",
+            name: language.value.KQGISTileServer,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile/wmts",
             description: language.value.imagertyTileServerdescription
           }, {
             type: "arcgismapserver",
@@ -1370,11 +1392,11 @@ const __default__ = {
             type: "geojson",
             name: language.value.GeoJson,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ": http://<host>:<port>/xxx.geojson",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
             description: language.value.imagertyGeoJsondescription
           }, {
             type: "mvt",
-            name: language.value.MVT + "（未实现）",
+            name: language.value.MVT,
             namePlaceholder: language.value.unnamedLayer,
             urlPlaceholder: language.value.format + ":http://<host>:<port>/mvt/style.json",
             description: language.value.imagertyMVTdescription

package/index.js

@@ -2626,16 +2626,13 @@ class ScenceViewViewModel extends (mitt_default()) {
   } //销毁
 
 
-  destroy() {
-    if (this._removeEventListener) {
-      this._removeEventListener();
-
-      this._removeEventListener = null;
-    }
-
-    this._viewer = null;
-    this._drawManager = null;
-    this._layerManager = null;
+  destroy() {// if (this._removeEventListener) {
+    //   this._removeEventListener();
+    //   this._removeEventListener = null;
+    // }
+    // this._viewer = null;
+    // this._drawManager = null;
+    // this._layerManager = null;
   } //创建底图
 
 
@@ -9477,6 +9474,7 @@ var update = injectStylesIntoStyleTag_default()(divpoint/* default */.Z, options
 ;// CONCATENATED MODULE: ./src/webgl/sightlineanalysis/SightlineAnalysisViewModel.js
 
 
+
  //通视分析逻辑类
 
 class SightlineAnalysisViewModel {
@@ -9490,6 +9488,7 @@ class SightlineAnalysisViewModel {
   //创建的divpoint集合
   //拾取的点位集合
   //高亮的障碍物的id集合
+  // 点位图标billboards集合
   constructor(scenceView, options) {
     _defineProperty(this, "_viewer", null);
 
@@ -9511,6 +9510,8 @@ class SightlineAnalysisViewModel {
 
     _defineProperty(this, "_highlightIds", []);
 
+    _defineProperty(this, "_billboards", []);
+
     this._viewer = scenceView._viewer;
     this._viewer.scene.postProcessStages._fxaa.enabled = true;
     this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
@@ -9536,6 +9537,8 @@ class SightlineAnalysisViewModel {
     let that = this;
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape && shape.type === "marker") {
+        that.createBillboard(shape.position);
+
         if (that._addType === 1) {
           that._sightlineAnalysis.setSeePoint(shape.position);
 
@@ -9552,6 +9555,18 @@ class SightlineAnalysisViewModel {
         that._drawManager.clear();
       }
     });
+  } // 创建图标
+
+
+  createBillboard(pos) {
+    this._billboards.push(this._viewer.entities.add({
+      position: pos,
+      billboard: {
+        image: this._addType === 1 ? const_image_namespaceObject.OBSERVATION_POINT : const_image_namespaceObject.TARGET_POINT,
+        verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+        scale: 0.15
+      }
+    }));
   } //创建点位置
 
 
@@ -9648,7 +9663,7 @@ class SightlineAnalysisViewModel {
     this._addType = 1;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_namespaceObject.OBSERVATION_POINT
     });
   } //添加目标点
 
@@ -9658,7 +9673,7 @@ class SightlineAnalysisViewModel {
     this._addType = 2;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_namespaceObject.TARGET_POINT
     });
   } //清除显示结果
 
@@ -9670,6 +9685,15 @@ class SightlineAnalysisViewModel {
     }
 
     this._pointCollection = [];
+  } // 清楚billboards
+
+
+  clearBillboards() {
+    for (var i = 0; i < this._billboards.length; i++) {
+      this._viewer.entities.remove(this._billboards[i]);
+    }
+
+    this._billboards = [];
   } //清除全部
 
 
@@ -9678,6 +9702,7 @@ class SightlineAnalysisViewModel {
 
     this.clearDisplay();
     this.clearHighlights();
+    this.clearBillboards();
     this._sightlineAnalysis && this._sightlineAnalysis.remove();
   } //销毁
 
@@ -22319,6 +22344,27 @@ class AddDataViewModel {
         cb && cb(node);
         break;
 
+      case "mvt":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dMvtImageryProviderExt({
+          name: name,
+          style: url
+        }));
+        this.flyToLayer(layer);
+        node = {
+          guid: layer.guid,
+          name: name,
+          visible: true,
+          serverType: "imagerylayer",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        cb && cb(node);
+        break;
+
       case "wms":
         this._viewer.addWMSLayerGroup(url).then(group => {
           node = {
@@ -22355,6 +22401,7 @@ class AddDataViewModel {
         break;
 
       case "wmts":
+      case "kqgistileserver":
         this._viewer.addWMTSLayerGroup(url).then(group => {
           node = {
             guid: group.guid,
@@ -22754,9 +22801,9 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
             description: language.value.imagertyDataflowServerdescription
           }, {
             type: "kqgistileserver",
-            name: language.value.KQGISTileServer + "（未实现）",
+            name: language.value.KQGISTileServer,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile/wmts",
             description: language.value.imagertyTileServerdescription
           }, {
             type: "arcgismapserver",
@@ -22792,11 +22839,11 @@ const AddDatavue_type_script_setup_true_lang_js_default_ = {
             type: "geojson",
             name: language.value.GeoJson,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ": http://<host>:<port>/xxx.geojson",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
             description: language.value.imagertyGeoJsondescription
           }, {
             type: "mvt",
-            name: language.value.MVT + "（未实现）",
+            name: language.value.MVT,
             namePlaceholder: language.value.unnamedLayer,
             urlPlaceholder: language.value.format + ":http://<host>:<port>/mvt/style.json",
             description: language.value.imagertyMVTdescription
@@ -23287,7 +23334,10 @@ class ParticleEffectViewModel {
     scenceView._viewer.clock.shouldAnimate = true;
     scenceView._viewer.scene.globe.depthTestAgainstTerrain = true;
     this._scene = scenceView._viewer.scene;
-    this._drawManager = scenceView._drawManager;
+    this._drawManager = scenceView._drawManager; // 启动连续绘制
+
+    this._drawManager.enableMultiDraw(true);
+
     _gravityScratch = new Cesium.Cartesian3();
     var that = this;
     that._removeEventListener = that._drawManager.drawFinishedEvent.addEventListener(shape => {
@@ -23390,6 +23440,8 @@ class ParticleEffectViewModel {
   clear() {
     this._drawManager.stopDraw();
 
+    this._drawManager.clear();
+
     for (let i = 0; i < this._particleSystemList.length; i++) {
       this._scene.primitives.remove(this._particleSystemList[i]);
     }
@@ -23399,7 +23451,10 @@ class ParticleEffectViewModel {
 
 
   destroy() {
-    this.clear(); //移除监听事件
+    this.clear();
+
+    this._drawManager.enableMultiDraw(false); //移除监听事件
+
 
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
@@ -24430,6 +24485,8 @@ class WeatherEffectViewModel {
   clear() {
     this._drawManager.stopDraw();
 
+    this._drawManager.clear();
+
     this._particleSystem && this._scene.primitives.remove(this._particleSystem);
     this._particleSystem = null;
   } //销毁

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"3.3.0-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.3.1-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/particleeffect/index.js

@@ -189,7 +189,10 @@ class ParticleEffectViewModel {
     scenceView._viewer.clock.shouldAnimate = true;
     scenceView._viewer.scene.globe.depthTestAgainstTerrain = true;
     this._scene = scenceView._viewer.scene;
-    this._drawManager = scenceView._drawManager;
+    this._drawManager = scenceView._drawManager; // 启动连续绘制
+
+    this._drawManager.enableMultiDraw(true);
+
     _gravityScratch = new Cesium.Cartesian3();
     var that = this;
     that._removeEventListener = that._drawManager.drawFinishedEvent.addEventListener(shape => {
@@ -292,6 +295,8 @@ class ParticleEffectViewModel {
   clear() {
     this._drawManager.stopDraw();
 
+    this._drawManager.clear();
+
     for (let i = 0; i < this._particleSystemList.length; i++) {
       this._scene.primitives.remove(this._particleSystemList[i]);
     }
@@ -301,7 +306,10 @@ class ParticleEffectViewModel {
 
 
   destroy() {
-    this.clear(); //移除监听事件
+    this.clear();
+
+    this._drawManager.enableMultiDraw(false); //移除监听事件
+
 
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;

package/scenceview/index.js

@@ -821,6 +821,27 @@ class AddDataViewModel {
         cb && cb(node);
         break;
 
+      case "mvt":
+        layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dMvtImageryProviderExt({
+          name: name,
+          style: url
+        }));
+        this.flyToLayer(layer);
+        node = {
+          guid: layer.guid,
+          name: name,
+          visible: true,
+          serverType: "imagerylayer",
+          lsType: "ls",
+          url: url,
+          addType: type
+        };
+
+        this._layerManager.addTempLayerNode(node);
+
+        cb && cb(node);
+        break;
+
       case "wms":
         this._viewer.addWMSLayerGroup(url).then(group => {
           node = {
@@ -857,6 +878,7 @@ class AddDataViewModel {
         break;
 
       case "wmts":
+      case "kqgistileserver":
         this._viewer.addWMTSLayerGroup(url).then(group => {
           node = {
             guid: group.guid,
@@ -1256,9 +1278,9 @@ const __default__ = {
             description: language.value.imagertyDataflowServerdescription
           }, {
             type: "kqgistileserver",
-            name: language.value.KQGISTileServer + "（未实现）",
+            name: language.value.KQGISTileServer,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile/wmts",
             description: language.value.imagertyTileServerdescription
           }, {
             type: "arcgismapserver",
@@ -1294,11 +1316,11 @@ const __default__ = {
             type: "geojson",
             name: language.value.GeoJson,
             namePlaceholder: language.value.unnamedLayer,
-            urlPlaceholder: language.value.format + ": http://<host>:<port>/xxx.geojson",
+            urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
             description: language.value.imagertyGeoJsondescription
           }, {
             type: "mvt",
-            name: language.value.MVT + "（未实现）",
+            name: language.value.MVT,
             namePlaceholder: language.value.unnamedLayer,
             urlPlaceholder: language.value.format + ":http://<host>:<port>/mvt/style.json",
             description: language.value.imagertyMVTdescription
@@ -14832,7 +14854,10 @@ class ParticleEffectViewModel {
     scenceView._viewer.clock.shouldAnimate = true;
     scenceView._viewer.scene.globe.depthTestAgainstTerrain = true;
     this._scene = scenceView._viewer.scene;
-    this._drawManager = scenceView._drawManager;
+    this._drawManager = scenceView._drawManager; // 启动连续绘制
+
+    this._drawManager.enableMultiDraw(true);
+
     _gravityScratch = new Cesium.Cartesian3();
     var that = this;
     that._removeEventListener = that._drawManager.drawFinishedEvent.addEventListener(shape => {
@@ -14935,6 +14960,8 @@ class ParticleEffectViewModel {
   clear() {
     this._drawManager.stopDraw();
 
+    this._drawManager.clear();
+
     for (let i = 0; i < this._particleSystemList.length; i++) {
       this._scene.primitives.remove(this._particleSystemList[i]);
     }
@@ -14944,7 +14971,10 @@ class ParticleEffectViewModel {
 
 
   destroy() {
-    this.clear(); //移除监听事件
+    this.clear();
+
+    this._drawManager.enableMultiDraw(false); //移除监听事件
+
 
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
@@ -20039,9 +20069,12 @@ var update = injectStylesIntoStyleTag_default()(divpoint/* default */.Z, options
 
 
 /* harmony default export */ var style_divpoint = (divpoint/* default.locals */.Z.locals || {});
+// EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
+var const_image_ = __webpack_require__(9702);
 ;// CONCATENATED MODULE: ./src/webgl/sightlineanalysis/SightlineAnalysisViewModel.js
 
 
+
  //通视分析逻辑类
 
 class SightlineAnalysisViewModel {
@@ -20055,6 +20088,7 @@ class SightlineAnalysisViewModel {
   //创建的divpoint集合
   //拾取的点位集合
   //高亮的障碍物的id集合
+  // 点位图标billboards集合
   constructor(scenceView, options) {
     (0,defineProperty/* default */.Z)(this, "_viewer", null);
 
@@ -20076,6 +20110,8 @@ class SightlineAnalysisViewModel {
 
     (0,defineProperty/* default */.Z)(this, "_highlightIds", []);
 
+    (0,defineProperty/* default */.Z)(this, "_billboards", []);
+
     this._viewer = scenceView._viewer;
     this._viewer.scene.postProcessStages._fxaa.enabled = true;
     this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
@@ -20101,6 +20137,8 @@ class SightlineAnalysisViewModel {
     let that = this;
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape && shape.type === "marker") {
+        that.createBillboard(shape.position);
+
         if (that._addType === 1) {
           that._sightlineAnalysis.setSeePoint(shape.position);
 
@@ -20117,6 +20155,18 @@ class SightlineAnalysisViewModel {
         that._drawManager.clear();
       }
     });
+  } // 创建图标
+
+
+  createBillboard(pos) {
+    this._billboards.push(this._viewer.entities.add({
+      position: pos,
+      billboard: {
+        image: this._addType === 1 ? const_image_.OBSERVATION_POINT : const_image_.TARGET_POINT,
+        verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+        scale: 0.15
+      }
+    }));
   } //创建点位置
 
 
@@ -20213,7 +20263,7 @@ class SightlineAnalysisViewModel {
     this._addType = 1;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_.OBSERVATION_POINT
     });
   } //添加目标点
 
@@ -20223,7 +20273,7 @@ class SightlineAnalysisViewModel {
     this._addType = 2;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_.TARGET_POINT
     });
   } //清除显示结果
 
@@ -20235,6 +20285,15 @@ class SightlineAnalysisViewModel {
     }
 
     this._pointCollection = [];
+  } // 清楚billboards
+
+
+  clearBillboards() {
+    for (var i = 0; i < this._billboards.length; i++) {
+      this._viewer.entities.remove(this._billboards[i]);
+    }
+
+    this._billboards = [];
   } //清除全部
 
 
@@ -20243,6 +20302,7 @@ class SightlineAnalysisViewModel {
 
     this.clearDisplay();
     this.clearHighlights();
+    this.clearBillboards();
     this._sightlineAnalysis && this._sightlineAnalysis.remove();
   } //销毁
 
@@ -24354,6 +24414,8 @@ class WeatherEffectViewModel {
   clear() {
     this._drawManager.stopDraw();
 
+    this._drawManager.clear();
+
     this._particleSystem && this._scene.primitives.remove(this._particleSystem);
     this._particleSystem = null;
   } //销毁
@@ -27849,16 +27911,13 @@ class ScenceViewViewModel extends (mitt_default()) {
   } //销毁
 
 
-  destroy() {
-    if (this._removeEventListener) {
-      this._removeEventListener();
-
-      this._removeEventListener = null;
-    }
-
-    this._viewer = null;
-    this._drawManager = null;
-    this._layerManager = null;
+  destroy() {// if (this._removeEventListener) {
+    //   this._removeEventListener();
+    //   this._removeEventListener = null;
+    // }
+    // this._viewer = null;
+    // this._drawManager = null;
+    // this._layerManager = null;
   } //创建底图
 
 

package/sightlineanalysis/index.js

@@ -379,6 +379,13 @@ module.exports = require("core-js/modules/es.array.includes.js");
 
 /***/ }),
 
+/***/ 9702:
+/***/ (function(module) {
+
+module.exports = require("@kq_npm/client_common_vue/_utils/const-image");
+
+/***/ }),
+
 /***/ 826:
 /***/ (function(module) {
 
@@ -542,9 +549,12 @@ var update = injectStylesIntoStyleTag_default()(divpoint/* default */.Z, options
 
 
 /* harmony default export */ var style_divpoint = (divpoint/* default.locals */.Z.locals || {});
+// EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
+var const_image_ = __webpack_require__(9702);
 ;// CONCATENATED MODULE: ./src/webgl/sightlineanalysis/SightlineAnalysisViewModel.js
 
 
+
  //通视分析逻辑类
 
 class SightlineAnalysisViewModel {
@@ -558,6 +568,7 @@ class SightlineAnalysisViewModel {
   //创建的divpoint集合
   //拾取的点位集合
   //高亮的障碍物的id集合
+  // 点位图标billboards集合
   constructor(scenceView, options) {
     (0,defineProperty/* default */.Z)(this, "_viewer", null);
 
@@ -579,6 +590,8 @@ class SightlineAnalysisViewModel {
 
     (0,defineProperty/* default */.Z)(this, "_highlightIds", []);
 
+    (0,defineProperty/* default */.Z)(this, "_billboards", []);
+
     this._viewer = scenceView._viewer;
     this._viewer.scene.postProcessStages._fxaa.enabled = true;
     this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
@@ -604,6 +617,8 @@ class SightlineAnalysisViewModel {
     let that = this;
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape && shape.type === "marker") {
+        that.createBillboard(shape.position);
+
         if (that._addType === 1) {
           that._sightlineAnalysis.setSeePoint(shape.position);
 
@@ -620,6 +635,18 @@ class SightlineAnalysisViewModel {
         that._drawManager.clear();
       }
     });
+  } // 创建图标
+
+
+  createBillboard(pos) {
+    this._billboards.push(this._viewer.entities.add({
+      position: pos,
+      billboard: {
+        image: this._addType === 1 ? const_image_.OBSERVATION_POINT : const_image_.TARGET_POINT,
+        verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+        scale: 0.15
+      }
+    }));
   } //创建点位置
 
 
@@ -716,7 +743,7 @@ class SightlineAnalysisViewModel {
     this._addType = 1;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_.OBSERVATION_POINT
     });
   } //添加目标点
 
@@ -726,7 +753,7 @@ class SightlineAnalysisViewModel {
     this._addType = 2;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_.TARGET_POINT
     });
   } //清除显示结果
 
@@ -738,6 +765,15 @@ class SightlineAnalysisViewModel {
     }
 
     this._pointCollection = [];
+  } // 清楚billboards
+
+
+  clearBillboards() {
+    for (var i = 0; i < this._billboards.length; i++) {
+      this._viewer.entities.remove(this._billboards[i]);
+    }
+
+    this._billboards = [];
   } //清除全部
 
 
@@ -746,6 +782,7 @@ class SightlineAnalysisViewModel {
 
     this.clearDisplay();
     this.clearHighlights();
+    this.clearBillboards();
     this._sightlineAnalysis && this._sightlineAnalysis.remove();
   } //销毁
 

package/weathereffect/index.js

@@ -258,6 +258,8 @@ class WeatherEffectViewModel {
   clear() {
     this._drawManager.stopDraw();
 
+    this._drawManager.clear();
+
     this._particleSystem && this._scene.primitives.remove(this._particleSystem);
     this._particleSystem = null;
   } //销毁