gs-cae-design 1.1.62 → 1.1.63

package/package.json

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

package/src/gsDevFx/managers/datReaderManager.ts

@@ -1215,6 +1215,10 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
         process.addRenderObject(currentLoadConditionObj, windGroupObject);
       } else {
         windGroupObject.businessState = BusinessState.Editing;
+        for (let i = 0; i < windGroupObject.childObjects.length; i++) {
+          const item = windGroupObject.childObjects[i] as DesignBaseObject;
+          item.businessState = BusinessState.Deleting;
+        }
       }
 
       let card = new CardWIND(line);
@@ -1250,6 +1254,10 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
         process.addRenderObject(currentLoadConditionObj, waveGroupObject);
       } else {
         waveGroupObject.businessState = BusinessState.Editing;
+        for (let i = 0; i < waveGroupObject.childObjects.length; i++) {
+          const item = waveGroupObject.childObjects[i] as DesignBaseObject;
+          item.businessState = BusinessState.Deleting;
+        }
       }
 
       let card = new CardWAVE(line);
@@ -1285,6 +1293,10 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
         process.addRenderObject(currentLoadConditionObj, groupObject);
       } else {
         groupObject.businessState = BusinessState.Editing;
+        for (let i = 0; i < groupObject.childObjects.length; i++) {
+          const item = groupObject.childObjects[i] as DesignBaseObject;
+          item.businessState = BusinessState.Deleting;
+        }
       }
 
       let card = new CardCURR(line);
@@ -1438,33 +1450,27 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       pretreatmentRO,
       "回转中心"
     ) as DesignBaseObject;
-    let nameStart = 8;
-    let nameLen = 4;
-    let name = this.getDatData(line, nameStart, nameLen);
-
+    let name = this.getDatData(line, 8, 4).trim();
     let newName = this.checkNameRepeatAndGetNewName(
       process.nameCenterRoll,
       name
     );
-
-
     if (name !== newName) {
-      line = this.replaceFixedField(line, nameStart, nameLen, newName);
       name = newName;
     }
-    let ro = new CenterRenderObject(name);
-
-    let card = new CardCENTER(line)
-    ro = card.toRenderObject();
+    // 用 CardCENTER 解析 line
+    let card = new CardCENTER(line);
+    let ro = card.toRenderObject();
+    card.centerID.value = name;
+    ro.centerID = name;
     ro.businessState = BusinessState.Creating;
-    ro.cardObject = new CardCENTER(line);
+    ro.cardObject = card;
     ro.name = name;
-    if (centerRollParent && centerRollParent?.childObjects?.length > 9) return
-    process.addRenderObject(
-      centerRollParent,
-      ro
-    );
+    // 限制数量
+    if (centerRollParent && centerRollParent?.childObjects?.length > 9) return;
+    process.addRenderObject(centerRollParent, ro);
   }
+
   // 风载屏蔽区域
   private readWINSHLData(line: string) {
     if (line.trimEnd() === "WINSHL") {
@@ -1483,24 +1489,22 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
     ) as DesignBaseObject;
 
     // 如果有数据 则不导入
-    if (windShieldParent) return
-    windShieldParent = new DesignBaseObject();
-    windShieldParent.businessState = BusinessState.Creating;
-    windShieldParent.name = "风载屏蔽区域";
-    process.addRenderObject(pretreatmentRO, windShieldParent);
+    if (windShieldParent && windShieldParent?.childObjects?.length) return
+    if(!windShieldParent){
+      windShieldParent = new DesignBaseObject();
+      windShieldParent.businessState = BusinessState.Creating;
+      windShieldParent.name = "风载屏蔽区域";
+      process.addRenderObject(pretreatmentRO, windShieldParent);
+    }
+
+
 
     let ro = process.findRenderObjectByType(
       "WindShieldObject"
     ) as WindShieldObject;
-    if (!ro) {
-      ro = new WindShieldObject();
-      ro.businessState = BusinessState.Creating;
-    } else {
-      ro.cardData = line;
-      ro.businessState = BusinessState.Editing;
-    }
     let card = new CardWINSHL(line);
     ro = card.toRenderObject();
+    ro.businessState = BusinessState.Creating;
     ro.cardData = line;
     process.addRenderObject(windShieldParent, ro);
   }
@@ -1518,7 +1522,7 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
     ) as DesignBaseObject;
     const start = 7;
     const len = 8;   // 占位长度
-    let name = this.getDatData(line, start, len);
+    let name = this.getDatData(line, start, len).trim();
     let newName = this.checkNameRepeatAndGetNewName(
       process.nameSurfaceDefinition,
       name
@@ -1526,14 +1530,15 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
     console.log('name',name,name.length,newName,newName.length);
 
     if (name !== newName) {
-      line = this.replaceFixedField(line, start, len, newName);
       name = newName;
     }
     let card = new CardSURFID(line)
+    card.surfaceID.value = name
     let ro = new SurfaceDefinitionObject(name);
     ro = card.toRenderObject();
     ro.businessState = BusinessState.Creating;
-    ro.cardObject = new CardSURFID(line);
+    ro.cardObject = card;
+    ro.surfaceID = name
     ro.name = name;
     process.addRenderObject(
       SurfIDRollParent,
@@ -1563,7 +1568,9 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       this.activeSurfIDName
     ) as SurfaceDefinitionObject;
     // 对应表面定义对象增加边界节点
-    surfaceIDRO.boundaryJoints = ro
+    if(surfaceIDRO) {
+      surfaceIDRO.boundaryJoints = ro
+    }
   }
   // 表面质量
   private readSurfWTData(line: string) {
@@ -1577,15 +1584,14 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
     const weightIDStart = 17;
     const weightIDLen = 8;
 
-    let weightID = this.getDatData(line, weightIDStart, weightIDLen);
-    let weightGroupID = this.getDatData(line, 6, 4);
+    let weightID = this.getDatData(line, weightIDStart, weightIDLen).trim();
+    let weightGroupID = this.getDatData(line, 6, 4).trim();
 
     // 检查质量ID是否存在
     let newWeightID = this.checkNameRepeatAndGetNewName(
       process.nameSurfaceWeight, weightID
     );
     if (weightID !== newWeightID) {
-      line = this.replaceFixedField(line, weightIDStart, weightIDLen, newWeightID);
       weightID = newWeightID;
     }
 
@@ -1598,12 +1604,14 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       "表面质量"
     ) as DesignBaseObject;
     let ro = new SurfaceWeightObject(weightID);
+
     let card = new CardSURFWT(line)
+    card.weightID.value = weightID
     ro = card.toRenderObject();
-
-    ro.businessState = BusinessState.Creating;
-    ro.cardObject = new CardSURFWT(line);
+    ro.weightID = weightID
     ro.name = weightID;
+    ro.businessState = BusinessState.Creating;
+    ro.cardObject = card;
     process.addRenderObject(
       surfaceWeightParent,
       ro
@@ -1644,7 +1652,7 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       line = line.trim();
       if (!line) continue;
       if (line.startsWith("LOADCN")) {
-        loadConditionName = this.getDatData(line, 6, 4);
+        loadConditionName = this.getDatData(line, 6, 4).trim();
         continue;
       }
       if (line.startsWith("DEAD") && line.length > 4 && loadConditionName) {
@@ -3047,16 +3055,6 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
 
     this._needAddTreeLoadConditions = new Array<LoadConditionObject>();
   }
-  // line 重名替换
-  private replaceFixedField(line: string, startOneBased: number, len: number, newValue: string): string {
-    const start = Math.max(0, startOneBased - 1);        // 把 1-based 转成 0-based
-    const padded = (newValue ?? '').padEnd(len, ' ').slice(0, len); // 填充或截断到 len
-    // 如果原行不够长，补足空格
-    if (line.length < start + len) {
-      line = line.padEnd(start + len, ' ');
-    }
-    return line.slice(0, start) + padded + line.slice(start + len);
-  }
   /**
    * import dat也会调用import seainp，所以把解析构件分组的逻辑加载这里.
    * @param content

package/src/gsDevFx/managers/datWriterManager.ts

@@ -270,11 +270,15 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
     ) as SeastateFile[];
     datCardData = this.renderobjectsSerializeToCard(files, datCardData);
 
-    let cdms = process.findRenderObjectsByType("CdmRenderObject") as CdmRenderObject[];
-    if (cdms.length > 0) {
+    let SeastateCdmNode =  process.findCaeObjectByNameInChildObject(
+      process.caeRenderObjectTreeManager.postResultNode,
+      "拖曳和惯性系数"
+    );
+    if (SeastateCdmNode) {
+      let cdms = SeastateCdmNode.childObjects;
       datCardData += "CDM" + "\n";
+      datCardData = this.renderobjectsSerializeToCard(cdms, datCardData);
     }
-    datCardData = this.renderobjectsSerializeToCard(cdms, datCardData);
 
     //mgrov
     let mgrovDivideRO = process.findRenderObjectByName(
@@ -336,6 +340,9 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
     if (lcombNode) {
       for (let i = 0; i < lcombNode.childObjects.length; i++) {
         let loadCombinationGroup = lcombNode.childObjects[i] as LoadCombinationGroupObject;
+        if(!loadCombinationGroup.checkBusinessStateIsActive()) {
+          continue
+        }
         datCardData += loadCombinationGroup.serializeToCardSeaInp();
       }
     }
@@ -446,6 +453,9 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
     if (lcombNode) {
       for (let i = 0; i < lcombNode.childObjects.length; i++) {
         let loadCombinationGroup = lcombNode.childObjects[i] as LoadCombinationGroupObject;
+        if(!loadCombinationGroup.checkBusinessStateIsActive()) {
+          continue
+        }
         datCardData += loadCombinationGroup.serializeToCardSacInp();
       }
     }
@@ -492,7 +502,7 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
     let windShieldNode = process.findCaeObjectByNameInChildObject(
       process.caeRenderObjectTreeManager.pretreatmentNode,
       "风载屏蔽区域"
-    ) as WindShieldObject;
+    );
     if (windShieldNode) {
         for (let i = 0; i < windShieldNode.childObjects.length; i++) {
           let child = windShieldNode.childObjects[i] as WindShieldObject;
@@ -522,7 +532,6 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
             continue;
           }
         let BoundaryJointsGroup = surfaceDefinitionGroup.boundaryJoints as BoundaryJointsObject;
-        console.log('BoundaryJointsGroup',BoundaryJointsGroup);
         datCardData += surfaceDefinitionGroup.serializeToCard() + '\n';
         datCardData += BoundaryJointsGroup.serializeToCard() + '\n';
       }
@@ -533,8 +542,6 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
       process.caeRenderObjectTreeManager.pretreatmentNode,
       "表面质量"
     );
-    console.log('保存表面质量',SurfaceWeightNode);
-
     if (SurfaceWeightNode) {
       for (let i = 0; i < SurfaceWeightNode.childObjects.length; i++) {
         let surfaceWeightGroup = SurfaceWeightNode.childObjects[i] as SurfaceWeightObject;
@@ -567,6 +574,9 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
     if (weightNode) {
       for (let i = 0; i < weightNode.childObjects.length; i++) {
         let weightGroup = weightNode.childObjects[i] as WeightGroupObject;
+        if(!weightGroup.checkBusinessStateIsActive()) {
+          continue
+        }
         datCardData += weightGroup.serializeToCardSacInp();
       }
     }

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

@@ -110,6 +110,7 @@ import CommandSurfaceWeightEdit from "../../../viewerWrapper/commands/pretreatme
 import CommandAddDeadLoad from '../../../viewerWrapper/commands/aftertreatment/addDeadLoad/commandAddDeadLoad'
 import CommandEditDeadLoad from '../../../viewerWrapper/commands/aftertreatment/editDeadLoad/commandEditDeadLoad'
 import CommandWindShield from '../../../viewerWrapper/commands/pretreatment/windShield/commandWindShield'
+import CommandWindArea from '../../../viewerWrapper/commands/pretreatment/windArea/commandWindArea'
 import { SectionViewer } from "../../../gsDevFx/sectionViewer";
 export class CommandInterfaceManager extends Longan.ViewerManagerBase {
   constructor(viewer: Viewer) {
@@ -1706,6 +1707,15 @@ export class CommandInterfaceManager extends Longan.ViewerManagerBase {
       .currentCommand as CommandWindShield;
     return command;
   }
+  CommandWindArea(){
+      let command = new CommandWindArea();
+    (this.viewer.process.commandManager as CommandManager).multiplyExecute(
+      command
+    );
+    command = this.viewer.process.commandManager
+      .currentCommand as CommandWindArea;
+    return command;
+  }
   commandAddDeadLoad(){
        let command = new CommandAddDeadLoad();
     (this.viewer.process.commandManager as CommandManager).multiplyExecute(

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

@@ -136,12 +136,14 @@ 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",
@@ -152,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();
@@ -178,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();
@@ -219,43 +213,6 @@ export class PostInterfaceManager extends Longan.ViewerManagerBase {
             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"];
@@ -287,6 +244,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";