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

src/Obj/Base/TextBox/index.js

@@ -33,7 +33,7 @@ class TextBox extends Base {
 
     this.callback = callback
 
-    // syncData(this.sdk, this.options.id)
+    syncData(this.sdk, this.options.id)
 
   }
 
@@ -134,15 +134,17 @@ class TextBox extends Base {
   }
   async getwords(words) {
     this.options.text = words
-    this.callback(this.options)
+
     let { sdkP } = getSdk()
     if (this.sdk === sdkP && sdkP) {//三维
+      this.callback(this.options)
       syncData(this.sdk, this.options.id)
     }
     else if (sdkP) {//二维
       sdkP.entityMap.get(this.options.id).text = words
       sdkP.entityMap.get(this.options.id).twoToThree(this.options.position)
     } else if (!sdkP) {
+      this.callback(this.options)
       syncData(this.sdk, this.options.id)
     }
   }
@@ -283,6 +285,7 @@ class TextBox extends Base {
       this.sdk.viewer.cesiumWidget.container.removeChild(this.textDom);
     }
     await this.sdk.removeIncetance(this.options.id)
+    syncData(this.sdk, this.options.id)
   }
 
   flicker() { }

src/Obj/Base/TrajectoryMotion/index.js

@@ -2324,7 +2324,7 @@ class TrajectoryMotion extends Base {
       this.model && (this.model.show = false)
     }
     this.labelShow = this.originalOptions.label.show
-    this.fuelLabelShow = this.originalOptions.fuelShow
+    this.fuelShow = this.originalOptions.fuelShow
     this.labelColor = this.originalOptions.label.color
     this.labelFontSize = this.originalOptions.label.fontSize
     this.labelFontFamily = this.originalOptions.label.fontFamily

src/YJEarth/index.js

@@ -443,8 +443,14 @@ class YJEarth {
           _this.entityMap.get(_this.clickTextDom.id).isClick(movement.position, _this.clickTextDom.id)
 
           _this.blurFun = () => {
-            _this.entityMap.get(_this.clickTextDom.id).isClick((movement && movement.position) || null, _this.clickTextDom.id)
+            // let { sdkP } = getSdk()
+            // if (_this == sdkP && sdkP) {//二维
+            //   _this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value)
+            // } else if (!sdkP) {
             _this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value)
+            // }
+
+            _this.clickTextDom.querySelector('textarea').removeEventListener('blur', _this.blurFun)
           }
           _this.clickTextDom.querySelector('textarea').addEventListener('blur', _this.blurFun)
           break;
@@ -501,7 +507,7 @@ class YJEarth {
         _this.clickTextDom.removeEventListener('mousedown', mousedown);
         _this.viewer._element.removeEventListener('mousemove', mousemove);
         _this.viewer._element.removeEventListener('mouseup', mouseup);
-        _this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value)
+        // _this.entityMap.get(_this.clickTextDom.id).getwords(_this.clickTextDom.getElementsByTagName('textarea')[0].value)
 
         _this.clickTextDom.style['pointer-events'] = 'none'
         _this.clickTextDom = undefined