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

src/Global/mouseRightMenu/index.js

@@ -25,15 +25,15 @@ function MouseRightMenu(sdk, status, callBack) {
   if (eventListener[sdk.div_id].click) {
     document.removeEventListener('click', eventListener[sdk.div_id].click)
   }
-  if(!eventListener[sdk.div_id].callBack) {
+  if (!eventListener[sdk.div_id].callBack) {
     eventListener[sdk.div_id].callBack = callBack
   }
-  
-  if(sdk !== sdkD) {
+
+  if (sdk !== sdkD) {
     eventListener[sdk.div_id].mouseRightMenuEvent &&
-    eventListener[sdk.div_id].mouseRightMenuEvent.destroy()
+      eventListener[sdk.div_id].mouseRightMenuEvent.destroy()
   }
-  
+
   let menuElm = document.getElementById('custom-menu')
   if (menuElm) {
     _element.removeChild(menuElm)
@@ -87,7 +87,7 @@ function MouseRightMenu(sdk, status, callBack) {
         }
         let entityId = getEntityId(movement)
         let targetId
-        if(Object.prototype.toString.call(entityId) === '[object Object]') {
+        if (Object.prototype.toString.call(entityId) === '[object Object]') {
           targetId = entityId.id
           entityId = entityId.parentId
         }
@@ -123,7 +123,7 @@ function MouseRightMenu(sdk, status, callBack) {
         </ul>
         ${addedMenu}
       `
-      _element.appendChild(menuElm)
+        _element.appendChild(menuElm)
         let left = movement.position.x
         let top = movement.position.y
         if (
@@ -141,7 +141,7 @@ function MouseRightMenu(sdk, status, callBack) {
         menuElm.style.left = left + 'px'
         menuElm.style.top = top + 'px'
 
-        menuElm.addEventListener('contextmenu', function(event) {
+        menuElm.addEventListener('contextmenu', function (event) {
           event.preventDefault()
         })
         let liElms = menuElm.getElementsByTagName('li')
@@ -162,7 +162,7 @@ function MouseRightMenu(sdk, status, callBack) {
                 // this.rotateAround(position)
                 break
               case '属性':
-                if(targetId) {
+                if (targetId) {
                   object.id = targetId
                   object.parentId = that.options.id
                 }

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