gs-cae-design 1.1.67 → 1.1.69

package/src/gsDevFx/objects/caeObjects/optionObjects/lcselRenderObject.ts

@@ -0,0 +1,103 @@
+import { DesignBaseObject } from "gs-ceec-design";
+import { PersistenceManager } from "../../../managers/persistenceManager";
+import { CardLCSEL } from "../../../../caeCardEditor/caeCardObjects/seainp/cardLCSEL";
+/**
+ * SeaSInp的cardLCSEL卡片数据.
+ */
+export class LcselRenderObject extends DesignBaseObject {
+  typeName = "LcselRenderObject";
+
+  first: string = "";
+  second: string = "";
+  third: string = "";
+  th4: string = "";
+  th5: string = "";
+  th6: string = "";
+  th7: string = "";
+  th8: string = "";
+  th9: string = "";
+  th10: string = "";
+  th11: string = "";
+  th12: string = "";
+
+  constructor() {
+    super();
+  }
+
+  serialize(): any {
+    let obj = super.serialize();
+
+    if(this.first) {
+      obj.first = this.first;
+    }
+    if(this.second) {
+      obj.second = this.second;
+    }
+    if(this.third) {
+      obj.third = this.third;
+    }
+    if(this.th4) {
+      obj.th4 = this.th4;
+    }
+    if(this.th5) {
+      obj.th5 = this.th5;
+    }
+    if(this.th6) {
+      obj.th6 = this.th6;
+    }
+    if(this.th7) {
+      obj.th7 = this.th7;
+    }
+    if(this.th8) {
+      obj.th8 = this.th8;
+    }
+    if(this.th9) {
+      obj.th9 = this.th9;
+    }
+    if(this.th10) {
+      obj.th10 = this.th10;
+    }
+    if(this.th11) {
+      obj.th11 = this.th11;
+    }
+    if(this.th12) {
+      obj.th12 = this.th12;
+    }
+
+    return obj;
+  }
+
+  deserialize(obj: any, pm: PersistenceManager) {
+    super.deserialize(obj, pm);
+
+    this.first = obj.first;
+    this.second = obj.second;
+    this.third = obj.third;
+    this.th4 = obj.th4;
+    this.th5 = obj.th5;
+    this.th6 = obj.th6;
+    this.th7 = obj.th7;
+    this.th8 = obj.th8;
+    this.th9 = obj.th9;
+    this.th10 = obj.th10;
+    this.th11 = obj.th11;
+    this.th12 = obj.th12;
+  }
+
+  serializeToCard() {
+    let cardLcsel = new CardLCSEL();
+    cardLcsel.first.value = this.first
+    cardLcsel.second.value = this.second
+    cardLcsel.third.value = this.third
+    cardLcsel.th4.value = this.th4
+    cardLcsel.th5.value = this.th5
+    cardLcsel.th6.value = this.th6
+    cardLcsel.th7.value = this.th7
+    cardLcsel.th8.value = this.th8
+    cardLcsel.th9.value = this.th9
+    cardLcsel.th10.value = this.th10
+    cardLcsel.th11.value = this.th11
+    cardLcsel.th12.value = this.th12
+    return cardLcsel.getLine()
+  }
+}

package/src/gsDevFx/objects/caeObjects/optionObjects/seastateHydro.ts

@@ -2,15 +2,69 @@ import { DesignBaseObject } from "gs-ceec-design";
 import { PersistenceManager } from "../../../managers/persistenceManager";
 import { Longan } from "gs-bim-air";
 import { CardHYDRO } from "../../../../caeCardEditor/caeCardObjects/seainp/cardHYDRO";
+import { CaeNumber } from "../../../../utility/utility";
 /**
  * SeaSInp的HYDRO卡片数据.
  */
+
+export enum AxisLoadOption {
+  PA = "PA"
+}
+
+export enum CollapseCodeOption {
+  AP = "AP",
+  DN = "DN",
+  DC = "DC",
+  NP = "NP",
+  NSM = "NSM",
+  IS = "IS",
+}
+
+export enum PrintOption {
+  SM = "SM",
+  MN = "MN",
+  FL = "FL",
+  NP = "NP"
+}
+
+export enum RedesignOption {
+  NO = "NO",
+  TH = "TH",
+  RG = "RG",
+  RT = "RT",
+}
+
+export enum TypeOfRings {
+  INT = "INT",
+  EXT = "EXT"
+}
+
 export class SeastateHydro extends DesignBaseObject {
   typeName = "SeastateHydro";
 
-  cardData: string = null;
+  verticalCoord: string = "+Z";
+
+  collapseCodeOption: CollapseCodeOption = CollapseCodeOption.IS;
+
+  typeOfRings: TypeOfRings = TypeOfRings.EXT;
+
+  printOption: PrintOption = PrintOption.SM;
+
+  redesignOption: RedesignOption = RedesignOption.NO;
+
+  isAxisLoadOption: boolean = false;
+
+  waterDepth: number = null;
+
+  mudlineElevation: number = null;
+
+  safetyFactor: number = null;
+
+  waterDensity: number = 1.028;
 
-  cardObject: CardHYDRO = null;
+  heightIncrement: number = 1.27;
+
+  thicknessIncrement: number = 0.3175;
 
   constructor() {
     super();
@@ -19,10 +73,41 @@ export class SeastateHydro extends DesignBaseObject {
   serialize(): any {
     let obj = super.serialize();
 
-    if (this.cardObject) {
-      obj.cardData = this.cardObject.getLine();
-    } else if (this.cardData) {
-      obj.cardData = this.cardData;
+    if(this.verticalCoord) {
+      obj.verticalCoord = this.verticalCoord
+    }
+    if(this.collapseCodeOption) {
+      obj.collapseCodeOption = this.collapseCodeOption
+    }
+    if(this.typeOfRings) {
+      obj.typeOfRings = this.typeOfRings
+    }
+    if(this.printOption) {
+      obj.printOption = this.printOption
+    }
+    if(this.redesignOption) {
+      obj.redesignOption = this.redesignOption
+    }
+    if(this.isAxisLoadOption) {
+      obj.isAxisLoadOption = this.isAxisLoadOption
+    }
+    if(this.notNullAndNotUndefined(this.waterDepth)) {
+      obj.waterDepth = this.waterDepth
+    }
+    if(this.notNullAndNotUndefined(this.mudlineElevation)) {
+      obj.mudlineElevation = this.mudlineElevation
+    }
+    if(this.notNullAndNotUndefined(this.safetyFactor)) {
+      obj.safetyFactor = this.safetyFactor
+    }
+    if(this.notNullAndNotUndefined(this.waterDensity)) {
+      obj.waterDensity = this.waterDensity
+    }
+    if(this.notNullAndNotUndefined(this.heightIncrement)) {
+      obj.heightIncrement = this.heightIncrement
+    }
+    if(this.notNullAndNotUndefined(this.thicknessIncrement)) {
+      obj.thicknessIncrement = this.thicknessIncrement
     }
 
     return obj;
@@ -31,26 +116,48 @@ export class SeastateHydro extends DesignBaseObject {
   deserialize(obj: any, pm: PersistenceManager) {
     super.deserialize(obj, pm);
 
-    if (obj.cardData) {
-      this.cardData = obj.cardData;
-      this.cardObject = new CardHYDRO(this.cardData);
+    if(obj.verticalCoord) {
+      this.verticalCoord = obj.verticalCoord;
     }
-
-    this.setNeedUpdate();
-  }
-
-  protected clone(cloneObj: any, cloneManager?: Longan.CloneManager) {
-    cloneObj = super.clone(cloneObj);
-    cloneObj.cardData = this.cardData;
-
-    return cloneObj;
+    if(obj.collapseCodeOption) {
+      this.collapseCodeOption = obj.collapseCodeOption;
+    }
+    if(obj.typeOfRings) {
+      this.typeOfRings = obj.typeOfRings;
+    }
+    if(obj.printOption) {
+      this.printOption = obj.printOption;
+    }
+    if(obj.redesignOption) {
+      this.redesignOption = obj.redesignOption;
+    }
+    
+    this.isAxisLoadOption = obj.isAxisLoadOption;
+    
+    this.waterDepth = CaeNumber(obj.waterDepth);
+    this.mudlineElevation = CaeNumber(obj.mudlineElevation);
+    this.safetyFactor = CaeNumber(obj.safetyFactor);
+    this.waterDensity = CaeNumber(obj.waterDensity);
+    this.heightIncrement = CaeNumber(obj.heightIncrement);
+    this.thicknessIncrement = CaeNumber(obj.thicknessIncrement);
   }
 
   serializeToCard() {
-    let result = null;
+    let result = new CardHYDRO();
 
-    result = this.cardObject.getLine();
+    result.verticalCoord.value = this.verticalCoord
+    result.collapseCodeOption.value = this.collapseCodeOption
+    result.typeOfRings.value = this.typeOfRings
+    result.printOption.value = this.printOption
+    result.redesignOption.value = this.redesignOption
+    result.axisLoadOption.value = this.isAxisLoadOption ? AxisLoadOption.PA : ""
+    result.waterDepth.value = this.waterDepth ? this.waterDepth.toString() : ""
+    result.mudlineElevation.value = this.mudlineElevation ? this.mudlineElevation.toString() : ""
+    result.safetyFactor.value = this.safetyFactor ? this.safetyFactor.toString() : ""
+    result.waterDensity.value = this.waterDensity ? this.waterDensity.toString() : ""
+    result.heightIncrement.value = this.heightIncrement ? this.heightIncrement.toString() : ""
+    result.thicknessIncrement.value = this.thicknessIncrement ? this.thicknessIncrement.toString() : ""
 
-    return result;
+    return result.getLine();
   }
 }

package/src/gsDevFx/objects/caeObjects/optionObjects/seastateHydro2.ts

@@ -2,15 +2,24 @@ import { DesignBaseObject } from "gs-ceec-design";
 import { PersistenceManager } from "../../../managers/persistenceManager";
 import { Longan } from "gs-bim-air";
 import { CardHYDRO2 } from "../../../../caeCardEditor/caeCardObjects/seainp/cardHYDRO2";
+import { CaeNumber } from "../../../../utility/utility";
 /**
  * SeaSInp的HYDRO2卡片数据.
  */
+
+export enum RingSpaceingOption {
+  IN = "IN",
+  ML = "ML",
+}
+
 export class SeastateHydro2 extends DesignBaseObject {
   typeName = "SeastateHydro2";
 
-  cardData: string = null;
+  ringSpaceingOption: RingSpaceingOption = RingSpaceingOption.ML
 
-  cardObject: CardHYDRO2 = null;
+  reductionFactor: number = 0.8
+
+  safetyFactor: number = 2
 
   constructor() {
     super();
@@ -19,10 +28,14 @@ export class SeastateHydro2 extends DesignBaseObject {
   serialize(): any {
     let obj = super.serialize();
 
-    if (this.cardObject) {
-      obj.cardData = this.cardObject.getLine();
-    } else if (this.cardData) {
-      obj.cardData = this.cardData;
+    if(this.ringSpaceingOption) {
+      obj.ringSpaceingOption = this.ringSpaceingOption
+    }
+    if(this.notNullAndNotUndefined(this.reductionFactor)) {
+      obj.reductionFactor = this.reductionFactor
+    }
+    if(this.notNullAndNotUndefined(this.safetyFactor)) {
+      obj.safetyFactor = this.safetyFactor
     }
 
     return obj;
@@ -30,27 +43,21 @@ export class SeastateHydro2 extends DesignBaseObject {
 
   deserialize(obj: any, pm: PersistenceManager) {
     super.deserialize(obj, pm);
-
-    if (obj.cardData) {
-      this.cardData = obj.cardData;
-      this.cardObject = new CardHYDRO2(this.cardData);
+    if(obj.ringSpaceingOption) {
+    this.ringSpaceingOption = obj.ringSpaceingOption
     }
-
-    this.setNeedUpdate();
-  }
-
-  protected clone(cloneObj: any, cloneManager?: Longan.CloneManager) {
-    cloneObj = super.clone(cloneObj);
-    cloneObj.cardData = this.cardData;
-
-    return cloneObj;
+    this.reductionFactor = CaeNumber(obj.reductionFactor)
+    this.safetyFactor = CaeNumber(obj.safetyFactor)
   }
 
   serializeToCard() {
     let result = null;
 
-    result = this.cardObject.getLine();
+    result = new CardHYDRO2()
+    result.ringSpaceingOption.value = this.ringSpaceingOption
+    result.reductionFactor.value = this.reductionFactor ? this.reductionFactor.toString() : ""
+    result.safetyFactor.value = this.safetyFactor ? this.safetyFactor.toString() : ""
 
-    return result;
+    return result.getLine();
   }
 }

package/src/gsDevFx/objects/caeObjects/optionObjects/seastateUcpart.ts

@@ -8,12 +8,12 @@ import { CaeNumber } from "../../../../utility/utility";
 export class SeastateUcpart extends DesignBaseObject {
   typeName = "SeastateUcpart";
 
-  lowerLimmit_first: number = 0;
-  upperLimmit_first: number = 0;
-  lowerLimmit_second: number = 0;
-  upperLimmit_second: number = 0;
-  lowerLimmit_thrid: number = 0;
-  upperLimmit_thrid: number = 0;
+  lowerLimmit_first: number = null;
+  upperLimmit_first: number = null;
+  lowerLimmit_second: number = null;
+  upperLimmit_second: number = null;
+  lowerLimmit_thrid: number = null;
+  upperLimmit_thrid: number = null;
 
   constructor() {
     super();
@@ -71,6 +71,6 @@ export class SeastateUcpart extends DesignBaseObject {
     cardUCPART.lowerLimmit_thrid.value = this.lowerLimmit_thrid ? this.lowerLimmit_thrid.toString() : ''
     cardUCPART.upperLimmit_thrid.value = this.upperLimmit_thrid ? this.upperLimmit_thrid.toString() : ''
 
-    return cardUCPART
+    return cardUCPART.getLine()
   }
 }

package/src/gsDevFx/objects/caeObjects/pretreatment/surfaceWeightObject.ts

@@ -145,4 +145,11 @@ export class SurfaceWeightObject extends DesignBaseObject {
     }
     return true;
   }
+    static checkNameFour(name: string): boolean {
+    let reg = /^[A-Z0-9]*$/;
+    if (!reg.test(name) || name.trimEnd().length > 4) {
+      return false;
+    }
+    return true;
+  }
 }

package/src/gsDevFx/objects/caeObjects/pretreatment/windAreaObject.ts

@@ -4,6 +4,11 @@ import { DesignBaseObject } from "gs-ceec-design";
 import { CaeNumber } from "../../../../utility/utility";
 import { Longan } from "gs-bim-air";
 import { CardAREA } from "../../../../caeCardEditor/caeCardObjects/sacinp/cardAREA";
+import { CardAREAA } from "../../../../caeCardEditor/caeCardObjects/sacinp/cardAREAA";
+import { CardAREAR } from "../../../../caeCardEditor/caeCardObjects/sacinp/cardAREAR";
+import { CardAREAFB } from "../../../../caeCardEditor/caeCardObjects/sacinp/cardAREAFB";
+import { CardAREAD } from "../../../../caeCardEditor/caeCardObjects/sacinp/cardAREAD";
+
 export class WindAreaObject extends DesignBaseObject {
   typeName = "WindAreaObject";
   cardData: string = "";
@@ -45,7 +50,7 @@ export class WindAreaObject extends DesignBaseObject {
     obj.zProjArea = this.zProjArea;
     obj.totalArea = this.totalArea;
     obj.horizontalAngle = this.horizontalAngle;
-    obj.horizontalAngle = this.horizontalAngle;
+
     obj.verticalAngle = this.verticalAngle;
     obj.XCoord = this.XCoord;
     obj.YCoord = this.YCoord;
@@ -65,7 +70,7 @@ export class WindAreaObject extends DesignBaseObject {
     if (obj.areaDefinition) {
       this.areaDefinition = obj.areaDefinition;
     }
-    console.log('deserialize',obj);
+    console.log('deserialize', obj);
 
     this.xProjArea = CaeNumber(obj.xProjArea);
     this.yProjArea = CaeNumber(obj.yProjArea);
@@ -103,7 +108,20 @@ export class WindAreaObject extends DesignBaseObject {
     // -----------------------
     // 主行 (含基本信息 + 最多 7 个节点)
     // -----------------------
-    const cardAREA = new CardAREA();
+    // const cardAREA = new CardAREA();
+    // cardAREA.lineLabel.value = "AREA";
+    // cardAREA.areaID.value = this.areaID;
+    let cardAREA
+    if (['F', 'B'].includes(this.areaDefinition)) {
+      cardAREA = new CardAREAFB();
+    } else if (this.areaDefinition === 'D') {
+      cardAREA = new CardAREAD();
+    } else if (this.areaDefinition === 'A') {
+      cardAREA = new CardAREAA();
+    } else if (this.areaDefinition === 'R') {
+      cardAREA = new CardAREAR();
+    }
+
     cardAREA.lineLabel.value = "AREA";
     cardAREA.areaID.value = this.areaID;
 
@@ -111,15 +129,20 @@ export class WindAreaObject extends DesignBaseObject {
       cardAREA.xProjArea.value = this.xProjArea || this.xProjArea === '0' ? this.xProjArea.toString() : '';
       cardAREA.yProjArea.value = this.yProjArea || this.yProjArea === '0' ? this.yProjArea.toString() : '';
       cardAREA.zProjArea.value = this.zProjArea || this.zProjArea === '0' ? this.zProjArea.toString() : '';
+
+
     } else if (['A', 'R'].includes(this.areaDefinition)) {
-      cardAREA.xProjArea.value = '';
-      cardAREA.yProjArea.value = '';
-      cardAREA.zProjArea.value = '';
+      // 设置值
+      cardAREA.totalArea.value = this.totalArea || this.totalArea === '0' ? this.totalArea.toString() : '';
+      if (this.areaDefinition === 'A') {
+        cardAREA.horizontalAngle.value = this.horizontalAngle || this.horizontalAngle === '0' ? this.horizontalAngle.toString() : '';
+        cardAREA.verticalAngle.value = this.verticalAngle || this.verticalAngle === '0' ? this.verticalAngle.toString() : '';
+      }
+
     }
 
-    cardAREA.totalArea.value = this.totalArea || this.totalArea === '0' ? this.totalArea.toString() : '';
-    cardAREA.horizontalAngle.value = this.horizontalAngle || this.horizontalAngle === '0' ? this.horizontalAngle.toString() : '';
-    cardAREA.verticalAngle.value = this.verticalAngle || this.verticalAngle === '0' ? this.verticalAngle.toString() : '';
+
+
     cardAREA.XCoord.value = this.XCoord || this.XCoord === '0' ? this.XCoord.toString() : '';
     cardAREA.YCoord.value = this.YCoord || this.YCoord === '0' ? this.YCoord.toString() : '';
     cardAREA.ZCoord.value = this.ZCoord || this.ZCoord === '0' ? this.ZCoord.toString() : '';
@@ -150,7 +173,17 @@ export class WindAreaObject extends DesignBaseObject {
     // 后续行：只包含 areaID + 节点
     // -----------------------
     for (let g = 1; g < groups.length; g++) {
-      const extra = new CardAREA();
+      let extra
+      if (['F', 'B'].includes(this.areaDefinition)) {
+        extra = new CardAREAFB();
+      } else if (this.areaDefinition === 'D') {
+        extra = new CardAREAD();
+      } else if (this.areaDefinition === 'A') {
+        extra = new CardAREAA();
+      } else if (this.areaDefinition === 'R') {
+        extra = new CardAREAR();
+      }
+
       extra.lineLabel.value = "AREA";
       extra.areaID.value = this.areaID;
 

package/src/gsDevFx/objects/loadObjects/loadConditionObject.ts

@@ -125,13 +125,13 @@ export class LoadConditionObject extends DesignBaseObject {
       if(!child.checkBusinessStateIsActive()) {
         continue;
       }
-      if (child.name === "WINDLoads") {
+      if (child.name === "WINDLoads" && child.childObjects.length) {
         text += "WIND\n";
-      } else if (child.name === "WAVELoads") {
+      } else if (child.name === "WAVELoads" && child.childObjects.length) {
         text += "WAVE\n";
-      } else if (child.name === "CURRLoads") {
+      } else if (child.name === "CURRLoads" && child.childObjects.length) {
         text += "CURR\n";
-      } else if (child.name === "DEADLoads") {
+      } else if (child.name === "DEADLoads" && child.childObjects.length) {
         text += "DEAD\n";
       }
       for (let j = 0; j < child.childObjects.length; j++) {

package/src/gsDevFx/objects/loadObjects/waveLoadObject.ts

@@ -58,7 +58,7 @@ export class WaveLoadObject extends DesignBaseObject {
 
   waveAngle: number = 0;
 
-  kinematFactor: number = 0;
+  kinematFactor: number = 1;
 
   orderOfStream: number = 0;
   

package/src/gsDevFx/objects/loadObjects/windLoadObject.ts

@@ -42,22 +42,24 @@ export class WindLoadObject extends DesignBaseObject {
 
   loadCondition: string = ""
 
-  windVelocity: number = 1;
+  windVelocity: number = null;
 
-  referenceHeightOrWindPressure: number = 0;
+  referenceHeightOrWindPressure: number = null;
 
   windVariationDefinition: WindVariationDefinition = null;
 
-  windDirection: number = 0;
+  windDirection: number = null;
 
   memberLoadingOption = "";
 
   isOriginElevationRatherThanWaterDepth: boolean = false;
 
-  stillWaterDepthOverride: number = 0;
+  stillWaterDepthOverride: number = null;
 
   isPrintDetailedLoadReport: boolean = false;
 
+  areaGroupIds: Array<string> = [];
+
   public constructor(loadCondition?: string) {
     super();
 
@@ -96,6 +98,9 @@ export class WindLoadObject extends DesignBaseObject {
     if(this.isPrintDetailedLoadReport) {
       obj.isPrintDetailedLoadReport = this.isPrintDetailedLoadReport;
     }
+    if(this.areaGroupIds) {
+      obj.areaGroupIds = this.areaGroupIds
+    }
 
     return obj;
   }
@@ -130,6 +135,10 @@ export class WindLoadObject extends DesignBaseObject {
       this.isPrintDetailedLoadReport = obj.isPrintDetailedLoadReport;
     }
 
+    if(obj.areaGroupIds) {
+      this.areaGroupIds = obj.areaGroupIds;
+    }
+
   }
 
   serializeToCard() {
@@ -153,6 +162,11 @@ export class WindLoadObject extends DesignBaseObject {
 
     cardWIND.printDetailedLoadReport.value = this.isPrintDetailedLoadReport ? PrintDetailedLoadReport.True : ""
 
+    for(let i = 0; i < this.areaGroupIds.length; i++) {
+      let seqnum = i + 1;
+      if(cardWIND[`windAreaGroupID${seqnum}`]) cardWIND[`windAreaGroupID${seqnum}`].value = this.areaGroupIds[i] as string;
+    }
+
     return cardWIND.getLine();
   }
 }

package/src/gsDevFx/objects/pretreatmentObjects/waveItemObject.ts

@@ -3,6 +3,9 @@ import { DesignBaseObject } from "gs-ceec-design";
 import { InstanceRenderObject } from "../instancesObjects/instanceRenderObject";
 import { Longan } from "gs-bim-air";
 
+/**
+ * 单个波面对象.
+ */
 export class WaveItemObject extends DesignBaseObject {
   public typeName = "WaveItemObject";
 

package/src/gsDevFx/objects/pretreatmentObjects/waveObject.ts

@@ -4,6 +4,9 @@ import { Longan } from "gs-bim-air";
 import { InstanceRenderObject } from "../instancesObjects/instanceRenderObject";
 import { WaveItemObject } from "./waveItemObject";
 
+/**
+ * 波面对象的根节点.
+ */
 export class WaveObject extends DesignBaseObject {
   public typeName = "WaveObject";
 

package/src/gsDevFx/objects/weightObjects/memberWeightConcentratedObject.ts

@@ -135,6 +135,7 @@ export class MemberWeightConcentratedObject extends MemberWeightBaseObject {
       cardWGTMEMCONC.xFactor.value = this.xFactor ? this.xFactor.toString() : "";
       cardWGTMEMCONC.yFactor.value = this.yFactor ? this.yFactor.toString() : "";
       cardWGTMEMCONC.zFactor.value = this.zFactor ? this.zFactor.toString() : "";
+      cardWGTMEMCONC.cooSystemOption.value = this.cooSystemOption
 
       return cardWGTMEMCONC.getLine();
     }

package/src/gsDevFx/process.ts

@@ -17,7 +17,7 @@ import { Viewer } from "./viewer";
 import { CenterRenderObject }  from './objects/caeObjects/pretreatment/centerRenderObject'
 import { SurfaceDefinitionObject } from "./objects/caeObjects/pretreatment/surfaceDefinitionObject";
 import { SurfaceWeightObject } from './objects/caeObjects/pretreatment/surfaceWeightObject'
-
+import { WindAreaObject } from "./objects/caeObjects/pretreatment/windAreaObject";
 export class Process extends CEECProcess {
   private _cloudMemberTransformManager: CloudMemberTransformManager = null;
   private _caeRenderObjectTreeManager: CAERenderObjectTreeManager = null;
@@ -49,7 +49,8 @@ export class Process extends CEECProcess {
   public nameCenterRoll =  new Map<string, CenterRenderObject>();
   public nameSurfaceDefinition =  new Map<string, SurfaceDefinitionObject>();
   public nameSurfaceWeight = new Map<string, SurfaceWeightObject>();
-
+  public nameWindArea = new Map<string, WindAreaObject>();
+ 
   protected _svgManager: SvgManager = null;
 
   /**
@@ -197,6 +198,7 @@ export class Process extends CEECProcess {
     this.nameCenterRoll.clear();
     this.nameSurfaceDefinition.clear();
     this.nameSurfaceWeight.clear();
+    this.nameWindArea.clear();
   }
 
   public initManagers(): void {
@@ -257,6 +259,8 @@ export class Process extends CEECProcess {
       this.nameSurfaceDefinition.set(ro.name, ro)
     }else if(ro instanceof SurfaceWeightObject) {
       this.nameSurfaceWeight.set(ro.name, ro)
+    }else if(ro instanceof WindAreaObject) {
+      this.nameWindArea.set(ro.name, ro)
     }
   }
 

package/src/viewerWrapper/commands/aftertreatment/addCoefficientDragMass/addCoefficientDragMassConfig.ts

@@ -49,12 +49,17 @@ export default class AddCoefficientDragMassConfig extends Config {
 
     let massAndDragParent = Process.activeProcess.findRenderObjectByName("拖曳和惯性系数")
     if (massAndDragParent) {
-      massAndDragParent.childObjects.map((item) => {
+      for(let i = 0; i < massAndDragParent.childObjects.length; i++) {
+        let item = massAndDragParent.childObjects[i] as CdmRenderObject
         if (item.checkBusinessStateIsActive()) {
           data.defaultTableSelection.value = item.defaultTableSelection
-          this.cdmList.push(item)
+          if(item.defaultTableSelection) {
+            continue
+          }else {
+            this.cdmList.push(item)
+          }
         }
-      })
+      }
     }
   }
 }