gs-cae-design 1.1.56 → 1.1.58

package/src/gsDevFx/viewer.ts

@@ -405,7 +405,7 @@ export class Viewer extends CEECViewer {
       } else if (ev.ctrlKey == true && key === "v") {
         // console.log("paste");
         // this.pasteComponents();
-      } else if(ev.keyCode === 27) {
+      } else if (ev.keyCode === 27) {
         console.log("esc");
         let camera = this.operatorManager.find("CameraMouse");
         if (camera instanceof CameraMouse) {
@@ -445,9 +445,8 @@ export class Viewer extends CEECViewer {
       let selectedObjs = caeObjectSelector.selectedRenderObjects;
       this.copyedObjects.clear();
 
-
-      if(selectedObjs.count() > 0) {
-        if(this.commonInterfaceManager.copyedExternalEvent) {
+      if (selectedObjs.count() > 0) {
+        if (this.commonInterfaceManager.copyedExternalEvent) {
           this.commonInterfaceManager.copyedExternalEvent();
         }
         console.log("copy success");
@@ -528,7 +527,7 @@ export class Viewer extends CEECViewer {
             this.process.caeRenderObjectTreeManager.nameAscendingOrder(
               neWMember.name,
               1,
-              this.process.nameMapMember,
+              this.process.nameMapMember
             )[0];
 
           let newStart = jointNameMapNewJoint[neWMember.start.name];
@@ -746,9 +745,11 @@ export class Viewer extends CEECViewer {
     deltaName?: string
   ) {
     let stateItem = new Longan.StateItem(oldObj, newObj);
-    stateItem.afterRoll.add((process: Longan.Process, rollType: Longan.RollType) => {
-      afterRoll(stateItem, process, rollType);
-    });
+    stateItem.afterRoll.add(
+      (process: Longan.Process, rollType: Longan.RollType) => {
+        afterRoll(stateItem, process, rollType);
+      }
+    );
 
     let statePack = new Longan.StatePack();
     statePack.add(stateItem);
@@ -797,13 +798,12 @@ export class Viewer extends CEECViewer {
     //注册特有的RenderObject
     return new Promise((resolve, reject) => {
       axios(`/cae-service/projects/${id}/data`).then((modelData: any) => {
-        if(modelData === false) {
+        if (modelData === false) {
           reject("请求模型文件失败：" + id);
         }
 
         if (modelData != null) {
-
-          if(isReplace) {
+          if (isReplace) {
             this.disposeAllRenderObjects();
             this.reset();
           }
@@ -834,10 +834,23 @@ export class Viewer extends CEECViewer {
   disposeAllRenderObjects() {
     let process = this.process;
     let ros = process.renderObjects;
-    ros.forEach((key, value)=>{
+    ros.forEach((key, value) => {
       value.delete();
-    })
+    });
+
+    console.log(
+      "clear all renderObjects---count:",
+      this.process.renderObjects.count()
+    );
+  }
+
+  dispose(): void {
+    if (this.container) {
+      let viewerContainerId = this.container.id;
+      SvgDraw.instance[viewerContainerId] = null;
+      console.log("dispose viewerContainerId:", viewerContainerId);
+    }
 
-    console.log("clear all renderObjects---count:", this.process.renderObjects.count());
+    super.dispose();
   }
 }

package/src/index.ts

@@ -9,7 +9,7 @@ import { Loader } from "gs-bim-air";
 // import SelectorFiliter
 
 const config = require("../package.json");
-console.log(`%c${config.name}: v${config.version}`, "color: #ff8000");
+console.info(`%c${config.name}: v${config.version}`, "color: #ff8000");
 
 const CAEDesign = {
   ViewerWrapper,

package/src/viewerWrapper/commands/aftertreatment/addLoadCombination/addLoadCombinationConfig.ts

@@ -0,0 +1,77 @@
+import { DesignBaseObject } from "gs-ceec-design";
+import { Process } from "../../../../gsDevFx/process";
+import { Config } from "../../../../gsDevFx/propertyComponents/config";
+import { PropertyComponent } from "../../../../gsDevFx/propertyComponents/propertyComponent";
+
+export default class AddLoadCombinationConfig extends Config {
+  constructor() {
+    super();
+
+    let property = new PropertyComponent();
+    property.name = "添加荷载组合";
+
+    property.data = {
+      combinationName: {
+        value: null,
+        name: "荷载组合名",
+      },
+      groupLoadConditions: {
+        value: null,
+        name: "选择的荷载工况",
+        type: "list",
+        listOptions: {
+          list: []
+        }
+      },
+      allLoadConditions: {
+        value: null,
+        name: "荷载工况列表",
+        type: "list",
+        listOptions: {
+          list: []
+        },
+      },
+      tip: {
+        name: "提示",
+        value: null,
+      },
+    };
+
+    this.properties.add(property);
+
+    this.refreshAllLoadConditions()
+  }
+  
+  refreshAllLoadConditions() {
+    let data = this.properties.items[0].data;
+
+    data.allLoadConditions.listOptions.list = [];
+    let loadObjectGroup =
+      Process.activeProcess.findRenderObjectByName("荷载工况");
+    if (loadObjectGroup) {
+        loadObjectGroup.childObjects.map((item) => {
+          if((item as DesignBaseObject).checkBusinessStateIsActive()) {
+            data.allLoadConditions.listOptions.list.push({
+              label: item.name,
+              value: item.name
+            });
+          }
+        });
+    }
+
+    let loadObjectGroup2 =
+      Process.activeProcess.findRenderObjectByName("荷载组合");
+    if (loadObjectGroup2) {
+        loadObjectGroup2.childObjects.map((item) => {
+          if((item as DesignBaseObject).checkBusinessStateIsActive()) {
+            data.allLoadConditions.listOptions.list.push({
+              label: item.name,
+              value: item.name
+            });
+          }
+        });
+    }
+  }
+
+  resetConfigData() {}
+}

package/src/viewerWrapper/commands/aftertreatment/addLoadCombination/commandAddLoadCombination.ts

@@ -0,0 +1,200 @@
+import { CameraMouse } from "../../../../gsDevFx/operators/cameraMouse";
+import { CommandComponent } from "../../commandComponent";
+import { CAEObjectPreSelector } from "../../../../gsDevFx/operators/cAEObjectPreSelector";
+import { CAEObjectSelector } from "../../../../gsDevFx/operators/caeObjectSelector";
+import { CommandSelect } from "../../../../gsDevFx/commands/commandSelect";
+import AddLoadCombinationConfig from "./addLoadCombinationConfig";
+import { LoadCombinationGroupObject } from "../../../../gsDevFx/objects/loadCombinationObjects/loadCombinationGroupObject";
+import { DesignBaseObject } from "gs-ceec-design";
+import { BusinessState } from "gs-ceec-design";
+import { CaeNumber } from "../../../../utility/utility";
+import { LoadCombinationObject } from "../../../../gsDevFx/objects/loadCombinationObjects/loadCombinationObject";
+
+export default class CommandAddLoadCombination extends CommandComponent {
+  typeName: string = "CommandAddLoadCombination";
+
+  config: AddLoadCombinationConfig;
+  preSelector: CAEObjectPreSelector = null;
+  caeObjectSelector: CAEObjectSelector = null;
+
+  constructor() {
+    super();
+  }
+
+  begin(): void {
+    this.changeOperators();
+
+    console.log("CommandAddLoadCombination");
+    this.config = new AddLoadCombinationConfig();
+    this.config.show();
+
+    this.config.resetConfigData = () => {
+      let data = this.config.properties.items[0].data;
+
+      data.combinationName.value = null;
+      data.groupLoadConditions.listOptions.list = [];
+      this.config.refreshAllLoadConditions()
+    }
+  }
+
+  restore(): void {
+    this.changeOperators();
+    this.config.show();
+  }
+
+  changeOperators(): void {
+    // 进入命令前清空选中与高亮.
+    this.viewer.selectionManager.clearAllSelectionAndHighlight();
+    this.viewer.updateDisplay();
+
+    // 清空操作器.
+    this.viewer.operatorManager.clear();
+    // 添加操作器
+    this.viewer.operatorManager.add(new CameraMouse());
+
+    this.preSelector = new CAEObjectPreSelector();
+    this.viewer.operatorManager.add(this.preSelector);
+
+    this.caeObjectSelector = new CAEObjectSelector();
+    this.viewer.operatorManager.add(this.caeObjectSelector);
+
+    this.caeObjectSelector.lButtonUp.add(() => {
+      setTimeout(() => {
+        this.updatePanel();
+      }, 0);
+    });
+  }
+
+  end(): void {
+    this.config.hide();
+    super.end();
+
+    this.viewer.selectionManager.clearAllSelectionAndHighlight();
+    this.viewer.updateDisplay();
+
+    let commandSelect = new CommandSelect();
+    this.process.commandManager.execute(commandSelect);
+  }
+
+  commandOk(): void {
+    let data = this.config.properties.items[0].data;
+
+    let combinationName = data.combinationName.value;
+    if(!combinationName) {
+      data.tip.value = 2;
+      return
+    }
+
+    let legal = LoadCombinationGroupObject.checkNamelegal(combinationName)
+    if(!legal) {
+      data.tip.value = 1;
+      return
+    }
+    
+    let loadCombinationGroupRO =
+      this.getLoadCombinationGroupObjectByName(combinationName);
+    if(loadCombinationGroupRO) {
+      // 荷载组合名已存在
+      data.tip.value = 5;
+      return
+    }
+    
+    let pretreatmentRO = this.viewer.process.findRenderObjectByName(
+      "后处理计算结果"
+    ) as DesignBaseObject;
+
+    let loadCombinationGroupParent =
+      this.process.findCaeObjectByNameInChildObject(
+        pretreatmentRO,
+        "荷载组合"
+      ) as DesignBaseObject;
+
+    if (!loadCombinationGroupParent) {
+      loadCombinationGroupParent = new DesignBaseObject();
+      loadCombinationGroupParent.businessState = BusinessState.Creating;
+      loadCombinationGroupParent.name = "荷载组合";
+      this.process.addRenderObject(pretreatmentRO,loadCombinationGroupParent);
+    }
+
+    let groupLoadConditions = data.groupLoadConditions.listOptions.list;
+    if (!groupLoadConditions.length || groupLoadConditions.some(obj => !obj.label)) {
+      // 工况名不能为空
+      data.tip.value = 4;
+      return;
+    }
+
+    loadCombinationGroupRO = new LoadCombinationGroupObject(combinationName);
+    loadCombinationGroupRO.businessState = BusinessState.Creating;
+    this.process.addRenderObject(loadCombinationGroupParent,loadCombinationGroupRO);
+    // 每六个荷载进行组合
+    for (let i = 0; i < groupLoadConditions.length; i += 6) {
+      const chunk = groupLoadConditions.slice(i, i + 6);
+
+      if (chunk.length) {
+        const loadCombination = new LoadCombinationObject(combinationName);
+        loadCombination.businessState = BusinessState.Creating;
+        this.process.addRenderObject(loadCombinationGroupRO,loadCombination);
+
+        if (chunk[0]) {
+          loadCombination.loadcaseName_firstLoad = chunk[0].label;
+          loadCombination.loadFactor_firstLoad = CaeNumber(chunk[0].value);
+        }
+        if (chunk[1]) {
+          loadCombination.loadcaseName_secondLoad = chunk[1].label;
+          loadCombination.loadFactor_secondLoad = CaeNumber(chunk[1].value);
+        }
+        if (chunk[2]) {
+          loadCombination.loadcaseName_thirdLoad = chunk[2].label;
+          loadCombination.loadFactor_thirdLoad = CaeNumber(chunk[2].value);
+        }
+        if (chunk[3]) {
+          loadCombination.loadcaseName_fourthLoad = chunk[3].label;
+          loadCombination.loadFactor_fourthLoad = CaeNumber(chunk[3].value);
+        }
+        if (chunk[4]) {
+          loadCombination.loadcaseName_fifthLoad = chunk[4].label;
+          loadCombination.loadFactor_fifthLoad = CaeNumber(chunk[4].value);
+        }
+        if (chunk[5]) {
+          loadCombination.loadcaseName_sixthLoad = chunk[5].label;
+          loadCombination.loadFactor_sixthLoad = CaeNumber(chunk[5].value);
+        }
+      }
+    }
+
+    this.config.resetConfigData()
+
+    this.viewer.updateDisplay();
+
+    data.tip.value = 3;
+  }
+
+  updatePanel() {
+  }
+
+  private getLoadCombinationGroupObjectByName(combinationName: string) {
+    let pretreatmentRO = this.viewer.process.findRenderObjectByName(
+      "后处理计算结果"
+    ) as DesignBaseObject;
+
+    let loadCombinationGroupParent =
+      this.viewer.process.findCaeObjectByNameInChildObject(
+        pretreatmentRO,
+        "荷载组合"
+      ) as DesignBaseObject;
+
+    if (!loadCombinationGroupParent) {
+      loadCombinationGroupParent = new DesignBaseObject();
+      loadCombinationGroupParent.businessState = BusinessState.Creating;
+      loadCombinationGroupParent.name = "荷载组合";
+      this.process.addRenderObject(pretreatmentRO, loadCombinationGroupParent);
+    }
+
+    let loadCombinationGroupRO = this.process.findCaeObjectByNameInChildObject(
+      loadCombinationGroupParent,
+      combinationName
+    ) as LoadCombinationGroupObject;
+
+    return loadCombinationGroupRO;
+  }
+}

package/src/viewerWrapper/commands/aftertreatment/editJointLoad/commandEditJointLoad.ts

@@ -22,9 +22,11 @@ export default class CommandEditJointLoad extends CommandComponent {
   caeObjectSelector: CAEObjectSelector;
 
   loadConditionRO: LoadConditionObject = null;
-  loadGroupRO: LoadGroupObject = null;
+  // loadGroupRO: LoadGroupObject = null;
   expectFilter = SelectorFiliter.Joint;
 
+  prepareToDeleteLoadList = new Longan.List<JointLoadObject>();
+
   constructor() {
     super();
   }
@@ -77,6 +79,7 @@ export default class CommandEditJointLoad extends CommandComponent {
   }
 
   changeOperators(): void {
+    this.prepareToDeleteLoadList.clear();
     // 进入命令前清空选中与高亮.
     this.viewer.selectionManager.clearAllSelectionAndHighlight();
     this.viewer.updateDisplay();
@@ -117,6 +120,12 @@ export default class CommandEditJointLoad extends CommandComponent {
   }
 
   commandOk(): void {
+    // 正式删除点荷载
+    for (let i = 0; i < this.prepareToDeleteLoadList.count(); i++) {
+      this.prepareToDeleteLoadList.items[i].tempDelete(this.viewer);
+    }
+    this.prepareToDeleteLoadList.clear();
+
     let data = this.config.properties.items[0].data;
 
     let loadCondition = data.loadCondition.value;
@@ -154,18 +163,17 @@ export default class CommandEditJointLoad extends CommandComponent {
       }
     }
 
-
     if (selectedObjects) {
       this.viewer.selectionManager.clearAllSelectionAndHighlight();
 
       // 添加或修改工况.
       this.loadConditionRO = this.getLoadConditionObjectByName(loadCondition);
-      this.loadGroupRO = this.getLoadGroupByName(
+      let loadGroupRO = this.getLoadGroupByName(
         this.loadConditionRO,
         loadGroup
       );
 
-      if (!this.loadConditionRO || !this.loadGroupRO) {
+      if (!this.loadConditionRO || !loadGroupRO) {
         // 没有查找到对应的工况或荷载组
         data.tip.value = 4;
         return;
@@ -176,8 +184,8 @@ export default class CommandEditJointLoad extends CommandComponent {
         let selectedObj = selectedObjects.items[i];
         let jointLoad = null;
 
-        for (let j = 0; j < this.loadGroupRO.childObjects.length; j++) {
-          let load = this.loadGroupRO.childObjects[j];
+        for (let j = 0; j < loadGroupRO.childObjects.length; j++) {
+          let load = loadGroupRO.childObjects[j];
           if (load instanceof JointLoadObject) {
             if (load.jointName === selectedObj.name) {
               counter++;
@@ -372,7 +380,7 @@ export default class CommandEditJointLoad extends CommandComponent {
       let child = loadGroupRO.childObjects[i] as DesignBaseObject;
       if (child instanceof JointLoadObject) {
         deletingList.push(child);
-      } else if(child.checkBusinessStateIsActive()) {
+      } else if (child.checkBusinessStateIsActive()) {
         restObject++;
       }
     }
@@ -382,8 +390,8 @@ export default class CommandEditJointLoad extends CommandComponent {
       // this.process.removeRenderObject(deletingList[i]);
     }
 
-    if(restObject === 0) {
-      this.loadGroupRO.tempDelete(this.viewer);
+    if (restObject === 0) {
+      loadGroupRO.tempDelete(this.viewer);
     }
 
     this.viewer.updateDisplay();
@@ -405,10 +413,13 @@ export default class CommandEditJointLoad extends CommandComponent {
       if (conditions[i].name === loadConditionName) {
         for (let j = 0; j < conditions[i].childObjects.length; j++) {
           let loadGroup = conditions[i].childObjects[j] as LoadGroupObject;
-          if(loadGroup.checkBusinessStateIsActive()) {
+          if (loadGroup.checkBusinessStateIsActive()) {
             for (let k = 0; k < loadGroup.childObjects.length; k++) {
               let load = loadGroup.childObjects[k];
-              if (load instanceof JointLoadObject && load.checkBusinessStateIsActive()) {
+              if (
+                load instanceof JointLoadObject &&
+                load.checkBusinessStateIsActive()
+              ) {
                 loadGroups.push(loadGroup);
                 break;
               }
@@ -425,12 +436,15 @@ export default class CommandEditJointLoad extends CommandComponent {
     let groups = this.getLoadGroups(loadConditionName);
     let jointLoads = new Array<JointLoadObject>();
 
-    for(let i = 0; i < groups.length; i++) {
+    for (let i = 0; i < groups.length; i++) {
       let loadGroup = groups[i];
-      if(loadGroup.name === loadGroupName) {
-        for(let j = 0; j < loadGroup.childObjects.length; j++) {
+      if (loadGroup.name === loadGroupName) {
+        for (let j = 0; j < loadGroup.childObjects.length; j++) {
           let load = loadGroup.childObjects[j];
-          if(load instanceof JointLoadObject && load.checkBusinessStateIsActive()) {
+          if (
+            load instanceof JointLoadObject &&
+            load.checkBusinessStateIsActive()
+          ) {
             jointLoads.push(load);
           }
         }
@@ -440,4 +454,67 @@ export default class CommandEditJointLoad extends CommandComponent {
 
     return jointLoads;
   }
+
+  /**
+   * 将点荷载标记为待删除/或取消删除.
+   * @param jointName 带有点荷载的空间点名
+   * @param isDelete true——标记为待删除；false——取消待删除标记
+   * @returns 
+   */
+  markJointLoad(jointName: string, isDelete: boolean) {
+    let data = this.config.properties.items[0].data;
+
+    let loadConditionName = data.loadCondition.value;
+    let loadGroupName = data.loadGroup.value;
+    if (loadConditionName && loadGroupName) {
+      let loadConditionRO =
+        this.getLoadConditionObjectByName(loadConditionName);
+      if (loadConditionRO) {
+        let loadGroupRO = this.getLoadGroupByName(
+          loadConditionRO,
+          loadGroupName
+        );
+        if (loadGroupRO) {
+          let jointLoad: JointLoadObject = null;
+          for (let j = 0; j < loadGroupRO.childObjects.length; j++) {
+            let child = loadGroupRO.childObjects[j];
+            if (child instanceof JointLoadObject) {
+              if (child.jointName === jointName) {
+                jointLoad = child;
+                break;
+              }
+            }
+          }
+          if (jointLoad) {
+            if (isDelete) {
+              if (this.prepareToDeleteLoadList.indexOf(jointLoad) === -1) {
+                this.prepareToDeleteLoadList.add(jointLoad);
+              }
+              // 将点荷载添加到待删除列表.
+              data.tip.value = 7 + "," + jointName;
+            } else {
+              if (this.prepareToDeleteLoadList.indexOf(jointLoad) > -1) {
+                this.prepareToDeleteLoadList.remove(jointLoad);
+              }
+              // 将点荷载从待删除列表中移除.
+              data.tip.value = 8 + "," + jointName;
+            }
+
+            return;
+          } else {
+            // 没有查找到点荷载.
+            data.tip.value = 9;
+            return;
+          }
+        }
+      }
+
+      // 无法查找到工况名对象或荷载组对象.
+      data.tip.value = 6;
+      return;
+    } else {
+      // 没有填写工况名和荷载组名
+      data.tip.value = 5;
+    }
+  }
 }