gs-cae-design 1.1.66 → 1.1.68

package/package.json

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

package/src/caeCardEditor/caeCardObjects/cardJointElastic.ts

@@ -1,5 +1,6 @@
 import { JointElasticRestraint } from "../../gsDevFx/objects/caeObjects/jointObject";
 import { CardObject } from "./cardObject";
+import { CaeNumber } from "../../utility/utility";
 
 /**
  * 卡片编辑器的空间点对象
@@ -124,12 +125,12 @@ export class CardJointElastic extends CardObject {
 
   toElastic() {
     let elastic = new JointElasticRestraint();
-    elastic.dx = this.dx.value;
-    elastic.dy = this.dy.value;
-    elastic.dz = this.dz.value;
-    elastic.rx = this.rx.value;
-    elastic.ry = this.ry.value;
-    elastic.rz = this.rz.value;
+    elastic.dx = CaeNumber(this.dx.value);
+    elastic.dy = CaeNumber(this.dy.value);
+    elastic.dz = CaeNumber(this.dz.value);
+    elastic.rx = CaeNumber(this.rx.value);
+    elastic.ry = CaeNumber(this.ry.value);
+    elastic.rz = CaeNumber(this.rz.value);
     elastic.secondJointName = this.secondJointName.value;
     elastic.thirdJointName = this.thirdJointName.value;
 

package/src/caeCardEditor/caeCardObjects/cardLOADCONC.ts

@@ -117,6 +117,8 @@ export class CardLOADCONC extends CardObject {
       this.jointBName.value.trimEnd()) as any;
     obj.distanceToLoad = CaeNumber(this.distanceToLoadForce.value);
     obj.concentratedForceValue = CaeNumber(this.concentratedForceValue.value);
+    obj.distanceToLoadMoment = CaeNumber(this.distanceToLoadMoment.value);
+    obj.concentratedMomentValue = CaeNumber(this.concentratedMomentValue.value);
     obj.loadCoorSystem = this.loadCorrdinateSystem.value;
     obj.loadType = this.loadType.value;
     obj.loadGroup = this.loadID.value;

package/src/caeCardEditor/caeCardObjects/cardMember.ts

@@ -1,8 +1,5 @@
-import { Process } from "../../gsDevFx/process";
 import { MemberObject } from "../../gsDevFx/objects/caeObjects/memberObject";
 import { CardObject } from "./cardObject";
-import { JointObject } from "../../gsDevFx/objects/caeObjects/jointObject";
-import { GrupObject } from "../../gsDevFx/objects/caeObjects/grupObject";
 import { CaeNumber } from "../../utility/utility";
 /**
  * 卡片编辑器的杆件对象
@@ -236,7 +233,7 @@ export class CardMember extends CardObject {
     value: "",
     range: [35, 41],
     label: "Chord Angle",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(deg)",
     span: 0,
   };
@@ -282,7 +279,7 @@ export class CardMember extends CardObject {
     value: "",
     range: [47, 51],
     label: "Average Joint Thickness",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(m)",
     span: 0,
   };
@@ -293,7 +290,7 @@ export class CardMember extends CardObject {
     value: "",
     range: [51, 55],
     label: "Overall Buckling Length Y-axis(Major)",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(m)",
     span: 0,
   };
@@ -304,7 +301,7 @@ export class CardMember extends CardObject {
     value: "",
     range: [55, 59],
     label: "Overall Buckling Length Z-axis(Major)",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(m)",
     span: 0,
   };
@@ -315,7 +312,7 @@ export class CardMember extends CardObject {
     value: "",
     range: [59, 64],
     label: "Unbraced Length or TUB Shear Modifier",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(m)",
     span: 0,
   };
@@ -327,12 +324,12 @@ export class CardMember extends CardObject {
     value: "",
     range: [64, 70],
     label: "Weight Density",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(tonne/m3)",
     span: 0,
   };
   /**
-   * 单元数量：71-72
+   * 单元数量：71-71
    */
   ucSegments = {
     value: "",
@@ -350,7 +347,7 @@ export class CardMember extends CardObject {
     value: "",
     range: [72, 78],
     label: "Effective Diameter for Added Mass",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(cm)",
     span: 0,
   };

package/src/caeCardEditor/caeCardObjects/cardObject.ts

@@ -39,26 +39,39 @@ export class CardObject {
           hasData = true;
         }
 
-        let value = (this[key].value === 0 || this[key].value)
-          ? this[key].value.toString().trimEnd().trim()
-          : "";
+        let value =
+          this[key].value === 0 || this[key].value
+            ? this[key].value.toString().trimEnd().trim()
+            : "";
 
-        let result = value;
+        let result = value as string;
 
         if (result) {
-          let num = Number(result);
           let axlen = this[key].range[1] - this[key].range[0];
-          let resultExp = num.toExponential();
-          let fix = Math.abs(Number((resultExp as string).split("e")[1]));
-          if (num > 0) {
-            if (fix > axlen - 1) {
-              result = num.toExponential(axlen - 4).toString();
-              result = (result as string).replace("e", "");
-            }
+          if (result.length > axlen && axlen <= 5) {
+            // 数值位数超出卡片限制的长度，则导出为""
+            result = "";
+            hasData = false;
           } else {
-            if (fix > axlen - 2) {
-              result = num.toExponential(axlen - 5).toString();
-              result = (result as string).replace("e", "");
+            let num = Number(result);
+            // 最多保留三位小数
+            num = Number(num.toFixed(3));
+            // 转科学计数法
+            let resultExp = num.toExponential();
+            // 单独提取指数
+            let fix = Math.abs(Number((resultExp as string).split("e")[1]));
+            if (num > 0) {
+              // 正数
+              if (fix > axlen - 1) {
+                result = num.toExponential(axlen - 4).toString();
+                result = (result as string).replace("e", "");
+              }
+            } else {
+              // 负数
+              if (fix > axlen - 2) {
+                result = num.toExponential(axlen - 5).toString();
+                result = (result as string).replace("e", "");
+              }
             }
           }
         }
@@ -67,9 +80,10 @@ export class CardObject {
           result += ".";
         }
 
-        let number = this[key].range[1] - this[key].range[0] - result.length;
+        // 补满空格.
+        let roopTime = this[key].range[1] - this[key].range[0] - result.length;
         let space = "";
-        for (let i = 0; i < number; i++) {
+        for (let i = 0; i < roopTime; i++) {
           space += " ";
         }
         result = space + result;

package/src/caeCardEditor/caeCardObjects/cardPGrup.ts

@@ -1,3 +1,4 @@
+import { CaeNumber } from "../../utility/utility";
 import { PGrupObject } from "../../gsDevFx/objects/caeObjects/pGrupObject";
 import { CardObject } from "./cardObject";
 /**
@@ -111,13 +112,13 @@ export class CardPGrup extends CardObject {
   toPGrupObject() {
     let obj = new PGrupObject();
     obj.name = this.plateGrupLabel.value.trimEnd();
-    obj.thickness = this.plateThickness.value;
+    obj.thickness = CaeNumber(this.plateThickness.value);
     obj.plateType = this.plateType.value;
-    obj.materialData_E = this.materialData_E.value;
-    obj.poissonRatiou = this.poissonRatiou.value;
-    obj.yieldStress = this.yieldStress.value;
-    obj.plateZOffset = this.plateZOffset.value;
-    obj.weightDensity = this.weightDensity.value;
+    obj.materialData_E = CaeNumber(this.materialData_E.value);
+    obj.poissonRatiou = CaeNumber(this.poissonRatiou.value);
+    obj.yieldStress = CaeNumber(this.yieldStress.value);
+    obj.plateZOffset = CaeNumber(this.plateZOffset.value);
+    obj.weightDensity = CaeNumber(this.weightDensity.value);
 
     return obj;
   }

package/src/caeCardEditor/caeCardObjects/cardPlate.ts

@@ -3,6 +3,7 @@ import { PlateObject } from "../../gsDevFx/objects/caeObjects/plateObject";
 import { CardObject } from "./cardObject";
 import { JointObject } from "../../gsDevFx/objects/caeObjects/jointObject";
 import { PGrupObject } from "../../gsDevFx/objects/caeObjects/pGrupObject";
+import { CaeNumber } from "../../utility/utility";
 
 /**
  * 卡片编辑器的板对象
@@ -189,9 +190,9 @@ export class CardPlate extends CardObject {
     obj.pGrup = this.plateGrupLabel.value.trimEnd() as any;
     obj.offsets = null;
     obj.rpsk = this.rpsk.value;
-    obj.plateThickness = this.plateThickness.value;
+    obj.plateThickness = CaeNumber(this.plateThickness.value);
     obj.offsetOption = this.offsetOption.value;
-    obj.materialData_E = this.materialData_E.value;
+    obj.materialData_E = CaeNumber(this.materialData_E.value);
     obj.poissonRatiou = this.poissonRatiou.value;
     obj.yieldStress = this.yieldStress.value;
     obj.weightDensity = this.weightDensity.value;

package/src/caeCardEditor/caeCardObjects/cardSection.ts

@@ -1,3 +1,4 @@
+import { CaeNumber } from "../../utility/utility";
 import { SectionObject } from "../../gsDevFx/objects/caeObjects/sectionObject";
 import { CardObject } from "./cardObject";
 
@@ -92,9 +93,9 @@ export class CardSection extends CardObject {
   updateRenderObject(ro: SectionObject) {
     ro.name = this.crossSectionLabel.value.trimEnd();
     ro.crossSectionType = this.crossSectionType.value.trimEnd();
-    ro.stiffnessPro_AX = this.stiffnessPro_AX.value;
-    ro.stiffnessPro_J = this.stiffnessPro_J.value;
-    ro.stiffnessPro_IY = this.stiffnessPro_IY.value;
-    ro.stiffnessPro_IZ = this.stiffnessPro_IZ.value;
+    ro.stiffnessPro_AX = CaeNumber(this.stiffnessPro_AX.value);
+    ro.stiffnessPro_J = CaeNumber(this.stiffnessPro_J.value);
+    ro.stiffnessPro_IY = CaeNumber(this.stiffnessPro_IY.value);
+    ro.stiffnessPro_IZ = CaeNumber(this.stiffnessPro_IZ.value);
   }
 }

package/src/caeCardEditor/caeCardObjects/sacinp/cardSURFID.ts

@@ -45,7 +45,7 @@ export class CardSURFID extends CardObject {
   };
   localYJointName = {
     value: "",
-    range: [27, 32],
+    range: [28, 32],
     span: 1,
     label: "Local Y Joint ID",
     type: "Alphanumeric",
@@ -53,7 +53,7 @@ export class CardSURFID extends CardObject {
   };
   outOfPlaneTolerance = {
     value: "",
-    range: [33, 42],
+    range: [33, 40],
     span: 0,
     label: "Out-of-Plane Tolerance",
     type: "Floating Point",

package/src/gsDevFx/managers/cloudMemberTransformManager.ts

@@ -392,6 +392,7 @@ export class CloudMemberTransformManager extends Longan.ProcessManagerBase {
       ) as ConSectionObject;
       newSection._businessState = BusinessState.Living;
       newSection.name = uuid();
+      newSection.isTemp = true;
       let largeOD = Number(newSection.largeOD);
       let smallOD = Number(newSection.smallOD);
       if (afterOD != -1) {

package/src/gsDevFx/managers/datWriterManager.ts

@@ -247,6 +247,16 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
     ) as SeastateLdopt[];
     datCardData = this.renderobjectsSerializeToCard(ldopts, datCardData);
 
+    let lcsels = process.findRenderObjectsByType(
+      "SeastateLcsel"
+    ) as SeastateLcsel[];
+    datCardData = this.renderobjectsSerializeToCard(lcsels, datCardData);
+
+    let files = process.findRenderObjectsByType(
+      "SeastateFile"
+    ) as SeastateFile[];
+    datCardData = this.renderobjectsSerializeToCard(files, datCardData);
+
     let hydros = process.findRenderObjectsByType(
       "SeastateHydro"
     ) as SeastateHydro[];
@@ -257,21 +267,11 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
     ) as SeastateHydro2[];
     datCardData = this.renderobjectsSerializeToCard(hydro2s, datCardData);
 
-    let lcsels = process.findRenderObjectsByType(
-      "SeastateLcsel"
-    ) as SeastateLcsel[];
-    datCardData = this.renderobjectsSerializeToCard(lcsels, datCardData);
-
     let ucparts = process.findRenderObjectsByType(
       "SeastateUcpart"
     ) as SeastateUcpart[];
     datCardData = this.renderobjectsSerializeToCard(ucparts, datCardData);
 
-    let files = process.findRenderObjectsByType(
-      "SeastateFile"
-    ) as SeastateFile[];
-    datCardData = this.renderobjectsSerializeToCard(files, datCardData);
-
     let SeastateCdmNode =  process.findCaeObjectByNameInChildObject(
       process.caeRenderObjectTreeManager.postResultNode,
       "拖曳和惯性系数"
@@ -282,39 +282,6 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
       datCardData = this.renderobjectsSerializeToCard(cdms, datCardData);
     }
 
-    //mgrov
-    let mgrovDivideRO = process.findRenderObjectByName(
-      "海生物厚度按高程分色"
-    ) as ColorDivMGROVObject;
-    if (mgrovDivideRO) {
-      datCardData += "MGROV" + "\n";
-      let mgrovs = mgrovDivideRO.mgrovList;
-      datCardData = this.renderobjectsSerializeToCard(mgrovs, datCardData);
-    }
-    //corrz
-    let corrzDivideRO = process.findRenderObjectByName(
-      "腐蚀余量按高程分色"
-    ) as ColorDivCORRZObject;
-    if (corrzDivideRO) {
-      datCardData += "CORRZ" + "\n";
-      let corrzs = corrzDivideRO.corrzList;
-      datCardData = this.renderobjectsSerializeToCard(corrzs, datCardData);
-    }
-    // //incwgt
-    // let incwgts = process.findRenderObjectsByType(
-    //   "SeastateIncwgt"
-    // ) as SeastateIncwgt[];
-    // datCardData = this.renderobjectsSerializeToCard(incwgts, datCardData);
-    // //accel
-    // let accels = process.findRenderObjectsByType(
-    //   "SeastateAccel"
-    // ) as SeastateAccel[];
-    // datCardData = this.renderobjectsSerializeToCard(accels, datCardData);
-    // //dead
-    // let deads = process.findRenderObjectsByType(
-    //   "SeastateDead"
-    // ) as SeastateDead[];
-    // datCardData = this.renderobjectsSerializeToCard(deads, datCardData);
     //load
     let loadNode = process.findCaeObjectByNameInChildObject(
       process.caeRenderObjectTreeManager.postResultNode,
@@ -335,6 +302,27 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
         datCardData += loadCondition.serializeToCardSeaInp();
       }
     }
+
+    //mgrov
+    let mgrovDivideRO = process.findRenderObjectByName(
+      "海生物厚度按高程分色"
+    ) as ColorDivMGROVObject;
+    if (mgrovDivideRO) {
+      datCardData += "MGROV" + "\n";
+      let mgrovs = mgrovDivideRO.mgrovList;
+      datCardData = this.renderobjectsSerializeToCard(mgrovs, datCardData);
+    }
+
+    //corrz
+    let corrzDivideRO = process.findRenderObjectByName(
+      "腐蚀余量按高程分色"
+    ) as ColorDivCORRZObject;
+    if (corrzDivideRO) {
+      datCardData += "CORRZ" + "\n";
+      let corrzs = corrzDivideRO.corrzList;
+      datCardData = this.renderobjectsSerializeToCard(corrzs, datCardData);
+    }
+
     let lcombNode = process.findCaeObjectByNameInChildObject(
       process.caeRenderObjectTreeManager.postResultNode,
       "荷载组合"
@@ -386,6 +374,25 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
     let codes = process.findRenderObjectsByType("ModelCodeIs") as ModelCodeIs[];
     datCardData = this.renderobjectsSerializeToCard(codes, datCardData);
 
+    // lrfd
+    let lrfdFactorsNode = process.findCaeObjectByNameInChildObject(
+      process.caeRenderObjectTreeManager.postResultNode,
+      "LRFD抗力系数"
+    );
+    if (lrfdFactorsNode) {
+      datCardData += '\n'
+      for (let i = 0; i < lrfdFactorsNode.childObjects.length; i++) {
+        let child = lrfdFactorsNode.childObjects[i] as LRFDFactorsObject;
+        if (
+          child.businessState === BusinessState.Deleting ||
+          child.businessState === BusinessState.Dead
+        ) {
+          continue;
+        }
+        datCardData += child.serializeToCard() + '\n';
+      }
+    }
+
     datCardData += "SECT\n";
     datCardData = this.exportSectionData(datCardData);
 
@@ -395,12 +402,6 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
     }
     datCardData = this.renderobjectsSerializeToCard(grups, datCardData);
 
-    let joints = this.viewer.process.findRenderObjectsByType("JointObject");
-    if (joints.length > 0) {
-      datCardData += "JOINT\n";
-    }
-    datCardData = this.renderobjectsSerializeToCard(joints, datCardData);
-
     let members = this.viewer.process.findRenderObjectsByType("MemberObject");
     if (members.length > 0) {
       datCardData += "MEMBER\n";
@@ -419,122 +420,32 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
     }
     datCardData = this.renderobjectsSerializeToCard(plates, datCardData);
 
-
-
-
-
-    let loadNode = process.findCaeObjectByNameInChildObject(
-      process.caeRenderObjectTreeManager.postResultNode,
-      "荷载工况"
-    );
-    if (loadNode) {
-      if (loadNode.childObjects.length > 0) {
-        datCardData += "LOAD\n";
-      }
-      for (let i = 0; i < loadNode.childObjects.length; i++) {
-        let loadCondition = loadNode.childObjects[i] as LoadConditionObject;
-        if(!loadCondition.checkBusinessStateIsActive()) {
-          continue;
-        }
-        for (let j = 0; j < loadCondition.childObjects.length; j++) {
-          let loadGroup = loadCondition.childObjects[j] as LoadGroupObject;
-          if(!loadGroup.checkBusinessStateIsActive()) {
-            continue;
-          }
-          if (loadGroup instanceof LoadGroupObject) {
-            datCardData += loadGroup.serializeToCardSacInp();
-          }
-        }
-      }
-    }
-
-    let lcombNode = process.findCaeObjectByNameInChildObject(
-      process.caeRenderObjectTreeManager.postResultNode,
-      "荷载组合"
-    );
-    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();
-      }
-    }
-    // 自重荷载
-    let deadLoadNode = process.findRenderObjectByName(
-      "自重荷载"
-    ) as DeadLoadObject;
-    if (deadLoadNode) {
-      datCardData += "\n";
-      console.log('deadLoadNode.childObjects',deadLoadNode.childObjects);
-
-      for (let i = 0; i < deadLoadNode.childObjects.length; i++) {
-        let child = deadLoadNode.childObjects[i] as DeadLoadObject;
-        console.log('自重荷载child',child);
-        datCardData += child.serializeLOADCNToCard()
-        datCardData += "DEAD\n";
-        datCardData += child.serializeToCard()+ "\n"
-      }
+    let joints = this.viewer.process.findRenderObjectsByType("JointObject");
+    if (joints.length > 0) {
+      datCardData += "JOINT\n";
     }
-
-
+    datCardData = this.renderobjectsSerializeToCard(joints, datCardData);
 
     // 回转中心
-      let cneterRollNode = process.findCaeObjectByNameInChildObject(
-        process.caeRenderObjectTreeManager.pretreatmentNode,
-        "回转中心"
-      );
-      if (cneterRollNode) {
-        datCardData += '\n'
-        for (let i = 0; i < cneterRollNode.childObjects.length; i++) {
-          let child = cneterRollNode.childObjects[i] as CenterRenderObject;
-          if (
-            child.businessState === BusinessState.Deleting ||
-            child.businessState === BusinessState.Dead
-          ) {
-
-          continue;
-        }
-        datCardData += child.serializeToCard() + '\n';
-      }
-    }
-    // lrfd
-    let lrfdFactorsNode = process.findCaeObjectByNameInChildObject(
-      process.caeRenderObjectTreeManager.postResultNode,
-      "LRFD抗力系数"
+    let cneterRollNode = process.findCaeObjectByNameInChildObject(
+      process.caeRenderObjectTreeManager.pretreatmentNode,
+      "回转中心"
     );
-    if (lrfdFactorsNode) {
+    if (cneterRollNode) {
       datCardData += '\n'
-      for (let i = 0; i < lrfdFactorsNode.childObjects.length; i++) {
-        let child = lrfdFactorsNode.childObjects[i] as LRFDFactorsObject;
+      for (let i = 0; i < cneterRollNode.childObjects.length; i++) {
+        let child = cneterRollNode.childObjects[i] as CenterRenderObject;
         if (
           child.businessState === BusinessState.Deleting ||
           child.businessState === BusinessState.Dead
         ) {
+
           continue;
         }
         datCardData += child.serializeToCard() + '\n';
       }
     }
 
-    // 风载屏蔽区域
-    let windShieldNode = process.findCaeObjectByNameInChildObject(
-      process.caeRenderObjectTreeManager.pretreatmentNode,
-      "风载屏蔽区域"
-    );
-    if (windShieldNode) {
-        for (let i = 0; i < windShieldNode.childObjects.length; i++) {
-          let child = windShieldNode.childObjects[i] as WindShieldObject;
-          if (
-            child.businessState === BusinessState.Deleting ||
-            child.businessState === BusinessState.Dead
-          ) {
-            continue;
-          }
-          datCardData += child.serializeToCard() + '\n';
-        }
-    }
     // 表面定义
     let SurfaceDefinitionNode = process.findCaeObjectByNameInChildObject(
       process.caeRenderObjectTreeManager.pretreatmentNode,
@@ -584,12 +495,84 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
     }
     datCardData = this.renderobjectsSerializeToCard(wgtmems, datCardData);
 
+    // weight
+    let weightNode = process.findCaeObjectByNameInChildObject(
+      process.caeRenderObjectTreeManager.pretreatmentNode,
+      "附加质量"
+    );
+    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();
+      }
+    }
+
+
+    let loadNode = process.findCaeObjectByNameInChildObject(
+      process.caeRenderObjectTreeManager.postResultNode,
+      "荷载工况"
+    );
+    if (loadNode) {
+      if (loadNode.childObjects.length > 0) {
+        datCardData += "LOAD\n";
+      }
+      for (let i = 0; i < loadNode.childObjects.length; i++) {
+        let loadCondition = loadNode.childObjects[i] as LoadConditionObject;
+        if(!loadCondition.checkBusinessStateIsActive()) {
+          continue;
+        }
+        for (let j = 0; j < loadCondition.childObjects.length; j++) {
+          let loadGroup = loadCondition.childObjects[j] as LoadGroupObject;
+          if(!loadGroup.checkBusinessStateIsActive()) {
+            continue;
+          }
+          if (loadGroup instanceof LoadGroupObject) {
+            datCardData += loadGroup.serializeToCardSacInp();
+          }
+        }
+      }
+    }
+
+    let lcombNode = process.findCaeObjectByNameInChildObject(
+      process.caeRenderObjectTreeManager.postResultNode,
+      "荷载组合"
+    );
+    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();
+      }
+    }
+
+    // 风载屏蔽区域
+    let windShieldNode = process.findCaeObjectByNameInChildObject(
+      process.caeRenderObjectTreeManager.pretreatmentNode,
+      "风载屏蔽区域"
+    );
+    if (windShieldNode) {
+        for (let i = 0; i < windShieldNode.childObjects.length; i++) {
+          let child = windShieldNode.childObjects[i] as WindShieldObject;
+          if (
+            child.businessState === BusinessState.Deleting ||
+            child.businessState === BusinessState.Dead
+          ) {
+            continue;
+          }
+          datCardData += child.serializeToCard() + '\n';
+        }
+    }
+    
     // 受风面定义 WindAreaObject
     let WindAreaObjectNode = process.findCaeObjectByNameInChildObject(
       process.caeRenderObjectTreeManager.pretreatmentNode,
       "受风面定义"
     );
-
     if (WindAreaObjectNode) {
       datCardData += "AREA\n";
 
@@ -613,19 +596,20 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
       }
     }
 
+    // 自重荷载
+    let deadLoadNode = process.findRenderObjectByName(
+      "自重荷载"
+    ) as DeadLoadObject;
+    if (deadLoadNode) {
+      datCardData += "\n";
+      console.log('deadLoadNode.childObjects',deadLoadNode.childObjects);
 
-    // weight
-    let weightNode = process.findCaeObjectByNameInChildObject(
-      process.caeRenderObjectTreeManager.pretreatmentNode,
-      "附加质量"
-    );
-    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();
+      for (let i = 0; i < deadLoadNode.childObjects.length; i++) {
+        let child = deadLoadNode.childObjects[i] as DeadLoadObject;
+        console.log('自重荷载child',child);
+        datCardData += child.serializeLOADCNToCard()
+        datCardData += "DEAD\n";
+        datCardData += child.serializeToCard()+ "\n"
       }
     }