gs-cae-design 1.1.63 → 1.1.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gs-cae-design",
-  "version": "1.1.63",
+  "version": "1.1.64",
   "description": "广州图石科技有限公司发布的基于gs-longan的CAE图形控件",
   "main": "lib/CAEDesign.umd.min.js",
   "types": "./types/caeDesign/src/index.d.ts",

package/src/gsDevFx/managers/caeRenderObjectTreeManager.ts

@@ -113,9 +113,9 @@ export class CAERenderObjectTreeManager extends Longan.ProcessManagerBase {
             "临时节点"
           );
 
-          if(!this._tempNode) {
+          if (!this._tempNode) {
             let tempNode = new DesignBaseObject();
-            tempNode.name = "临时节点"
+            tempNode.name = "临时节点";
             this.process.addRenderObject(jiheRO, tempNode);
             this._tempNode = tempNode;
           }
@@ -524,18 +524,22 @@ export class CAERenderObjectTreeManager extends Longan.ProcessManagerBase {
   // }
 
   public checkNodeChildNameRepeat(
-      map: Map<string, any>,
-      name: string
-    ): boolean {
-      let isRepeat = false;
-      let obj = map.get(name);
-      if(obj && obj instanceof DesignBaseObject && obj.checkBusinessStateIsActive()) {
-        isRepeat = true;
-      }
-
-      return isRepeat;
+    map: Map<string, any>,
+    name: string
+  ): boolean {
+    let isRepeat = false;
+    let obj = map.get(name);
+    if (
+      obj &&
+      obj instanceof DesignBaseObject &&
+      obj.checkBusinessStateIsActive()
+    ) {
+      isRepeat = true;
     }
 
+    return isRepeat;
+  }
+
   checkNameRepeat_JointObject(
     targetName: string,
     joint?: JointObject

package/src/gsDevFx/managers/interfaceManagers/postInterfaceManager.ts

@@ -137,119 +137,13 @@ export class PostInterfaceManager extends Longan.ViewerManagerBase {
     let viewer = this.viewer as Viewer;
     let projectId = viewer.structureTreeManager.rootNode.obj.renderObject.id;
 
-    //POSTMEMBER
-    {
-      let table = "R_POSTMEMBERRESULTS";
-      let group = "LoadConditionName";
-
-      let columns = [
-        // 内力
-        "MemberName",
-        "MemberID",
-        "Distance",
-        "MomentUnits",
-        "DistanceUnits",
-        "YYBendingMoment",
-        "ZZBendingMoment",
-        "YShear",
-        "ZShear",
-        "AxialLoad",
-        // UC
-        "AxialUC",
-        "YYBendingUC",
-        "ZZBendingUC",
-        "TotalShearUC",
-        "MaxUC",
-        // 杆件结果
-        "ForceUnits",
-        "AXStress",
-        "YYBendingStress",
-        "ZZBendingStress",
-        "YShearStress",
-        "ZShearStress",
-      ];
-
-      let promises = [];
-      let promise1 = renderObjectService
-        .postData(projectId, table, columns, group)
-        .then((result: any) => {
-          this.event_bendingMoment.forEach((item: () => void) => {
-            item();
-          });
-
-          this.event_ucDiagram.forEach((item: () => void) => {
-            item();
-          });
- 
-          this.getFinish_bendingMoment = true;
-          this.getFinish_ucDiagram = true;
-
-          if (this.tip_bendingMoment) {
-            if (this.message_bendingMoment) {
-              this.message_bendingMoment.close();
-              this.message_bendingMoment = null;
-            }
-            Message.info("内力图后处理数据请求完成.");
-            this.tip_bendingMoment = false;
-          }
-          if (result) {
-            this.bendingMoment = result.groups;
-
-            if (this.requested_bendingMoment) {
-              this.requested_bendingMoment();
-              this.requested_bendingMoment = null;
-            }
-          }
-
-          if (this.tip_ucDiagram) {
-            if (this.message_ucDiagram) {
-              this.message_ucDiagram.close();
-              this.message_ucDiagram = null;
-            }
-            Message.info("UC图后处理数据请求完成.");
-            this.tip_ucDiagram = false;
-          }
-          if (result) {
-            this.ucDiagram = result.groups;
-          }
-        });
-
-      let table1 = "ElementUC";
-      let columns1 = ["MemberName", "LoadCondition"];
-
-      let promise2 = renderObjectService
-        .postData(projectId, table1, columns1, "")
-        .then((result: any) => {
-          if (result) {
-            this.post_jointCanSummaryUC = result.rows;
-          }
-        });
-      promises.push(promise1);
-      promises.push(promise2);
-
-      Promise.all(promises).then(() => {
-        this.event_postResult.forEach((item: () => void) => {
-          item();
-        });
-
-        this.getFinish_postResult = true;
-        if (this.tip_postResult) {
-          if (this.message_postResult) {
-            this.message_postResult.close();
-            this.message_postResult = null;
-          }
-          Message.info("杆件结果后处理数据请求完成.");
-          this.tip_postResult = false;
-        }
-      });
-    }
-
-    // // 内力图
+    // //POSTMEMBER
     // {
     //   let table = "R_POSTMEMBERRESULTS";
     //   let group = "LoadConditionName";
 
     //   let columns = [
+    //     // 内力
     //     "MemberName",
     //     "MemberID",
     //     "Distance",
@@ -260,16 +154,36 @@ export class PostInterfaceManager extends Longan.ViewerManagerBase {
     //     "YShear",
     //     "ZShear",
     //     "AxialLoad",
+    //     // UC
+    //     "AxialUC",
+    //     "YYBendingUC",
+    //     "ZZBendingUC",
+    //     "TotalShearUC",
+    //     "MaxUC",
+    //     // 杆件结果
+    //     "ForceUnits",
+    //     "AXStress",
+    //     "YYBendingStress",
+    //     "ZZBendingStress",
+    //     "YShearStress",
+    //     "ZShearStress",
     //   ];
 
-    //   renderObjectService
+    //   let promises = [];
+    //   let promise1 = renderObjectService
     //     .postData(projectId, table, columns, group)
     //     .then((result: any) => {
     //       this.event_bendingMoment.forEach((item: () => void) => {
     //         item();
     //       });
 
+    //       this.event_ucDiagram.forEach((item: () => void) => {
+    //         item();
+    //       });
+ 
     //       this.getFinish_bendingMoment = true;
+    //       this.getFinish_ucDiagram = true;
+
     //       if (this.tip_bendingMoment) {
     //         if (this.message_bendingMoment) {
     //           this.message_bendingMoment.close();
@@ -286,35 +200,7 @@ export class PostInterfaceManager extends Longan.ViewerManagerBase {
     //           this.requested_bendingMoment = null;
     //         }
     //       }
-    //     });
-    // }
-
-    // // UC图
-    // {
-    //   let table = "R_POSTMEMBERRESULTS";
-    //   let group = "LoadConditionName";
 
-    //   let columns = [
-    //     "MemberName",
-    //     "MemberID",
-    //     "Distance",
-    //     "MomentUnits",
-    //     "DistanceUnits",
-    //     "AxialUC",
-    //     "YYBendingUC",
-    //     "ZZBendingUC",
-    //     "TotalShearUC",
-    //     "MaxUC",
-    //   ];
-
-    //   renderObjectService
-    //     .postData(projectId, table, columns, group)
-    //     .then((result: any) => {
-    //       this.event_ucDiagram.forEach((item: () => void) => {
-    //         item();
-    //       });
-
-    //       this.getFinish_ucDiagram = true;
     //       if (this.tip_ucDiagram) {
     //         if (this.message_ucDiagram) {
     //           this.message_ucDiagram.close();
@@ -326,41 +212,8 @@ export class PostInterfaceManager extends Longan.ViewerManagerBase {
     //       if (result) {
     //         this.ucDiagram = result.groups;
     //       }
-    //     });
-    // }
-
-    // // 杆件结果
-    // {
-    //   let table = "R_POSTMEMBERRESULTS";
-    //   let group = "LoadConditionName";
-
-    //   let columns = [
-    //     "MemberName",
-    //     "MemberID",
-    //     "Distance",
-    //     "ForceUnits",
-    //     "MomentUnits",
-    //     "DistanceUnits",
-    //     "MaxUC",
-    //     "AxialUC",
-    //     "YYBendingUC",
-    //     "ZZBendingUC",
-    //     "TotalShearUC",
-    //     "AXStress",
-    //     "YYBendingStress",
-    //     "ZZBendingStress",
-    //     "YShearStress",
-    //     "ZShearStress",
-    //     "AxialLoad",
-    //     "YYBendingMoment",
-    //     "ZZBendingMoment",
-    //   ];
 
-    //   let promises = [];
-    //   let promise1 = renderObjectService
-    //     .postData(projectId, table, columns, group)
-    //     .then((result: any) => {
-    //       if (result) {
+    //       if(result) {
     //         this.postResult = result.groups;
     //       }
     //     });
@@ -395,6 +248,157 @@ export class PostInterfaceManager extends Longan.ViewerManagerBase {
     //   });
     // }
 
+    // 内力图
+    {
+      let table = "R_POSTMEMBERRESULTS";
+      let group = "LoadConditionName";
+
+      let columns = [
+        "MemberName",
+        "MemberID",
+        "Distance",
+        "MomentUnits",
+        "DistanceUnits",
+        "YYBendingMoment",
+        "ZZBendingMoment",
+        "YShear",
+        "ZShear",
+        "AxialLoad",
+      ];
+
+      renderObjectService
+        .postData(projectId, table, columns, group)
+        .then((result: any) => {
+          this.event_bendingMoment.forEach((item: () => void) => {
+            item();
+          });
+
+          this.getFinish_bendingMoment = true;
+          if (this.tip_bendingMoment) {
+            if (this.message_bendingMoment) {
+              this.message_bendingMoment.close();
+              this.message_bendingMoment = null;
+            }
+            Message.info("内力图后处理数据请求完成.");
+            this.tip_bendingMoment = false;
+          }
+          if (result) {
+            this.bendingMoment = result.groups;
+
+            if (this.requested_bendingMoment) {
+              this.requested_bendingMoment();
+              this.requested_bendingMoment = null;
+            }
+          }
+        });
+    }
+
+    // UC图
+    {
+      let table = "R_POSTMEMBERRESULTS";
+      let group = "LoadConditionName";
+
+      let columns = [
+        "MemberName",
+        "MemberID",
+        "Distance",
+        "MomentUnits",
+        "DistanceUnits",
+        "AxialUC",
+        "YYBendingUC",
+        "ZZBendingUC",
+        "TotalShearUC",
+        "MaxUC",
+      ];
+
+      renderObjectService
+        .postData(projectId, table, columns, group)
+        .then((result: any) => {
+          this.event_ucDiagram.forEach((item: () => void) => {
+            item();
+          });
+
+          this.getFinish_ucDiagram = true;
+          if (this.tip_ucDiagram) {
+            if (this.message_ucDiagram) {
+              this.message_ucDiagram.close();
+              this.message_ucDiagram = null;
+            }
+            Message.info("UC图后处理数据请求完成.");
+            this.tip_ucDiagram = false;
+          }
+          if (result) {
+            this.ucDiagram = result.groups;
+          }
+        });
+    }
+
+    // 杆件结果
+    {
+      let table = "R_POSTMEMBERRESULTS";
+      let group = "LoadConditionName";
+
+      let columns = [
+        "MemberName",
+        "MemberID",
+        "Distance",
+        "ForceUnits",
+        "MomentUnits",
+        "DistanceUnits",
+        "MaxUC",
+        "AxialUC",
+        "YYBendingUC",
+        "ZZBendingUC",
+        "TotalShearUC",
+        "AXStress",
+        "YYBendingStress",
+        "ZZBendingStress",
+        "YShearStress",
+        "ZShearStress",
+        "AxialLoad",
+        "YYBendingMoment",
+        "ZZBendingMoment",
+      ];
+
+      let promises = [];
+      let promise1 = renderObjectService
+        .postData(projectId, table, columns, group)
+        .then((result: any) => {
+          if (result) {
+            this.postResult = result.groups;
+          }
+        });
+
+      let table1 = "ElementUC";
+      let columns1 = ["MemberName", "LoadCondition"];
+
+      let promise2 = renderObjectService
+        .postData(projectId, table1, columns1, "")
+        .then((result: any) => {
+          if (result) {
+            this.post_jointCanSummaryUC = result.rows;
+          }
+        });
+      promises.push(promise1);
+      promises.push(promise2);
+
+      Promise.all(promises).then(() => {
+        this.event_postResult.forEach((item: () => void) => {
+          item();
+        });
+
+        this.getFinish_postResult = true;
+        if (this.tip_postResult) {
+          if (this.message_postResult) {
+            this.message_postResult.close();
+            this.message_postResult = null;
+          }
+          Message.info("杆件结果后处理数据请求完成.");
+          this.tip_postResult = false;
+        }
+      });
+    }
+
     // 结构变形
     {
       let table = "R_POSTJOINTDISPLACEMENTRESULTS";

package/src/gsDevFx/managers/interfaceManagers/selectionInterfaceManager.ts

@@ -1,6 +1,7 @@
 import { Longan } from "gs-bim-air";
 import { CAEObjectSelector } from "../../operators/caeObjectSelector";
 import { Viewer } from "../../viewer";
+import { RenderObject } from "gs-longan";
 
 /**
  * 设置CAE对象的选择过滤
@@ -51,6 +52,14 @@ export class SelectionInterfaceManager extends Longan.ViewerManagerBase {
       this.jointSelection = true;
       this.memberSelection = true;
       this.plateSelection = true;
+
+      let viewer = this.viewer as Viewer;
+      let tempNode = viewer.process.caeRenderObjectTreeManager.tempNode;
+      let node = viewer.findInstanceObject(tempNode);
+      if (node) {
+        let segment = node.segment;
+        segment.selectability.unset();
+      }
     } else if (value === SelectorFiliter.Joint) {
       this.jointSelection = true;
       this.memberSelection = false;
@@ -72,18 +81,19 @@ export class SelectionInterfaceManager extends Longan.ViewerManagerBase {
     this._jointSelection = onoff;
     let viewer = this.viewer as Viewer;
     let ro = viewer.process.caeRenderObjectTreeManager.jointNode;
-    let node = viewer.findInstanceObject(ro);
-    if (node) {
-      let segment = node.segment;
+    this.setROSelectability(ro, onoff);
 
-      if (onoff) {
-        segment.selectability.unset();
-      } else {
+    if(onoff) {
+      let tempNode = viewer.process.caeRenderObjectTreeManager.tempNode;
+
+      let node = viewer.findInstanceObject(tempNode);
+      if (node) {
+        let segment = node.segment;
         segment.selectability
-          .setVertex(Longan.SelectabilityType.Off)
+          .setVertex(Longan.SelectabilityType.On)
+          .setMarker(Longan.SelectabilityType.On)
           .setFace(Longan.SelectabilityType.Off)
           .setLine(Longan.SelectabilityType.Off)
-          .setMarker(Longan.SelectabilityType.Off);
       }
     }
   }
@@ -97,34 +107,22 @@ export class SelectionInterfaceManager extends Longan.ViewerManagerBase {
     let viewer = this.viewer as Viewer;
 
     let ro = viewer.process.caeRenderObjectTreeManager.memberNode;
-    let node = viewer.findInstanceObject(ro);
-    if (node) {
-      let segment = node.segment;
-
-      if (onoff) {
-        segment.selectability.unset();
-      } else {
-        segment.selectability
-          .setVertex(Longan.SelectabilityType.Off)
-          .setFace(Longan.SelectabilityType.Off)
-          .setLine(Longan.SelectabilityType.Off)
-          .setMarker(Longan.SelectabilityType.Off);
-      }
-    }
+    this.setROSelectability(ro, onoff);
 
     let pile = viewer.process.caeRenderObjectTreeManager.pileNode;
-    let pileNode = viewer.findInstanceObject(pile);
-    if (pileNode) {
-      let segment = pileNode.segment;
+    this.setROSelectability(pile, onoff);
 
-      if (onoff) {
-        segment.selectability.unset();
-      } else {
+    if(onoff) {
+      let tempNode = viewer.process.caeRenderObjectTreeManager.tempNode;
+
+      let node = viewer.findInstanceObject(tempNode);
+      if (node) {
+        let segment = node.segment;
         segment.selectability
           .setVertex(Longan.SelectabilityType.Off)
-          .setFace(Longan.SelectabilityType.Off)
-          .setLine(Longan.SelectabilityType.Off)
-          .setMarker(Longan.SelectabilityType.Off);
+          .setMarker(Longan.SelectabilityType.Off)
+          .setFace(Longan.SelectabilityType.On)
+          .setLine(Longan.SelectabilityType.On)
       }
     }
   }
@@ -137,17 +135,19 @@ export class SelectionInterfaceManager extends Longan.ViewerManagerBase {
     this._plateSelection = onoff;
     let viewer = this.viewer as Viewer;
     let ro = viewer.process.caeRenderObjectTreeManager.plateNode;
-    let node = viewer.findInstanceObject(ro);
-    if (node) {
-      let segment = node.segment;
-      if (onoff) {
-        segment.selectability.unset();
-      } else {
+    this.setROSelectability(ro, onoff);
+
+    if(onoff) {
+      let tempNode = viewer.process.caeRenderObjectTreeManager.tempNode;
+
+      let node = viewer.findInstanceObject(tempNode);
+      if (node) {
+        let segment = node.segment;
         segment.selectability
           .setVertex(Longan.SelectabilityType.Off)
+          .setMarker(Longan.SelectabilityType.Off)
           .setFace(Longan.SelectabilityType.Off)
           .setLine(Longan.SelectabilityType.Off)
-          .setMarker(Longan.SelectabilityType.Off);
       }
     }
   }
@@ -156,6 +156,26 @@ export class SelectionInterfaceManager extends Longan.ViewerManagerBase {
     return this._plateSelection;
   }
 
+  private setROSelectability(ro: RenderObject, onoff: boolean) {
+    let viewer = this.viewer as Viewer;
+    if (ro) {
+      let node = viewer.findInstanceObject(ro);
+      if (node) {
+        let segment = node.segment;
+
+        if (onoff) {
+          segment.selectability.unset();
+        } else {
+          segment.selectability
+            .setVertex(Longan.SelectabilityType.Off)
+            .setFace(Longan.SelectabilityType.Off)
+            .setLine(Longan.SelectabilityType.Off)
+            .setMarker(Longan.SelectabilityType.Off);
+        }
+      }
+    }
+  }
+
   /**
    * SelectionInterfaceManager
    * 清除当前选择与高亮.

package/src/gsDevFx/objects/caeObjects/memberObject.ts

@@ -889,24 +889,60 @@ export class MemberObject extends LineObject implements IReferencedObject {
 
     let result = cardMember.getLine();
     if (this.startOffset || this.endOffset) {
-      if (
-        !this.arrayEqual(this.startOffset, [0, 0, 0]) ||
-        !this.arrayEqual(this.endOffset, [0, 0, 0])
-      ) {
-        result += "\n";
-
-        let cardMemberOffsets = new CardMemberOffsets();
-        cardMemberOffsets.lineLabel.value = "MEMBER OFFSETS";
-        cardMemberOffsets.comments.value = "";
-        cardMemberOffsets.jointA_XOffset.value = this.startOffset[0];
-        cardMemberOffsets.jointA_YOffset.value = this.startOffset[1];
-        cardMemberOffsets.jointA_ZOffset.value = this.startOffset[2];
-
-        cardMemberOffsets.jointB_XOffset.value = this.endOffset[0];
-        cardMemberOffsets.jointB_YOffset.value = this.endOffset[1];
-        cardMemberOffsets.jointB_ZOffset.value = this.endOffset[2];
-
-        result += cardMemberOffsets.getLine();
+      if (!this.startOffset) {
+        if (!this.arrayEqual(this.endOffset, [0, 0, 0])) {
+          result += "\n";
+
+          let cardMemberOffsets = new CardMemberOffsets();
+          cardMemberOffsets.lineLabel.value = "MEMBER OFFSETS";
+          cardMemberOffsets.comments.value = "";
+          cardMemberOffsets.jointA_XOffset.value = 0;
+          cardMemberOffsets.jointA_YOffset.value = 0;
+          cardMemberOffsets.jointA_ZOffset.value = 0;
+
+          cardMemberOffsets.jointB_XOffset.value = this.endOffset[0];
+          cardMemberOffsets.jointB_YOffset.value = this.endOffset[1];
+          cardMemberOffsets.jointB_ZOffset.value = this.endOffset[2];
+
+          result += cardMemberOffsets.getLine();
+        }
+      } else if (!this.endOffset) {
+        if (!this.arrayEqual(this.startOffset, [0, 0, 0])) {
+          result += "\n";
+
+          let cardMemberOffsets = new CardMemberOffsets();
+          cardMemberOffsets.lineLabel.value = "MEMBER OFFSETS";
+          cardMemberOffsets.comments.value = "";
+          cardMemberOffsets.jointA_XOffset.value = this.startOffset[0];
+          cardMemberOffsets.jointA_YOffset.value = this.startOffset[1];
+          cardMemberOffsets.jointA_ZOffset.value = this.startOffset[2];
+
+          cardMemberOffsets.jointB_XOffset.value = 0;
+          cardMemberOffsets.jointB_YOffset.value = 0;
+          cardMemberOffsets.jointB_ZOffset.value = 0;
+
+          result += cardMemberOffsets.getLine();
+        }
+      } else {
+        if (
+          !this.arrayEqual(this.startOffset, [0, 0, 0]) ||
+          !this.arrayEqual(this.endOffset, [0, 0, 0])
+        ) {
+          result += "\n";
+
+          let cardMemberOffsets = new CardMemberOffsets();
+          cardMemberOffsets.lineLabel.value = "MEMBER OFFSETS";
+          cardMemberOffsets.comments.value = "";
+          cardMemberOffsets.jointA_XOffset.value = this.startOffset[0];
+          cardMemberOffsets.jointA_YOffset.value = this.startOffset[1];
+          cardMemberOffsets.jointA_ZOffset.value = this.startOffset[2];
+
+          cardMemberOffsets.jointB_XOffset.value = this.endOffset[0];
+          cardMemberOffsets.jointB_YOffset.value = this.endOffset[1];
+          cardMemberOffsets.jointB_ZOffset.value = this.endOffset[2];
+
+          result += cardMemberOffsets.getLine();
+        }
       }
     }
 
@@ -1702,7 +1738,7 @@ export class MemberObject extends LineObject implements IReferencedObject {
       }
     }
 
-    if(length < 0) {
+    if (length < 0) {
       length = 0;
     }