提交

src/Obj/Base/ParticleEffects/Fountain/index.js

@@ -9,7 +9,7 @@ import MouseEvent from '../../../../Event/index'
 import { syncData, getSdk as get2DSdk } from '../../../../Global/MultiViewportMode'
 import MouseTip from '../../../../MouseTip'
 import { setSplitDirection, syncSplitData, setActiveId } from '../../../../Global/SplitScreen'
-import { setActiveViewer, closeRotateAround, closeViewFollow} from '../../../../Global/global'
+import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../../Global/global'
 
 class Fountain extends Base {
   /**
@@ -110,7 +110,7 @@ class Fountain extends Base {
           this.label.show = false
         }
       }
-      if(this._DialogObject && this._DialogObject.showBtn) {
+      if (this._DialogObject && this._DialogObject.showBtn) {
         this._DialogObject.showBtn.checked = v
       }
       syncData(this.sdk, this.options.id)
@@ -197,7 +197,7 @@ class Fountain extends Base {
     this.entity.position = { lng: this.options.lng, lat: this.options.lat, alt: this.options.alt }
     // this.editObj = new EditParticle(this.sdk, this.entity)
     syncData(this.sdk, this.options.id)
-    if(this.options.show) {
+    if (this.options.show) {
       setSplitDirection(0, this.options.id)
     }
 
@@ -221,7 +221,7 @@ class Fountain extends Base {
     }
     setActiveViewer(0)
     closeRotateAround(this.sdk)
-  closeViewFollow(this.sdk)
+    closeViewFollow(this.sdk)
 
     if (this.options.customView && this.options.customView.relativePosition && this.options.customView.orientation) {
       let orientation = {
@@ -485,6 +485,7 @@ class Fountain extends Base {
    * @param state=false {boolean} 状态: true打开, false关闭
    */
   async edit(state = false) {
+    return
     let _this = this
     this.originalOptions = this.deepCopyObj(this.options)
 
@@ -667,7 +668,7 @@ class Fountain extends Base {
         )
       })
       this.event.mouse_left((movement, cartesian) => {
-        if(!movPos || movPos.x !== movement.position.x || movPos.y !== movement.position.y-2) {
+        if (!movPos || movPos.x !== movement.position.x || movPos.y !== movement.position.y - 2) {
           let positions = this.cartesian3Towgs84(cartesian, this.sdk.viewer)
           this.options.lng = positions.lng
           this.options.lat = positions.lat
@@ -683,6 +684,10 @@ class Fountain extends Base {
         this.event.mouse_right(() => { })
         this.event.gesture_pinck_start(() => { })
         this.event.gesture_pinck_end(() => { })
+        if(this._positionEditingCallback) {
+          this._positionEditingCallback()
+          this._positionEditingCallback = null
+        }
         this.positionEditing = false
       })
       this.event.mouse_right((movement, cartesian) => {
@@ -733,7 +738,7 @@ class Fountain extends Base {
         this.event.gesture_pinck_end(() => { })
       }
       this.tip && this.tip.destroy()
-      if(!this.sdk || !this.sdk.viewer || !this.entity) {
+      if (!this.sdk || !this.sdk.viewer || !this.entity) {
         return
       }
       this.options.lng = this.entity.position.lng
@@ -759,6 +764,15 @@ class Fountain extends Base {
     return this.operate.positionEditing
   }
 
+  openPositionEditing(cd) {
+    this.positionEditing = true
+    this._positionEditingCallback = cd
+  }
+  closePositionEditing() {
+    this.positionEditing = false
+    this._positionEditingCallback = null
+  }
+
   flicker() { }
 }