Merge branch 'v1.2.0-ga' of http://192.168.0.115:3000/bill/fuse-code into v1.2.0-ga

public/lib/potree/potree.js

@@ -49477,7 +49477,7 @@
 	        this.titleLabel.sprite.material.opacity = state ? 0.5 : 1;
 	      };
 	      var autoPointState = () => {
-	        setDragPointState(hoverState.lineDragPoint || grabbingObject == 'lineDragPoint');
+	        setDragPointState(this.editEnable && (hoverState.lineDragPoint || grabbingObject == 'lineDragPoint'));
 	      };
 	      var autoCursor = () => {
 	        if (this.editEnable && Object.values(hoverState).some(e => e)) {
@@ -49496,14 +49496,12 @@
 	        autoCursor();
 	      }));
 	      [line, this.lineDragPoint].forEach(e => e.addEventListener('startDragging', e => {
-	        this.editEnable && CursorDeal.add('grabbing');
 	        grabbingObject = e.target.name;
-	        autoPointState();
+	        this.editEnable && (CursorDeal.add('grabbing'), autoPointState());
 	      }));
 	      [line, this.lineDragPoint].forEach(e => e.addEventListener('drop', e => {
-	        this.editEnable && CursorDeal.remove('grabbing');
 	        grabbingObject = null;
-	        autoPointState();
+	        this.editEnable && (CursorDeal.remove('grabbing'), autoPointState());
 	      }));
 	      [line, this.lineDragPoint].forEach(e => e.addEventListener('drag', e => {
 	        if (this.editEnable) {
@@ -49796,6 +49794,7 @@
 	    viewer.dispatchEvent('content_changed');
 	  }
 	  setLineHeight(len) {
+	    if (len == this.lineHeight) return;
 	    this.lineHeight = parseFloat(len);
 	    this.titleLabel.position.z = this.lineHeight;
 	    this.titleLabel.updatePose();
@@ -61247,6 +61246,7 @@
 	    viewer.dispatchEvent('content_changed');
 	  }
 	  changeLineLen(len) {
+	    if (len == this.lineLength) return;
 	    this.lineLength = parseFloat(len);
 	    this.updatePose();
 	  }

src/sdk/cover/index.js

@@ -1422,7 +1422,9 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                       globalVisibility: boolean;   是否全局可视
                       visibilityRange: number;  */
                     console.log('添加动画文件',data)
-                      
+                    let update = ()=>{
+                        AnimationEditor.at(AnimationEditor.cursorTime || 0,null,true)
+                    }  
                     let model
                     let prop = {
                         url: data.url,
@@ -1452,7 +1454,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                         model.addEventListener('transformChanged',updateVisiByRange)
                         model.result_ = result
                         setTimeout(e=>{
-                           AnimationEditor.at(AnimationEditor.cursorTime || 0,null,true)  //计算下默认姿态
+                             update()//计算下默认姿态
                         },1)
                     }) 
                     
@@ -1498,15 +1500,18 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                             return {
                                 destroy(){ 
                                     AnimationEditor.removeKey(model,'pose', key)
+                                    update()
                                 },
                                 changeTime(time){
                                     if(time==key.time)return
                                     key.time = time
                                     AnimationEditor.reOrderKey(model, 'pose', key) 
+                                    update()
                                 },
                                 setMat(data){//设置帧
                                     //console.log('设置帧',data.scale)
                                     Object.assign(key,getData(data)) 
+                                    update()
                                 }
                             } 
                         },
@@ -1535,20 +1540,26 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                             return {
                                 destroy(){ 
                                     AnimationEditor.removeKey(model,'clip', key)
+                                    update()
                                 },
                                 changeTime(time){
                                     if(time==key.time)return
                                     key.time = time
                                     AnimationEditor.reOrderKey(model, 'clip', key)
+                                    update()
                                 },
                                 changeDuration(dur){ 
                                     key.dur = dur
+                                    AnimationEditor.updateTimeRange()
+                                    update()
                                 },
                                 changeAmplitude(weight){//修改动作幅度
                                     key.weight = weight
+                                    update()
                                 },
                                 changeSpeed(speed){
                                     key.speed = speed
+                                    update()
                                 }
                             } 
                         },
@@ -1565,20 +1576,26 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                             return {
                                 destroy(){ 
                                     AnimationEditor.removeKey(model, 'path', key)
+                                    update()
                                 },
                                 changeTime(time){
                                     if(time==key.time)return
                                     key.time = time
                                     AnimationEditor.reOrderKey(model, 'path', key)
+                                    update()
                                 },
                                 changeDuration(dur){ 
                                     key.dur = dur
+                                    AnimationEditor.updateTimeRange()
+                                    update()
                                 },
                                 changeReverse(reverse){ 
                                     key.reverse = reverse
+                                    update()
                                 },
                                 changePath(path){
                                     key.path = path.path
+                                    update()
                                 }
                             }  
   
@@ -1757,9 +1774,8 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
             
         
             let path
-            let info = {type : 'Path', minMarkers : 2, title:props.name}
-             
-                 
+            let info = {type : 'Path', minMarkers : 2, title:props.name, lineHeight : props.line.altitudeAboveGround }
+           
             if(props.points.length == 0){
                 path = viewer.measuringTool.startInsertion( info, () => { 
                     bus.emit("drawed" ); //完成   
@@ -1772,6 +1788,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                 info.points_datasets = props.points.map(e=> e.modelId == Id_noIntersect ? null : e.modelId) 
                 info.dataset_points = info.points = props.points.map(e=>e.position)//当该点不在任何模型上时，记录的是世界坐标，所以两个都赋值，过后根据有无datasetID选择
                 
+                
                 path = viewer.measuringTool.createMeasureFromData(info);
             
                 if(props.line.position) { 
@@ -1816,7 +1833,7 @@ export const enter = ({ dom, mapDom, isLocal, lonlat, scenes, laserRoot, laserOS
                 })
                 
                 path.addEventListener('dragLineLen',(e)=>{ 
-                    bus.emit('changeLineHeight', path.lineLength) 
+                    bus.emit('changeLineHeight', path.lineHeight) 
                 })
                  
             }