@kq_npm/client3d_webgl_vue 3.3.3-beta → 3.3.5-beta

package/index.js

@@ -754,7 +754,7 @@ class DrawManager {
   } //开始绘制
 
 
-  startDraw(type, options, callback) {
+  startDraw(type, options, callback, groupName) {
     this._viewer.scene.globe.depthTestAgainstTerrain = true;
 
     if (type === "point") {
@@ -782,6 +782,7 @@ class DrawManager {
     if (callback) {
       var that = this;
       var removeEventListener = this.drawFinishedEvent.addEventListener(shape => {
+        if (groupName) shape.groupName = groupName;
         that._viewer.scene.globe.depthTestAgainstTerrain = false;
         var feature = that.shapeToGeoFeature(shape);
         callback(feature.geometry);
@@ -808,6 +809,19 @@ class DrawManager {
     } else {
       this._drawHandler.editHandler.deactivate();
     }
+  } //清除绘图分组
+
+
+  clearDrawGroup(groupName) {
+    let primitives = this._drawLayer._primitives;
+
+    if (primitives && primitives.length > 0) {
+      for (let i = primitives.length - 1; i >= 0; i--) {
+        if (primitives[i].groupName === groupName) {
+          this._drawLayer.removeById(primitives[i].guid);
+        }
+      }
+    }
   } //清除全部手动绘图
 
 
@@ -9035,6 +9049,8 @@ class ModelSelectViewModel {
   //拾取状态
   //高亮三维对象
   //高亮颜色
+  // 模型属性唯一值字段集合
+  // 模型属性匹配字段
   constructor(scenceView, pickCallFunc) {
     _defineProperty(this, "_viewer", null);
 
@@ -9046,6 +9062,10 @@ class ModelSelectViewModel {
 
     _defineProperty(this, "_highlightColor", "#FF0000");
 
+    _defineProperty(this, "_modeFiledArray", null);
+
+    _defineProperty(this, "_modeFiled", "id");
+
     this._viewer = scenceView._viewer;
     this._drawManager = scenceView._drawManager;
     this._handler = new Cesium.ScreenSpaceEventHandler(this._viewer.scene.canvas);
@@ -9053,42 +9073,44 @@ class ModelSelectViewModel {
 
     this._handler.setInputAction(function (movement) {
       if (that._isPick) {
-        that.clearHighlight();
-
-        let pickedObject = that._viewer.scene.pick(movement.position); // console.log(pickedObject);
+        let pickedObject = that._viewer.scene.pick(movement.position);
 
+        console.log(pickedObject);
 
         if (pickedObject) {
           if (pickedObject instanceof Cesium.Cesium3DTileFeature) {
-            let properties = pickedObject.getPropertyNames() || []; // console.log(properties);
+            let properties = pickedObject.getPropertyNames() || [];
+            console.log(properties);
+
+            if (that._modeFiledArray && that._modeFiledArray.length && that._modeFiledArray.length > 0) {
+              for (let val in that._modeFiledArray) {
+                if (properties.indexOf(val) > -1) {
+                  that._modeFiled = val;
+                  break;
+                }
+              }
+            }
 
-            that._highlight = {
-              object: pickedObject.pickId.object,
-              color: pickedObject.pickId.object.color
-            };
-            pickedObject.pickId.object.color = Cesium.Color.fromCssColorString(that._highlightColor);
-            let attrs = {};
-            properties.forEach(prop => {
-              attrs[prop] = pickedObject.getProperty(prop);
-            });
-            pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs); // if (properties.indexOf(that._modeFiled) > -1) {
-            //   let id = pickedObject.getProperty(that._modeFiled);
-            //   // that.clear();
-            //   that._highlight = new Cesium.Kq3dHighlight({
-            //     viewer: that._viewer,
-            //     tileset: pickedObject.tileset,
-            //     attrName: that._modeFiled,
-            //     attrValue: [id],
-            //     color: [Cesium.Color.RED]
-            //   });
-            //   let attrs = {};
-            //   properties.forEach(prop => {
-            //     attrs[prop] = pickedObject.getProperty(prop);
-            //   });
-            //   pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs);
-            // } else {
-            //   console.log("Feature has no id attribute!");
-            // }
+            if (properties.indexOf(that._modeFiled) > -1) {
+              let id = pickedObject.getProperty(that._modeFiled); // that.clear();
+
+              that._highlight = new Cesium.Kq3dHighlight({
+                viewer: that._viewer,
+                tileset: pickedObject.tileset,
+                attrName: that._modeFiled,
+                attrValue: [id],
+                color: [Cesium.Color.fromCssColorString(that._highlightColor)]
+              });
+              let attrs = {};
+              properties.forEach(prop => {
+                attrs[prop] = pickedObject.getProperty(prop);
+              });
+              pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs);
+            } else {
+              console.log("Feature has no id attribute!");
+            }
+          } else {
+            console.log("no Cesium3DTileFeature!");
           }
         }
       }
@@ -9120,21 +9142,12 @@ class ModelSelectViewModel {
         type: "warning"
       });
     }
-  }
-
-  clearHighlight() {
-    if (this._highlight) {
-      this._highlight.object.color = this._highlight.color;
-    }
-
-    this._highlight = null;
   } //清除
 
 
   clear() {
-    this.clearHighlight(); // this._highlight && this._highlight.remove();
-    // this._highlight = null;
-
+    this._highlight && this._highlight.remove();
+    this._highlight = null;
     this.setCursor("default");
     this._isPick = false;
   } //销毁
@@ -9181,6 +9194,13 @@ const ModelSelectvue_type_script_setup_true_lang_js_default_ = {
       type: String,
       default: "#FF0000"
     },
+    // 模型属性唯一值字段集合
+    modeFiledArray: {
+      type: Array,
+      default: () => {
+        return null;
+      }
+    },
     // 是否显示阴影效果
     showShadow: {
       type: Boolean,
@@ -9258,6 +9278,7 @@ const ModelSelectvue_type_script_setup_true_lang_js_default_ = {
           language.value = scenceView._language;
           viewModel = new ModelSelectViewModel(scenceView, pickCallFunc);
           viewModel._highlightColor = props.highlightColor;
+          viewModel._modeFiledArray = props.modeFiledArray;
         }
       });
     });
@@ -9561,12 +9582,14 @@ class SightlineAnalysisViewModel {
 
 
   createBillboard(pos) {
+    if (this._addType == 1) this.clearBillboards("marker" + this._addType);
+
     this._billboards.push(this._viewer.entities.add({
       position: pos,
+      name: "marker" + this._addType,
       billboard: {
         image: this._addType === 1 ? const_image_namespaceObject.OBSERVATION_POINT : const_image_namespaceObject.TARGET_POINT,
         verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-        scale: 0.15,
         disableDepthTestDistance: Number.POSITIVE_INFINITY
       }
     }));
@@ -9691,12 +9714,16 @@ class SightlineAnalysisViewModel {
   } // 清楚billboards
 
 
-  clearBillboards() {
+  clearBillboards(val) {
     for (var i = 0; i < this._billboards.length; i++) {
-      this._viewer.entities.remove(this._billboards[i]);
+      if (val) {
+        if (this._billboards[i].name == val) this._viewer.entities.remove(this._billboards[i]);
+      } else {
+        this._viewer.entities.remove(this._billboards[i]);
+      }
     }
 
-    this._billboards = [];
+    if (!val) this._billboards = [];
   } //清除全部
 
 

package/modelselect/index.js

@@ -185,6 +185,8 @@ class ModelSelectViewModel {
   //拾取状态
   //高亮三维对象
   //高亮颜色
+  // 模型属性唯一值字段集合
+  // 模型属性匹配字段
   constructor(scenceView, pickCallFunc) {
     (0,defineProperty/* default */.Z)(this, "_viewer", null);
 
@@ -196,6 +198,10 @@ class ModelSelectViewModel {
 
     (0,defineProperty/* default */.Z)(this, "_highlightColor", "#FF0000");
 
+    (0,defineProperty/* default */.Z)(this, "_modeFiledArray", null);
+
+    (0,defineProperty/* default */.Z)(this, "_modeFiled", "id");
+
     this._viewer = scenceView._viewer;
     this._drawManager = scenceView._drawManager;
     this._handler = new Cesium.ScreenSpaceEventHandler(this._viewer.scene.canvas);
@@ -203,42 +209,44 @@ class ModelSelectViewModel {
 
     this._handler.setInputAction(function (movement) {
       if (that._isPick) {
-        that.clearHighlight();
-
-        let pickedObject = that._viewer.scene.pick(movement.position); // console.log(pickedObject);
+        let pickedObject = that._viewer.scene.pick(movement.position);
 
+        console.log(pickedObject);
 
         if (pickedObject) {
           if (pickedObject instanceof Cesium.Cesium3DTileFeature) {
-            let properties = pickedObject.getPropertyNames() || []; // console.log(properties);
-
-            that._highlight = {
-              object: pickedObject.pickId.object,
-              color: pickedObject.pickId.object.color
-            };
-            pickedObject.pickId.object.color = Cesium.Color.fromCssColorString(that._highlightColor);
-            let attrs = {};
-            properties.forEach(prop => {
-              attrs[prop] = pickedObject.getProperty(prop);
-            });
-            pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs); // if (properties.indexOf(that._modeFiled) > -1) {
-            //   let id = pickedObject.getProperty(that._modeFiled);
-            //   // that.clear();
-            //   that._highlight = new Cesium.Kq3dHighlight({
-            //     viewer: that._viewer,
-            //     tileset: pickedObject.tileset,
-            //     attrName: that._modeFiled,
-            //     attrValue: [id],
-            //     color: [Cesium.Color.RED]
-            //   });
-            //   let attrs = {};
-            //   properties.forEach(prop => {
-            //     attrs[prop] = pickedObject.getProperty(prop);
-            //   });
-            //   pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs);
-            // } else {
-            //   console.log("Feature has no id attribute!");
-            // }
+            let properties = pickedObject.getPropertyNames() || [];
+            console.log(properties);
+
+            if (that._modeFiledArray && that._modeFiledArray.length && that._modeFiledArray.length > 0) {
+              for (let val in that._modeFiledArray) {
+                if (properties.indexOf(val) > -1) {
+                  that._modeFiled = val;
+                  break;
+                }
+              }
+            }
+
+            if (properties.indexOf(that._modeFiled) > -1) {
+              let id = pickedObject.getProperty(that._modeFiled); // that.clear();
+
+              that._highlight = new Cesium.Kq3dHighlight({
+                viewer: that._viewer,
+                tileset: pickedObject.tileset,
+                attrName: that._modeFiled,
+                attrValue: [id],
+                color: [Cesium.Color.fromCssColorString(that._highlightColor)]
+              });
+              let attrs = {};
+              properties.forEach(prop => {
+                attrs[prop] = pickedObject.getProperty(prop);
+              });
+              pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs);
+            } else {
+              console.log("Feature has no id attribute!");
+            }
+          } else {
+            console.log("no Cesium3DTileFeature!");
           }
         }
       }
@@ -270,21 +278,12 @@ class ModelSelectViewModel {
         type: "warning"
       });
     }
-  }
-
-  clearHighlight() {
-    if (this._highlight) {
-      this._highlight.object.color = this._highlight.color;
-    }
-
-    this._highlight = null;
   } //清除
 
 
   clear() {
-    this.clearHighlight(); // this._highlight && this._highlight.remove();
-    // this._highlight = null;
-
+    this._highlight && this._highlight.remove();
+    this._highlight = null;
     this.setCursor("default");
     this._isPick = false;
   } //销毁
@@ -335,6 +334,13 @@ const __default__ = {
       type: String,
       default: "#FF0000"
     },
+    // 模型属性唯一值字段集合
+    modeFiledArray: {
+      type: Array,
+      default: () => {
+        return null;
+      }
+    },
     // 是否显示阴影效果
     showShadow: {
       type: Boolean,
@@ -412,6 +418,7 @@ const __default__ = {
           language.value = scenceView._language;
           viewModel = new ModelSelectViewModel(scenceView, pickCallFunc);
           viewModel._highlightColor = props.highlightColor;
+          viewModel._modeFiledArray = props.modeFiledArray;
         }
       });
     });

package/package.json

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

@@ -14375,6 +14375,8 @@ class ModelSelectViewModel {
   //拾取状态
   //高亮三维对象
   //高亮颜色
+  // 模型属性唯一值字段集合
+  // 模型属性匹配字段
   constructor(scenceView, pickCallFunc) {
     (0,defineProperty/* default */.Z)(this, "_viewer", null);
 
@@ -14386,6 +14388,10 @@ class ModelSelectViewModel {
 
     (0,defineProperty/* default */.Z)(this, "_highlightColor", "#FF0000");
 
+    (0,defineProperty/* default */.Z)(this, "_modeFiledArray", null);
+
+    (0,defineProperty/* default */.Z)(this, "_modeFiled", "id");
+
     this._viewer = scenceView._viewer;
     this._drawManager = scenceView._drawManager;
     this._handler = new Cesium.ScreenSpaceEventHandler(this._viewer.scene.canvas);
@@ -14393,42 +14399,44 @@ class ModelSelectViewModel {
 
     this._handler.setInputAction(function (movement) {
       if (that._isPick) {
-        that.clearHighlight();
-
-        let pickedObject = that._viewer.scene.pick(movement.position); // console.log(pickedObject);
+        let pickedObject = that._viewer.scene.pick(movement.position);
 
+        console.log(pickedObject);
 
         if (pickedObject) {
           if (pickedObject instanceof Cesium.Cesium3DTileFeature) {
-            let properties = pickedObject.getPropertyNames() || []; // console.log(properties);
+            let properties = pickedObject.getPropertyNames() || [];
+            console.log(properties);
+
+            if (that._modeFiledArray && that._modeFiledArray.length && that._modeFiledArray.length > 0) {
+              for (let val in that._modeFiledArray) {
+                if (properties.indexOf(val) > -1) {
+                  that._modeFiled = val;
+                  break;
+                }
+              }
+            }
 
-            that._highlight = {
-              object: pickedObject.pickId.object,
-              color: pickedObject.pickId.object.color
-            };
-            pickedObject.pickId.object.color = Cesium.Color.fromCssColorString(that._highlightColor);
-            let attrs = {};
-            properties.forEach(prop => {
-              attrs[prop] = pickedObject.getProperty(prop);
-            });
-            pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs); // if (properties.indexOf(that._modeFiled) > -1) {
-            //   let id = pickedObject.getProperty(that._modeFiled);
-            //   // that.clear();
-            //   that._highlight = new Cesium.Kq3dHighlight({
-            //     viewer: that._viewer,
-            //     tileset: pickedObject.tileset,
-            //     attrName: that._modeFiled,
-            //     attrValue: [id],
-            //     color: [Cesium.Color.RED]
-            //   });
-            //   let attrs = {};
-            //   properties.forEach(prop => {
-            //     attrs[prop] = pickedObject.getProperty(prop);
-            //   });
-            //   pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs);
-            // } else {
-            //   console.log("Feature has no id attribute!");
-            // }
+            if (properties.indexOf(that._modeFiled) > -1) {
+              let id = pickedObject.getProperty(that._modeFiled); // that.clear();
+
+              that._highlight = new Cesium.Kq3dHighlight({
+                viewer: that._viewer,
+                tileset: pickedObject.tileset,
+                attrName: that._modeFiled,
+                attrValue: [id],
+                color: [Cesium.Color.fromCssColorString(that._highlightColor)]
+              });
+              let attrs = {};
+              properties.forEach(prop => {
+                attrs[prop] = pickedObject.getProperty(prop);
+              });
+              pickCallFunc && pickCallFunc(pickedObject.tileset.name || "LayerName", attrs);
+            } else {
+              console.log("Feature has no id attribute!");
+            }
+          } else {
+            console.log("no Cesium3DTileFeature!");
           }
         }
       }
@@ -14460,21 +14468,12 @@ class ModelSelectViewModel {
         type: "warning"
       });
     }
-  }
-
-  clearHighlight() {
-    if (this._highlight) {
-      this._highlight.object.color = this._highlight.color;
-    }
-
-    this._highlight = null;
   } //清除
 
 
   clear() {
-    this.clearHighlight(); // this._highlight && this._highlight.remove();
-    // this._highlight = null;
-
+    this._highlight && this._highlight.remove();
+    this._highlight = null;
     this.setCursor("default");
     this._isPick = false;
   } //销毁
@@ -14525,6 +14524,13 @@ const __default__ = {
       type: String,
       default: "#FF0000"
     },
+    // 模型属性唯一值字段集合
+    modeFiledArray: {
+      type: Array,
+      default: () => {
+        return null;
+      }
+    },
     // 是否显示阴影效果
     showShadow: {
       type: Boolean,
@@ -14602,6 +14608,7 @@ const __default__ = {
           language.value = scenceView._language;
           viewModel = new ModelSelectViewModel(scenceView, pickCallFunc);
           viewModel._highlightColor = props.highlightColor;
+          viewModel._modeFiledArray = props.modeFiledArray;
         }
       });
     });
@@ -20162,12 +20169,14 @@ class SightlineAnalysisViewModel {
 
 
   createBillboard(pos) {
+    if (this._addType == 1) this.clearBillboards("marker" + this._addType);
+
     this._billboards.push(this._viewer.entities.add({
       position: pos,
+      name: "marker" + this._addType,
       billboard: {
         image: this._addType === 1 ? const_image_.OBSERVATION_POINT : const_image_.TARGET_POINT,
         verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-        scale: 0.15,
         disableDepthTestDistance: Number.POSITIVE_INFINITY
       }
     }));
@@ -20292,12 +20301,16 @@ class SightlineAnalysisViewModel {
   } // 清楚billboards
 
 
-  clearBillboards() {
+  clearBillboards(val) {
     for (var i = 0; i < this._billboards.length; i++) {
-      this._viewer.entities.remove(this._billboards[i]);
+      if (val) {
+        if (this._billboards[i].name == val) this._viewer.entities.remove(this._billboards[i]);
+      } else {
+        this._viewer.entities.remove(this._billboards[i]);
+      }
     }
 
-    this._billboards = [];
+    if (!val) this._billboards = [];
   } //清除全部
 
 
@@ -26058,7 +26071,7 @@ class DrawManager {
   } //开始绘制
 
 
-  startDraw(type, options, callback) {
+  startDraw(type, options, callback, groupName) {
     this._viewer.scene.globe.depthTestAgainstTerrain = true;
 
     if (type === "point") {
@@ -26086,6 +26099,7 @@ class DrawManager {
     if (callback) {
       var that = this;
       var removeEventListener = this.drawFinishedEvent.addEventListener(shape => {
+        if (groupName) shape.groupName = groupName;
         that._viewer.scene.globe.depthTestAgainstTerrain = false;
         var feature = that.shapeToGeoFeature(shape);
         callback(feature.geometry);
@@ -26112,6 +26126,19 @@ class DrawManager {
     } else {
       this._drawHandler.editHandler.deactivate();
     }
+  } //清除绘图分组
+
+
+  clearDrawGroup(groupName) {
+    let primitives = this._drawLayer._primitives;
+
+    if (primitives && primitives.length > 0) {
+      for (let i = primitives.length - 1; i >= 0; i--) {
+        if (primitives[i].groupName === groupName) {
+          this._drawLayer.removeById(primitives[i].guid);
+        }
+      }
+    }
   } //清除全部手动绘图
 
 

package/sightlineanalysis/index.js

@@ -642,12 +642,14 @@ class SightlineAnalysisViewModel {
 
 
   createBillboard(pos) {
+    if (this._addType == 1) this.clearBillboards("marker" + this._addType);
+
     this._billboards.push(this._viewer.entities.add({
       position: pos,
+      name: "marker" + this._addType,
       billboard: {
         image: this._addType === 1 ? const_image_.OBSERVATION_POINT : const_image_.TARGET_POINT,
         verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-        scale: 0.15,
         disableDepthTestDistance: Number.POSITIVE_INFINITY
       }
     }));
@@ -772,12 +774,16 @@ class SightlineAnalysisViewModel {
   } // 清楚billboards
 
 
-  clearBillboards() {
+  clearBillboards(val) {
     for (var i = 0; i < this._billboards.length; i++) {
-      this._viewer.entities.remove(this._billboards[i]);
+      if (val) {
+        if (this._billboards[i].name == val) this._viewer.entities.remove(this._billboards[i]);
+      } else {
+        this._viewer.entities.remove(this._billboards[i]);
+      }
     }
 
-    this._billboards = [];
+    if (!val) this._billboards = [];
   } //清除全部