Merge branch 'develop' of http://xny.yj-3d.com:3000/zh/sdk4.0

src/Obj/Base/BillboardObject/index.js

@@ -2344,6 +2344,9 @@ class BillboardObject extends Base {
   }
 
   async updateHeight() {
+    if(!this.sdk || !this.sdk.viewer || !this.sdk.viewer.scene) {
+      return
+    }
     let height
     let height2
     let point1 = new Cesium.Cartesian3.fromDegrees(

src/Obj/Base/FlowLine/index.js

@@ -139,6 +139,7 @@ class FlowLine extends Base {
       //创建线
       that.viewer.entities.add({
         parent: celiangEntity,
+        id: that.options.id + '-' + new Date().getTime() + index,
         polyline: {
           positions: [start, end],
           width: that.options.width,
@@ -215,6 +216,17 @@ class FlowLine extends Base {
       this.getLine(this, this.positions)
     }
   }
+  get show() {
+    return this.options.show
+  }
+
+  set show(v) {
+    this.options.show = v
+    let entity = this.viewer.entities.getById(this.options.id)
+    if (entity) {
+      entity.show = v
+    }
+  }
 
   get heightDifference() {
     return this.options.heightDifference