修复分块上传路径拼接使用错误变量的问题

优化应急中的操作： 取消模型不可见的外框可以被选中的问题。 增加右键取消高亮的功能。 非选中状态下，不再允许拖拽。

src/app/babylon/controller/event-manager/event-manager.ts

@@ -74,7 +74,6 @@ export class EventManager {
 
         let instance = EventManager.getEvent<T>(c);
 
-        console.log("添加监听", instance.key);
         return instance.observable.add(callback, mask, insertFirst, scope, unregisterOnFirstCall);
     }
 
@@ -136,7 +135,6 @@ class EventContainer<T extends Event_Base> {
 
         //this.key = c.name;
         this.key = obj.getTypeKey();
-        console.log("EventContainer===" + this.key);
         this.observable = new Observable<T>();
     }
 }

src/app/babylon/controller/serve-manager.ts

@@ -213,9 +213,10 @@ export class ServeManager {
                 let dataObj = data as any;
                 let fileName = dataObj.fileName;
                 let filePath: string = dataObj.objectName;//此路径不全，前面缺少ObjectsService.baseUrl，这部分不可序列化，要在运行时拼接
-                //console.log("上传完成，地址为", filePath);
+
                 filePath = filePath.replace(fileName, "");//去掉结尾的文件名
                 //filePath = ObjectsService.baseUrl + filePath;
+                console.log("上传完成，地址为", filePath, fileName);
                 ServeManager.instance.onGetPostFileResult(fileName, filePath, file);
                 resolve('success')
             });
@@ -243,7 +244,8 @@ export class ServeManager {
         ServeManager.instance.objectsSrv.postFile_MultipartUpload(this.postFilePath, file).then((value) => {
             let dataObj = value as any;
             console.log("分块上传完成", dataObj.filePath);
-            dataObj.filePath = dataObj.filePath.replace(dataObj.name, ""); //去掉结尾的文件名
+            dataObj.filePath = dataObj.filePath.replace(dataObj.fileName, ""); //去掉结尾的文件名
+            console.log(dataObj.filePath, dataObj.fileName, dataObj.name);
             ServeManager.instance.onGetPostFileResult(dataObj.fileName, dataObj.filePath, file);
         });
 

src/app/babylon/model/info/mark/model-info-mark.ts

@@ -207,12 +207,13 @@ export class ModelInfo_mark extends ModelInfo {
                 })
             }
             else {
-                //this.pointerDragBehavior.enabled = true;
+                this.pointerDragBehavior.enabled = true;
             }
 
-            //特效类、灭火器类，要出现坐标轴
+            //特效类、灭火器类、文字标注，要出现坐标轴
             if (this.markData.markKindType == MarkKindType.Effect
-                || TsTool.stringContain(this.markData.type, "MHQ")) {
+                || TsTool.stringContain(this.markData.type, "MHQ")
+                || this.markData.type == MarkType.WZ) {
                 GizmoTool.onPickMeshInfoObservable.notifyObservers(this);
             }
             else {
@@ -227,7 +228,7 @@ export class ModelInfo_mark extends ModelInfo {
             //GizmoTool.onPickMeshInfoObservable.notifyObservers(null);
             SceneManager.Instance.removeFromHighLight(this.modelBox as Mesh)
             if (this.pointerDragBehavior != null) {
-                //this.pointerDragBehavior.enabled = false; //停止拖拽
+                this.pointerDragBehavior.enabled = false; //停止拖拽
             }
         }
 
@@ -264,7 +265,7 @@ export class ModelInfo_mark extends ModelInfo {
                 let maxWidth = Math.max(numWidth, taskWidth, this.c_uiDefaultWidth);
                 instance.uiFollowHead.widthInPixels = maxWidth;
                 // instance.uiFollowHeadBg.widthInPixels = maxWidth;
-            }, (50));
+            }, (100));
 
             // console.log("喷水", this.taskNeedWaterParticle());
             if (this.taskNeedWaterParticle()) {

src/app/babylon/view/building-window/building-window.ts

@@ -249,8 +249,9 @@ export class BuildingWindow extends UIBase {
 
             }
             else {//恢复查看状态
-                this.recoverMoudleShow(type);
+
             }
+            this.recoverMoudleShow(type);
         }
         else {
             if (type == JYZInfoMoudleType.YJCZ) {

src/app/babylon/view/mark-window/mark-window.ts

@@ -856,6 +856,10 @@ export class MarkWindow extends UIBase {
                     // instance.selectMarkDataFrom3d(instance.currentMarkInfo, false); //暂时没有右键取消选中实例的功能
                     if (!SceneManager.s_isPointerDrag) {
                         instance.selectMarkDataPrefabFrom3d(instance.currentMarkDataPrefab, false)
+                        if (instance.currentMarkNodeInfo != null) {
+                            //取消选中
+                            instance.selectMarkDataFrom3d(instance.currentMarkInfo, false);
+                        }
 
 
                     }
@@ -1161,8 +1165,8 @@ export class MarkWindow extends UIBase {
             markInfo = meshPoolInfo.modelInfo as ModelInfo_mark;
             markInfo.belongToBuilding = buildingInfo;
             instance.setMarkTransform(isLocalPos, isNew, buildingInfo, markInfo.modelBox, markInfo);
-            markInfo.modelBox.isPickable = true;
-            console.log("成功创建模型", markInfo);
+            // markInfo.modelBox.isPickable = true; //避免超大的透明选中区
+            // console.log("成功创建模型", markInfo);
             instance.currentMarkNodeInfo.addMarkInfo(markInfo, isNew);
             markInfo.onCreate(isNew);
             Event_MarkInfoChange.dispatch(MarkInfoChangeType.Create, markInfo);