gs-cae-design 1.1.57 → 1.1.59

package/src/viewerWrapper/commands/commandSplitMemberBase.ts

@@ -1,10 +1,7 @@
 import { JointObject } from "../../gsDevFx/objects/caeObjects/jointObject";
 import { CommandComponent } from "./commandComponent";
 import { MemberObject } from "../../gsDevFx/objects/caeObjects/memberObject";
-import {
-  BusinessState,
-  DesignBaseObject,
-} from "gs-ceec-design";
+import { BusinessState, DesignBaseObject } from "gs-ceec-design";
 import { Longan } from "gs-bim-air";
 import {
   GrupObject,
@@ -229,9 +226,6 @@ export default class CommandSplitMemberBase extends CommandComponent {
     grupNames: string[]
   ) {
     // 当前被拆分的杆件截面组.
-    let currentGrup = this.process.cloneManager.cloneObject(
-      member.grup
-    ) as GrupObject;
     for (let i = 0; i < splitJoints.length - 1; i++) {
       let cloneMember = this.process.cloneManager.cloneObject(
         member
@@ -252,7 +246,11 @@ export default class CommandSplitMemberBase extends CommandComponent {
       );
       createItems.push(cloneMember);
 
-      if (currentGrup) {
+      if (member.grup) {
+        let currentGrup = this.process.cloneManager.cloneObject(
+          member.grup
+        ) as GrupObject;
+
         if (!grupNames) {
           cloneMember.grup = member.grup;
         } else {

package/src/viewerWrapper/commands/createPlate/plateConfig.ts

@@ -1,6 +1,7 @@
 import { Config } from "../../../gsDevFx/propertyComponents/config";
 import { PropertyComponent } from "../../../gsDevFx/propertyComponents/propertyComponent";
 import { Process } from "../../../gsDevFx/process";
+import { PGrupObject } from "../../../gsDevFx/objects/caeObjects/pGrupObject";
 
 export default class PlateConfig extends Config {
   constructor() {
@@ -19,6 +20,9 @@ export default class PlateConfig extends Config {
         type: "select",
         selectOptions: {
           selections: [],
+          change: () => {
+            this.pgrupChange();
+          },
         },
       },
       thickness: {
@@ -75,4 +79,22 @@ export default class PlateConfig extends Config {
         });
     }
   }
+
+  pgrupChange(): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+      let process = Process.activeProcess as Process;
+      let data = this.properties.items[0].data;
+      let pgrupNode = process.findCaeObjectByNameInChildObject(
+        process.caeRenderObjectTreeManager.pGrupNode,
+        data.sectionGroup.value
+      ) as PGrupObject;
+      if (pgrupNode) {
+        data.thickness.value = pgrupNode.thickness;
+      } else {
+        data.thickness.value = 0;
+      }
+
+      resolve();
+    });
+  }
 }

package/src/viewerWrapper/commands/createPlatesInRange/commandCreatePlatesInRange.ts

@@ -141,9 +141,9 @@ export default class CommandCreatePlatesInRange extends CommandComponent {
     }
 
     let pointName = new Array<string>();
-    for(let i = 0; i < pointNameList.length; i++) {
+    for (let i = 0; i < pointNameList.length; i++) {
       // 选择的点有重复.
-      if(pointName.indexOf(pointNameList[i].label) > -1) {
+      if (pointName.indexOf(pointNameList[i].label) > -1) {
         pointNameList = [];
         data.tip.value = 5;
         return;
@@ -202,11 +202,11 @@ export default class CommandCreatePlatesInRange extends CommandComponent {
     let yModule1 = Longan.Vector.module(p1p2);
     let yModule2 = Longan.Vector.module(p0p2);
     let yModule = yModule1;
-    if(yModule1 > yModule2) {
+    if (yModule1 > yModule2) {
       yModule = yModule2;
     }
     let yAxis = Longan.Vector.normalizeVector(p1p2);
-    if(yModule1 > yModule2) {
+    if (yModule1 > yModule2) {
       yAxis = Longan.Vector.normalizeVector(p0p2);
     }
     Longan.Vector.normalize(yAxis);
@@ -324,6 +324,7 @@ export default class CommandCreatePlatesInRange extends CommandComponent {
     let offsetVec = Longan.Vector.multiply(zAixs, zOffset);
     let offset = [offsetVec[0], offsetVec[1], offsetVec[2]];
 
+    let plateType = Number(data.plateType.value);
     // 创建范围内板格.每4个相邻的点形成一个板.
     let addedPlates = new Array<PlateObject>();
     let plateCount = 0;
@@ -331,76 +332,205 @@ export default class CommandCreatePlatesInRange extends CommandComponent {
       //
       for (let j = 0; j < orderedJoints[i].length - 1; j++) {
         //
-        let plate: PlateObject = null;
-        let names = this.process.caeRenderObjectTreeManager.nameAscendingOrder(
-          name,
-          1,
-          this.process.nameMapPlate
-        );
-
-        if (
-          orderedJoints[i][j] &&
-          orderedJoints[i][j + 1] &&
-          orderedJoints[i + 1][j] &&
-          orderedJoints[i + 1][j + 1]
-        ) {
-          plate = new PlateObject(names[0]);
-
-          plate.joints[0] = orderedJoints[i][j].joint;
-          plate.joints[1] = orderedJoints[i][j + 1].joint;
-          plate.joints[2] = orderedJoints[i + 1][j + 1].joint;
-          plate.joints[3] = orderedJoints[i + 1][j].joint;
-
-          plate.offsetOption = "1";
-          plate.offsets = []
-            .concat(offset)
-            .concat(offset)
-            .concat(offset)
-            .concat(offset);
-        } else if (
-          orderedJoints[i][j] &&
-          orderedJoints[i][j + 1] &&
-          orderedJoints[i + 1][j]
-        ) {
-          plate = new PlateObject(names[0]);
-
-          plate.joints[0] = orderedJoints[i][j].joint;
-          plate.joints[1] = orderedJoints[i][j + 1].joint;
-          plate.joints[2] = orderedJoints[i + 1][j].joint;
-
-          plate.offsets = [].concat(offset).concat(offset).concat(offset);
-        } else if (
-          orderedJoints[i][j] &&
-          orderedJoints[i + 1][j + 1] &&
-          orderedJoints[i + 1][j]
-        ) {
-          plate = new PlateObject(names[0]);
-
-          plate.joints[0] = orderedJoints[i][j].joint;
-          plate.joints[1] = orderedJoints[i + 1][j + 1].joint;
-          plate.joints[2] = orderedJoints[i + 1][j].joint;
-
-          plate.offsets = [].concat(offset).concat(offset).concat(offset);
-        }
+        if (plateType === 0) {
+          // 四边形板
+          let plate: PlateObject = null;
+          let names =
+            this.process.caeRenderObjectTreeManager.nameAscendingOrder(
+              name,
+              1,
+              this.process.nameMapPlate
+            );
+
+          if (
+            orderedJoints[i][j] &&
+            orderedJoints[i][j + 1] &&
+            orderedJoints[i + 1][j] &&
+            orderedJoints[i + 1][j + 1]
+          ) {
+            plate = new PlateObject(names[0]);
+
+            plate.joints[0] = orderedJoints[i][j].joint;
+            plate.joints[1] = orderedJoints[i][j + 1].joint;
+            plate.joints[2] = orderedJoints[i + 1][j + 1].joint;
+            plate.joints[3] = orderedJoints[i + 1][j].joint;
+
+            plate.offsetOption = "1";
+            plate.offsets = []
+              .concat(offset)
+              .concat(offset)
+              .concat(offset)
+              .concat(offset);
+          } else if (
+            orderedJoints[i][j] &&
+            orderedJoints[i][j + 1] &&
+            orderedJoints[i + 1][j]
+          ) {
+            plate = new PlateObject(names[0]);
+
+            plate.joints[0] = orderedJoints[i][j].joint;
+            plate.joints[1] = orderedJoints[i][j + 1].joint;
+            plate.joints[2] = orderedJoints[i + 1][j].joint;
+
+            plate.offsets = [].concat(offset).concat(offset).concat(offset);
+          } else if (
+            orderedJoints[i][j] &&
+            orderedJoints[i + 1][j + 1] &&
+            orderedJoints[i + 1][j]
+          ) {
+            plate = new PlateObject(names[0]);
+
+            plate.joints[0] = orderedJoints[i][j].joint;
+            plate.joints[1] = orderedJoints[i + 1][j + 1].joint;
+            plate.joints[2] = orderedJoints[i + 1][j].joint;
+
+            plate.offsets = [].concat(offset).concat(offset).concat(offset);
+          }
 
-        let seletedGrupId = data.pGrups.value;
-        let pGrupObj: PGrupObject = this.viewer.process.findRenderObjectById(
-          seletedGrupId
-        ) as PGrupObject;
-        if (plate) {
-          plate.pGrup = pGrupObj;
-          plate.offsetOption = "1";
-          plate.businessState = BusinessState.Creating;
-          plate.setNeedUpdate();
-
-          this.process.addRenderObject(
-            this.process.caeRenderObjectTreeManager.plateNode,
-            plate
-          );
-          name = names[0];
-          plateCount++;
-
-          addedPlates.push(plate);
+          let seletedGrupId = data.pGrups.value;
+          let pGrupObj: PGrupObject = this.viewer.process.findRenderObjectById(
+            seletedGrupId
+          ) as PGrupObject;
+          if (plate) {
+            plate.pGrup = pGrupObj;
+            plate.offsetOption = "1";
+            plate.businessState = BusinessState.Creating;
+            plate.setNeedUpdate();
+
+            this.process.addRenderObject(
+              this.process.caeRenderObjectTreeManager.plateNode,
+              plate
+            );
+            name = names[0];
+            plateCount++;
+
+            addedPlates.push(plate);
+          }
+        } else {
+          // 三角形板
+          if (
+            orderedJoints[i][j] &&
+            orderedJoints[i][j + 1] &&
+            orderedJoints[i + 1][j] &&
+            orderedJoints[i + 1][j + 1]
+          ) {
+            let names =
+              this.process.caeRenderObjectTreeManager.nameAscendingOrder(
+                name,
+                2,
+                this.process.nameMapPlate
+              );
+
+            let plate1: PlateObject = null;
+            plate1 = new PlateObject(names[0]);
+
+            plate1.joints[0] = orderedJoints[i][j].joint;
+            plate1.joints[1] = orderedJoints[i + 1][j].joint;
+            plate1.joints[2] = orderedJoints[i][j + 1].joint;
+
+            plate1.offsetOption = "1";
+            plate1.offsets = [].concat(offset).concat(offset).concat(offset);
+
+            let plate2: PlateObject = null;
+            plate2 = new PlateObject(names[1]);
+
+            plate2.joints[0] = orderedJoints[i + 1][j].joint;
+            plate2.joints[1] = orderedJoints[i + 1][j + 1].joint;
+            plate2.joints[2] = orderedJoints[i][j + 1].joint;
+
+            plate2.offsetOption = "1";
+            plate2.offsets = [].concat(offset).concat(offset).concat(offset);
+
+            let seletedGrupId = data.pGrups.value;
+            let pGrupObj: PGrupObject =
+              this.viewer.process.findRenderObjectById(
+                seletedGrupId
+              ) as PGrupObject;
+            if (plate1) {
+              plate1.pGrup = pGrupObj;
+              plate1.offsetOption = "1";
+              plate1.businessState = BusinessState.Creating;
+              plate1.setNeedUpdate();
+
+              this.process.addRenderObject(
+                this.process.caeRenderObjectTreeManager.plateNode,
+                plate1
+              );
+              plateCount++;
+
+              addedPlates.push(plate1);
+            }
+
+            if (plate2) {
+              plate2.pGrup = pGrupObj;
+              plate2.offsetOption = "1";
+              plate2.businessState = BusinessState.Creating;
+              plate2.setNeedUpdate();
+
+              this.process.addRenderObject(
+                this.process.caeRenderObjectTreeManager.plateNode,
+                plate2
+              );
+              plateCount++;
+
+              addedPlates.push(plate2);
+            }
+          } else {
+            let plate: PlateObject = null;
+            let names =
+              this.process.caeRenderObjectTreeManager.nameAscendingOrder(
+                name,
+                1,
+                this.process.nameMapPlate
+              );
+
+            if (
+              orderedJoints[i][j] &&
+              orderedJoints[i][j + 1] &&
+              orderedJoints[i + 1][j]
+            ) {
+              plate = new PlateObject(names[0]);
+
+              plate.joints[0] = orderedJoints[i][j].joint;
+              plate.joints[1] = orderedJoints[i][j + 1].joint;
+              plate.joints[2] = orderedJoints[i + 1][j].joint;
+
+              plate.offsets = [].concat(offset).concat(offset).concat(offset);
+            } else if (
+              orderedJoints[i][j] &&
+              orderedJoints[i + 1][j + 1] &&
+              orderedJoints[i + 1][j]
+            ) {
+              plate = new PlateObject(names[0]);
+
+              plate.joints[0] = orderedJoints[i][j].joint;
+              plate.joints[1] = orderedJoints[i + 1][j + 1].joint;
+              plate.joints[2] = orderedJoints[i + 1][j].joint;
+
+              plate.offsets = [].concat(offset).concat(offset).concat(offset);
+
+              let seletedGrupId = data.pGrups.value;
+              let pGrupObj: PGrupObject =
+                this.viewer.process.findRenderObjectById(
+                  seletedGrupId
+                ) as PGrupObject;
+              if (plate) {
+                plate.pGrup = pGrupObj;
+                plate.offsetOption = "1";
+                plate.businessState = BusinessState.Creating;
+                plate.setNeedUpdate();
+
+                this.process.addRenderObject(
+                  this.process.caeRenderObjectTreeManager.plateNode,
+                  plate
+                );
+                name = names[0];
+                plateCount++;
+
+                addedPlates.push(plate);
+              }
+            }
+          }
         }
       }
     }

package/src/viewerWrapper/commands/createPlatesInRange/createPlatesInRangeConfig.ts

@@ -38,6 +38,12 @@ export default class CreatePlatesInRangeConfig extends Config {
           list: [],
         },
       },
+      // value = 0 ———— 四边形板
+      // value = 1 ———— 三角形板
+      plateType: {
+        value: 0,
+        name: "板形状",
+      },
       tip: {
         name: "提示",
         value: null,

package/src/viewerWrapper/commands/editGrup/commandEditGrup.ts

@@ -23,6 +23,9 @@ export default class CommandEditGrup extends CommandComponent {
   // currrentGrupObject: GrupObject = null;
   targetGrupObject: GrupObject = null;
 
+  // 添加/删除分段要改为在“应用”时才生效，因此添加一个复制的分段数组对象——20250801
+  copyedGrupSegments: GrupSegment[] = null;
+
   constructor(grupObject?: GrupObject) {
     super();
     this.targetGrupObject = grupObject;
@@ -268,17 +271,20 @@ export default class CommandEditGrup extends CommandComponent {
 
     if (!currentGrupObject) {
       console.log("没有查找到该截面组");
+      this.copyedGrupSegments = null;
       return;
     }
 
     if (!data.groupType.value) {
       data.tip.value = 6;
+      this.copyedGrupSegments = null;
       return;
     }
 
     if (data.groupType.value === "0" && data.section.value === null) {
       if (!data.tubOuterDiameter.value || !data.tubWallThickness.value) {
         data.tip.value = 7;
+        this.copyedGrupSegments = null;
         return;
       }
       if (
@@ -286,10 +292,16 @@ export default class CommandEditGrup extends CommandComponent {
         !Number(data.tubWallThickness.value)
       ) {
         data.tip.value = 7;
+        this.copyedGrupSegments = null;
         return;
       }
     }
 
+    // 
+    if(this.copyedGrupSegments) {
+      currentGrupObject.grupSegments = this.copyedGrupSegments;
+    }
+
     currentGrupObject.businessState = BusinessState.Editing;
     let index = data.currentSegmentIndex.value;
     let curGrupSegment = currentGrupObject.grupSegments[index - 1];
@@ -308,6 +320,7 @@ export default class CommandEditGrup extends CommandComponent {
     });
 
     this.viewer.updateDisplay();
+    this.copyedGrupSegments = null;
 
     this.viewer.addState(
       false,
@@ -515,6 +528,11 @@ export default class CommandEditGrup extends CommandComponent {
       data.definedGrups.value
     ) as GrupObject;
 
+    this.copyedGrupSegments = new Array<GrupSegment>();
+    for(let i = 0; i < currentGrupObject.grupSegments.length; i++) {
+      this.copyedGrupSegments.push(currentGrupObject.grupSegments[i]);
+    }
+
     // this.resetGrupSegmentConfigData();
     // let grupSegment = new GrupSegment();
     // grupSegment.elastic_E = "20.60";
@@ -529,20 +547,20 @@ export default class CommandEditGrup extends CommandComponent {
     let currentGrupSegment = currentGrupObject.grupSegments[index - 1];
     let grupSegment = currentGrupSegment.clone();
 
-    let tempArray = new Array<GrupSegment>();
-    let array = currentGrupObject.grupSegments;
-    if (array.length > 0) {
-      let len = array.length;
-      for (let i = len; i > index; i--) {
-        tempArray.push(array.pop());
-      }
-    }
-    array.push(grupSegment);
+    let array = this.copyedGrupSegments;
+    array.splice(index, 0, grupSegment);
+    // if (array.length > 0) {
+    //   let len = array.length;
+    //   for (let i = len; i > index; i--) {
+    //     tempArray.push(array.pop());
+    //   }
+    // }
+    // array.push(grupSegment);
 
-    let tempLen = tempArray.length;
-    for (let i = 0; i < tempLen; i++) {
-      array.push(tempArray.pop());
-    }
+    // let tempLen = tempArray.length;
+    // for (let i = 0; i < tempLen; i++) {
+    //   array.push(tempArray.pop());
+    // }
 
     let segmentCount = data.segmentCount.value;
     segmentCount++;
@@ -572,21 +590,13 @@ export default class CommandEditGrup extends CommandComponent {
       data.definedGrups.value
     ) as GrupObject;
 
-    let tempArray = new Array<GrupSegment>();
-    let array = currentGrupObject.grupSegments;
-    if (array.length > 0) {
-      let len = array.length;
-      for (let i = len; i > index; i--) {
-        tempArray.push(array.pop());
-      }
-
-      array.pop();
+    this.copyedGrupSegments = new Array<GrupSegment>();
+    for(let i = 0; i < currentGrupObject.grupSegments.length; i++) {
+      this.copyedGrupSegments.push(currentGrupObject.grupSegments[i]);
     }
 
-    let tempArrayLength = tempArray.length;
-    for (let i = 0; i < tempArrayLength; i++) {
-      array.push(tempArray.pop());
-    }
+    let array = this.copyedGrupSegments;
+    array.splice(index - 1, 1);
 
     if (data.currentSegmentIndex.value > 1) {
       data.currentSegmentIndex.value -= 1;

package/src/viewerWrapper/commands/pretreatment/colorDivideByEditComponentGroup/commandColorDivideByEditComponentGroup.ts

@@ -273,8 +273,8 @@ export default class CommandColorDivideByEditComponentGroup extends CommandCompo
           "构件分组分色"
         ) as CutlineComponentGroupObject;
         for (let i = 0; i < componentGroups.childObjects.length; i++) {
-          let child = componentGroups.childObjects[i];
-          if (child.name === data.rename.value) {
+          let child = componentGroups.childObjects[i] as DesignBaseObject;
+          if (child.checkBusinessStateIsActive() && child.name === data.rename.value) {
             // 分组名已存在
             data.tip.value = 3;
             return;

package/src/viewerWrapper/commands/pretreatment/editJointWeight/commandEditJointWeight.ts

@@ -350,10 +350,13 @@ export default class CommandEditJointWeight extends CommandComponent {
     }
 
     let deletingList = new Array<JointWeightObject>();
+    let restObject = 0;
     for (let i = 0; i < weightIdRO.childObjects.length; i++) {
-      let child = weightIdRO.childObjects[i];
+      let child = weightIdRO.childObjects[i] as DesignBaseObject;
       if (child instanceof JointWeightObject) {
         deletingList.push(child);
+      }else if(child.checkBusinessStateIsActive()) {
+        restObject++;
       }
     }
 
@@ -362,6 +365,10 @@ export default class CommandEditJointWeight extends CommandComponent {
       // this.process.removeRenderObject(deletingList[i]);
     }
 
+    if(restObject === 0) {
+      weightIdRO.tempDelete(this.viewer);
+    }
+
     this.viewer.updateDisplay();
     data.tip.value = 1;
     // this.weightIdRO.tempDelete(this.viewer);

package/src/viewerWrapper/commands/pretreatment/editMemberWeight/commandEditMemberWeight.ts

@@ -370,16 +370,24 @@ export default class CommandEditMemberWeight extends CommandComponent {
       return;
     }
     let deletingList = new Array<MemberWeightDistributedObject | MemberWeightConcentratedObject>();
+    let restObject = 0;
     for (let i = 0; i < weightIdRO.childObjects.length; i++) {
-      let child = weightIdRO.childObjects[i];
+      let child = weightIdRO.childObjects[i] as DesignBaseObject;
       if (child instanceof MemberWeightDistributedObject || child instanceof MemberWeightConcentratedObject) {
         deletingList.push(child);
+      }else if(child.checkBusinessStateIsActive()) {
+        restObject++;
       }
     }
     for (let i = 0; i < deletingList.length; i++) {
       deletingList[i].tempDelete(this.viewer);
       // this.process.removeRenderObject(deletingList[i]);
     }
+    
+    if(restObject === 0) {
+      weightIdRO.tempDelete(this.viewer);
+    }
+
     this.viewer.updateDisplay();
     data.tip.value = 1;
     // this.weightIdRO.tempDelete(this.viewer);

package/src/viewerWrapper/commands/pretreatment/finiteElement/commandFiniteElement.ts

@@ -8,6 +8,9 @@ import FiniteElementConfig from "./finiteElementConfig";
 import { MemberObject } from "../../../../gsDevFx/objects/caeObjects/memberObject";
 import { PlateObject } from "../../../../gsDevFx/objects/caeObjects/plateObject";
 
+/**
+ * 有限元网格
+ */
 export default class CommandFiniteElement extends CommandComponent {
   typeName: string = "CommandFiniteElement";
   preSelector: CAEObjectPreSelector = null;

package/src/viewerWrapper/commands/pretreatment/surfaceDefinition/commandSurfaceDefinition.ts

@@ -120,8 +120,9 @@ export default class CommandSurfaceDefinition extends CommandComponent {
       return;
     }
     // 检验容差是否大于0
-    if (outOfPlaneTolerance.value <= 0) {
+    if (!(outOfPlaneTolerance.value > 0)) {
       data.tip.value = 4;
+      return;
     }
     // 边界节点(非必填)，如果选择了，最多选择14个点,最少选择3个
     let boundaryJointsList = data.boundaryJoints.listOptions.list;
@@ -179,7 +180,7 @@ export default class CommandSurfaceDefinition extends CommandComponent {
     this.process.addRenderObject(surfaceParent, surfaceDefinition);
 
     // 创建回转中心成功
-    data.tip.value = 8;
+    data.tip.value = `8,${data.surfaceID.value}`;
     this.initConfigs();
   }
   initConfigs(): void {

package/src/viewerWrapper/commands/pretreatment/surfaceDefinitionEdit/commandSurfaceDefinitionEdit.ts

@@ -202,7 +202,7 @@ export default class CommandSurfaceDefinitionEdit extends CommandComponent {
     // 初始化预选操作器
     this.preSelector = new CAEObjectPreSelector();
     // 添加预选操作器
-    // this.viewer.operatorManager.add(this.preSelector);
+    this.viewer.operatorManager.add(this.preSelector);
 
     // 设置过滤器，仅允许选中 Joint 类型对象
     this.viewer.selectionInterfaceManager.selectorFilter = this.expectFilter;