@kq_npm/client3d_webgl_vue 3.2.9-beta → 3.3.1-beta

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
@@ -14471,17 +14493,14 @@ var util_ = __webpack_require__(9519);
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/modelselect/ModelSelect.vue?vue&type=script&setup=true&lang=js
 
 const _hoisted_1 = {
-  class: "kq3d-model-select-box"
-};
-const _hoisted_2 = {
   class: "title"
 };
 
-const _hoisted_3 = /*#__PURE__*/(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, "所属图层名称：", -1
+const _hoisted_2 = /*#__PURE__*/(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, "所属图层名称：", -1
 /* HOISTED */
 );
 
-const _hoisted_4 = {
+const _hoisted_3 = {
   class: "footer-buttons"
 };
 
@@ -14551,7 +14570,8 @@ const __default__ = {
     let tableData = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)([]); //语言
 
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({});
-    let viewModel = null; // 获取组件传参
+    let viewModel = null;
+    let ref_box = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(); // 获取组件传参
     // 表格头样式
 
     let headClass = args => {
@@ -14669,15 +14689,20 @@ const __default__ = {
         ref: headerTempRef
       }, null, 512
       /* NEED_PATCH */
-      )) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)("v-if", true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_1, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
-        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_2, [_hoisted_3, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(layerNameTitle)), 1
+      )) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)("v-if", true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", {
+        class: "kq3d-model-select-box",
+        ref_key: "ref_box",
+        ref: ref_box
+      }, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_1, [_hoisted_2, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("span", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(layerNameTitle)), 1
         /* TEXT */
         )])]),
         _: 1
         /* STABLE */
 
       }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, {
-        class: "modelTable"
+        class: "modelTable",
+        style: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.normalizeStyle)(__props.showHeaderTemp ? 'height: calc(100% - 70px)' : 'height: calc(100% - 35px)')
       }, {
         default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_table, {
           border: "",
@@ -14714,7 +14739,9 @@ const __default__ = {
         _: 1
         /* STABLE */
 
-      }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_4, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
+      }, 8
+      /* PROPS */
+      , ["style"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_3, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
         onClick: _cache[0] || (_cache[0] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => pick(), ["stop"])),
         title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).pick,
         type: "primary"
@@ -14739,7 +14766,9 @@ const __default__ = {
 
       }, 8
       /* PROPS */
-      , ["title"])])])], 2
+      , ["title"])])], 512
+      /* NEED_PATCH */
+      )], 2
       /* CLASS */
       );
     };
@@ -14825,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 => {
@@ -14928,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]);
     }
@@ -14937,7 +14971,10 @@ class ParticleEffectViewModel {
 
 
   destroy() {
-    this.clear(); //移除监听事件
+    this.clear();
+
+    this._drawManager.enableMultiDraw(false); //移除监听事件
+
 
     this._removeEventListener && this._removeEventListener();
     this._removeEventListener = null;
@@ -20032,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 {
@@ -20048,6 +20088,7 @@ class SightlineAnalysisViewModel {
   //创建的divpoint集合
   //拾取的点位集合
   //高亮的障碍物的id集合
+  // 点位图标billboards集合
   constructor(scenceView, options) {
     (0,defineProperty/* default */.Z)(this, "_viewer", null);
 
@@ -20069,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; //开启深度检测
@@ -20094,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);
 
@@ -20110,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
+      }
+    }));
   } //创建点位置
 
 
@@ -20206,7 +20263,7 @@ class SightlineAnalysisViewModel {
     this._addType = 1;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_.OBSERVATION_POINT
     });
   } //添加目标点
 
@@ -20216,7 +20273,7 @@ class SightlineAnalysisViewModel {
     this._addType = 2;
 
     this._drawManager.startDraw("point", {
-      image: null
+      image: const_image_.TARGET_POINT
     });
   } //清除显示结果
 
@@ -20228,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 = [];
   } //清除全部
 
 
@@ -20236,6 +20302,7 @@ class SightlineAnalysisViewModel {
 
     this.clearDisplay();
     this.clearHighlights();
+    this.clearBillboards();
     this._sightlineAnalysis && this._sightlineAnalysis.remove();
   } //销毁
 
@@ -24347,6 +24414,8 @@ class WeatherEffectViewModel {
   clear() {
     this._drawManager.stopDraw();
 
+    this._drawManager.clear();
+
     this._particleSystem && this._scene.primitives.remove(this._particleSystem);
     this._particleSystem = null;
   } //销毁
@@ -27842,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();
   } //销毁