gs-cae-design 1.1.62 → 1.1.64

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;
     }
 

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

@@ -0,0 +1,101 @@
+import { PersistenceManager } from "../../../managers/persistenceManager";
+import { InstanceRenderObject } from "../../instancesObjects/instanceRenderObject";
+import { DesignBaseObject } from "gs-ceec-design";
+import { CaeNumber } from "../../../../utility/utility";
+import { Longan } from "gs-bim-air";
+import { CardAREA } from "../../../../caeCardEditor/caeCardObjects/sacinp/cardAREA";
+export class WindAreaObject extends DesignBaseObject {
+  typeName = "WindAreaObject";
+  cardData: string = "";
+  cardObject: CardAREA = null;
+  areaID: String = '';
+  areaDefinition: String = '';
+  xProjArea: String = '';
+  yProjArea: String = ''
+  zProjArea: String = '';
+  totalArea: String = '';
+  horizontalAngle: String = '';
+  verticalAngle: String = '';
+  XCoord: String = '';
+  YCoord: String = '';
+  ZCoord: String = '';
+  shearFactor: String = '';
+  actionNodeList: String = '';
+  constructor(areaID) {
+    super();
+    this.name = areaID
+    this.instanceTypes.add("main", InstanceRenderObject.prototype);
+  }
+  serialize(): any {
+    let obj = super.serialize();
+    if (this.cardObject) {
+      obj.cardData = this.cardObject.getLine();
+    }
+    else if (this.cardData) {
+      obj.cardData = this.cardData;
+    }
+    if (this.areaID) {
+      obj.areaID = this.areaID;
+    }
+    if (this.areaDefinition) {
+      obj.areaDefinition = this.areaDefinition;
+    }
+
+    obj.xProjArea = this.xProjArea;
+    obj.yProjArea = this.yProjArea;
+    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;
+    obj.ZCoord = this.ZCoord;
+    obj.shearFactor = this.shearFactor;
+    if (obj.actionNodeList) {
+      obj.actionNodeList = this.actionNodeList;
+    }
+  }
+  deserialize(obj: any, pm: PersistenceManager) {
+    super.deserialize(obj, pm);
+    if (obj.cardData) {
+      this.cardData = obj.cardData;
+    }
+    if (obj.areaID) {
+      this.areaID = obj.areaID;
+    }
+    if (obj.areaDefinition) {
+      this.areaDefinition = obj.areaDefinition;
+    }
+    this.xProjArea = obj.xProjArea;
+    this.yProjArea = obj.yProjArea;
+    this.zProjArea = obj.zProjArea;
+    this.totalArea = obj.totalArea;
+    this.horizontalAngle = obj.horizontalAngle;
+    this.horizontalAngle = obj.horizontalAngle;
+    this.verticalAngle = obj.verticalAngle;
+    this.XCoord = obj.XCoord;
+    this.YCoord = obj.YCoord;
+    this.ZCoord = obj.ZCoord;
+    this.shearFactor = obj.shearFactor;
+    if (obj.actionNodeList) {
+      this.actionNodeList = obj.actionNodeList;
+    }
+
+  }
+  protected clone(cloneObj: any, cloneManager?: Longan.CloneManager) {
+    cloneObj = super.clone(cloneObj);
+    cloneObj.cardData = this.cardData;
+
+    return cloneObj;
+  }
+
+  static checkName(name: string): boolean {
+    let reg = /^[A-Z0-9]*$/;
+    if (!reg.test(name) || name.trimEnd().length > 2) {
+      console.log("受风面ID不符合规范");
+      return false;
+    }
+    return true;
+  }
+}

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

@@ -9,80 +9,52 @@ export class WindShieldObject extends DesignBaseObject {
   typeName = "WindShieldObject";
   cardData: string = "";
   cardObject: CardWINSHL = null;
-  zone1Bottom: string = "";
-  zone1Top: string = "";
-  zone2Bottom: string = "";
-  zone2Top: string = "";
-  zone3Bottom: string = "";
-  zone3Top: string = "";
-  zone4Bottom: string = "";
-  zone4Top: string = "";
+  zone1Bottom: number = null;
+  zone1Top: number = null;
+  zone2Bottom: number = null;
+  zone2Top: number = null;
+  zone3Bottom: number = null;
+  zone3Top: number = null;
+  zone4Bottom: number = null;
+  zone4Top: number = null;
   constructor() {
     super();
     this.instanceTypes.add("main", InstanceRenderObject.prototype);
   }
   serialize(): any {
+
+
     let obj = super.serialize();
     if (this.cardObject) {
       obj.cardData = this.cardObject.getLine();
     } else if (this.cardData) {
       obj.cardData = this.cardData;
     }
-    if (this.zone1Bottom) {
-      obj.zone1Bottom = this.zone1Bottom;
-    }
-    if (this.zone1Top) {
-      obj.zone1Top = this.zone1Top;
-    }
-    if (this.zone2Bottom) {
-      obj.zone2Bottom = this.zone2Bottom;
-    }
-    if (this.zone2Top) {
-      obj.zone2Top = this.zone2Top;
-    }
-    if (this.zone3Bottom) {
-      obj.zone3Bottom = this.zone3Bottom;
-    }
-    if (this.zone3Top) {
-      obj.zone3Top = this.zone3Top;
-    }
-    if (this.zone4Bottom) {
-      obj.zone4Bottom = this.zone4Bottom;
-    }
-    if (this.zone4Top) {
-      obj.zone4Top = this.zone4Top;
-    }
+    obj.zone1Bottom = this.zone1Bottom;
+    obj.zone1Top = this.zone1Top;
+    obj.zone2Bottom = this.zone2Bottom;
+    obj.zone2Top = this.zone2Top;
+    obj.zone3Bottom = this.zone3Bottom;
+    obj.zone3Top = this.zone3Top;
+    obj.zone4Bottom = this.zone4Bottom;
+    obj.zone4Top = this.zone4Top;
     return obj;
   }
   deserialize(obj: any, pm: PersistenceManager) {
+
+
     super.deserialize(obj, pm);
     if (obj.cardData) {
       this.cardData = obj.cardData;
     }
-    if (obj.zone1Bottom) {
-      this.zone1Bottom = CaeNumber(obj.zone1Bottom);
-    }
-    if (obj.zone1Top) {
-      this.zone1Top = CaeNumber(obj.zone1Top);
-    }
-    if (obj.zone2Bottom) {
-      this.zone2Bottom = CaeNumber(obj.zone2Bottom);
-    }
-    if (obj.zone2Top) {
-      this.zone2Top = CaeNumber(obj.zone2Top);
-    }
-    if (obj.zone3Bottom) {
-      this.zone3Bottom = CaeNumber(obj.zone3Bottom);
-    }
-    if (obj.zone3Top) {
-      this.zone3Top = CaeNumber(obj.zone3Top);
-    }
-    if (obj.zone4Bottom) {
-      this.zone4Bottom = CaeNumber(obj.zone4Bottom);
-    }
-    if (obj.zone4Top) {
-      this.zone4Top = CaeNumber(obj.zone4Top);
-    }
+    this.zone1Bottom = CaeNumber(obj.zone1Bottom);
+    this.zone1Top = CaeNumber(obj.zone1Top);
+    this.zone2Bottom = CaeNumber(obj.zone2Bottom);
+    this.zone2Top = CaeNumber(obj.zone2Top);
+    this.zone3Bottom = CaeNumber(obj.zone3Bottom);
+    this.zone3Top = CaeNumber(obj.zone3Top);
+    this.zone4Bottom = CaeNumber(obj.zone4Bottom);
+    this.zone4Top = CaeNumber(obj.zone4Top);
   }
   protected clone(cloneObj: any, cloneManager?: Longan.CloneManager) {
     cloneObj = super.clone(cloneObj);
@@ -93,14 +65,14 @@ export class WindShieldObject extends DesignBaseObject {
   serializeToCard() {
     let cardWINSHL = new CardWINSHL();
     cardWINSHL.lineLabel.value = "WINSHL";
-    cardWINSHL.zone1Bottom.value = this.zone1Bottom ?this.zone1Bottom.toString() :"";
-    cardWINSHL.zone1Top.value = this.zone1Top ?this.zone1Top.toString() :"";
-    cardWINSHL.zone2Bottom.value = this.zone2Bottom ?this.zone2Bottom.toString() :"";
-    cardWINSHL.zone2Top.value = this.zone2Top ?this.zone2Top.toString() :"";
-    cardWINSHL.zone3Bottom.value = this.zone3Bottom ?this.zone3Bottom.toString() :"";
-    cardWINSHL.zone3Top.value = this.zone3Top ?this.zone3Top.toString() :"";
-    cardWINSHL.zone4Bottom.value = this.zone4Bottom ?this.zone4Bottom.toString() :"";
-    cardWINSHL.zone4Top.value = this.zone4Top ?this.zone4Top.toString() :"";
+    cardWINSHL.zone1Bottom.value = this.zone1Bottom||this.zone1Bottom ===0 ? this.zone1Bottom.toString() : "";
+    cardWINSHL.zone1Top.value = this.zone1Top ||  this.zone1Top ===0 ? this.zone1Top.toString() : "";
+    cardWINSHL.zone2Bottom.value = this.zone2Bottom|| this.zone2Bottom ===0 ? this.zone2Bottom.toString() : "";
+    cardWINSHL.zone2Top.value = this.zone2Top || this.zone2Top===0? this.zone2Top.toString() : "";
+    cardWINSHL.zone3Bottom.value = this.zone3Bottom || this.zone3Bottom===0 ? this.zone3Bottom.toString() : "";
+    cardWINSHL.zone3Top.value = this.zone3Top || this.zone3Top ===0 ? this.zone3Top.toString() : "";
+    cardWINSHL.zone4Bottom.value = this.zone4Bottom ||this.zone4Bottom ===0? this.zone4Bottom.toString() : "";
+    cardWINSHL.zone4Top.value = this.zone4Top || this.zone4Top ===0 ? this.zone4Top.toString() : "";
     return cardWINSHL.getLine();
   }
 }

package/src/gsDevFx/objects/caeObjects/sections/tubSectionObject.ts

@@ -236,6 +236,10 @@ export class TubSectionObject
         radius3 = R2 / 2;
         radius4 = R2 / 2 - D2;
 
+        if(radius2 <= radius3) {
+          radius2 = radius3 * 1.01;
+        }
+
         // 内圆的三个点  外上  外下  内上
         let point4 = Longan.Vector.multiply(zAxis, radius3);
         let point5 = Longan.Vector.multiply(zAxis, -radius3);

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

@@ -49,7 +49,7 @@ export class WaveLoadObject extends DesignBaseObject {
 
   loadCondition: string = "";
 
-  waveType: WaveType = WaveType.STRE;
+  waveType: WaveType = WaveType.AIRY;
 
   waveHeight: number = 0;
 
@@ -59,7 +59,7 @@ export class WaveLoadObject extends DesignBaseObject {
 
   waveAngle: number = 0;
 
-  kinematFactor: number = 1;
+  kinematFactor: number = 0;
 
   orderOfStream: number = 0;
   

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

@@ -105,31 +105,31 @@ export class WindLoadObject extends DesignBaseObject {
   deserialize(obj: any, pm?: Longan.PersistenceManager): void {
     super.deserialize(obj);
 
-    if(this.loadCondition) {
-      obj.loadCondition = this.loadCondition;
+    if(obj.loadCondition) {
+      this.loadCondition = obj.loadCondition;
     }
     
-    obj.windVelocity = CaeNumber(this.windVelocity);
+    this.windVelocity = CaeNumber(obj.windVelocity);
   
-    obj.referenceHeightOrWindPressure = CaeNumber(this.referenceHeightOrWindPressure);
+    this.referenceHeightOrWindPressure = CaeNumber(obj.referenceHeightOrWindPressure);
   
-    if(this.windVariationDefinition) {
-      obj.windVariationDefinition = this.windVariationDefinition;
+    if(obj.windVariationDefinition) {
+      this.windVariationDefinition = obj.windVariationDefinition;
     }
     
-    obj.windDirection = CaeNumber(this.windDirection);
+    this.windDirection = CaeNumber(obj.windDirection);
   
-    if(this.memberLoadingOption) {
-      obj.memberLoadingOption = this.memberLoadingOption;
+    if(obj.memberLoadingOption) {
+      this.memberLoadingOption = obj.memberLoadingOption;
     }
-    if(this.isOriginElevationRatherThanWaterDepth) {
-      obj.isOriginElevationRatherThanWaterDepth = this.isOriginElevationRatherThanWaterDepth;
+    if(obj.isOriginElevationRatherThanWaterDepth) {
+      this.isOriginElevationRatherThanWaterDepth = obj.isOriginElevationRatherThanWaterDepth;
     }
     
-    obj.stillWaterDepthOverride = CaeNumber(this.stillWaterDepthOverride);
+    this.stillWaterDepthOverride = CaeNumber(obj.stillWaterDepthOverride);
   
-    if(this.isPrintDetailedLoadReport) {
-      obj.isPrintDetailedLoadReport = this.isPrintDetailedLoadReport;
+    if(obj.isPrintDetailedLoadReport) {
+      this.isPrintDetailedLoadReport = obj.isPrintDetailedLoadReport;
     }
 
   }

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

@@ -96,7 +96,7 @@ export class ColorDivGrupThicknessObject extends ColorDivBaseObject {
           }
         } else if (
           grupSeg.section &&
-          grupSeg.section.crossSectionType === "Tub"
+          grupSeg.section.crossSectionType === "TUB"
         ) {
           //
           console.log("Tub");

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

@@ -68,6 +68,9 @@ export class MemberWeightConcentratedObject extends MemberWeightBaseObject {
     if (this.weightGroupID) {
       obj.weightGroupID = this.weightGroupID;
     }
+    if (this.notNullAndNotUndefined(this.distance)) {
+      obj.distance = this.distance;
+    }
     if (this.notNullAndNotUndefined(this.weightValue)) {
       obj.weightValue = this.weightValue;
     }
@@ -106,6 +109,7 @@ export class MemberWeightConcentratedObject extends MemberWeightBaseObject {
     if (obj.weightID) {
       this.weightID = obj.weightID;
     }
+    this.distance = CaeNumber(obj.distance);
     this.weightValue = CaeNumber(obj.weightValue);
     this.density = CaeNumber(obj.density);
     this.xFactor = CaeNumber(obj.xFactor);
@@ -124,6 +128,7 @@ export class MemberWeightConcentratedObject extends MemberWeightBaseObject {
       cardWGTMEMCONC.jointA.value = this.member.start.name;
       cardWGTMEMCONC.jointB.value = this.member.end.name;
       cardWGTMEMCONC.weightGroupID.value = this.weightGroupID;
+      cardWGTMEMCONC.distance.value = this.distance ? this.distance.toString() : "";
       cardWGTMEMCONC.weightValue.value = this.weightValue ? this.weightValue.toString() : "";
       cardWGTMEMCONC.weightID.value = this.weightID;
       cardWGTMEMCONC.density.value = this.density ? this.density.toString() : "";

package/src/gsDevFx/process.ts

@@ -193,6 +193,10 @@ export class Process extends CEECProcess {
     this.nameMapPGrup = new Map<string, PGrupObject>();
     this.nameMapMember = new Map<string, MemberObject>();
     this.nameMapPlate = new Map<string, PlateObject>();
+
+    this.nameCenterRoll.clear();
+    this.nameSurfaceDefinition.clear();
+    this.nameSurfaceWeight.clear();
   }
 
   public initManagers(): void {

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

@@ -26,10 +26,10 @@ export default class AddCoefficientDragMassConfig extends Config {
             label: "API默认值",
             value: "AP"
           },{
-            label: "API规范-绕射效应",
+            label: "API规范-绕射效应（WE）",
             value: "WE"
           },{
-            label: "DNV规范-绕射效应",
+            label: "DNV规范-绕射效应（WE）",
             value: "WD"
           }]
         }

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

@@ -7,10 +7,6 @@ import AddCoefficientDragMassConfig from "./addCoefficientDragMassConfig";
 import { DesignBaseObject } from "gs-ceec-design";
 import { CdmRenderObject } from "../../../../gsDevFx/objects/caeObjects/optionObjects/cdmRenderObject";
 import { BusinessState } from "gs-ceec-design";
-import { CaeNumber } from "../../../../utility/utility";
-import { CurrLoadObject, CrsetStretchingOption } from "../../../../gsDevFx/objects/loadObjects/currLoadObject";
-import { SeastateLdopt } from "../../../../gsDevFx/objects/caeObjects/optionObjects/seastateLdopt"
-import { CardLDOPT } from "../../../../caeCardEditor/caeCardObjects/seainp/cardLDOPT"
 
 export default class CommandAddCoefficientDragMass extends CommandComponent {
   typeName = "CommandAddCoefficientDragMass";
@@ -41,8 +37,8 @@ export default class CommandAddCoefficientDragMass extends CommandComponent {
         }else {
           data.defaultTableSelection.selectOptions.selections.push({label: "用户自定义", value: "" })
           data.defaultTableSelection.selectOptions.selections.push({label: "API默认值", value: "AP" })
-          data.defaultTableSelection.selectOptions.selections.push({label: "API规范-绕射效应", value: "WE" })
-          data.defaultTableSelection.selectOptions.selections.push({label: "DNV规范-绕射效应", value: "WD" })
+          data.defaultTableSelection.selectOptions.selections.push({label: "API规范-绕射效应（WE）", value: "WE" })
+          data.defaultTableSelection.selectOptions.selections.push({label: "DNV规范-绕射效应（WE）", value: "WD" })
         }
   }
 

package/src/viewerWrapper/commands/aftertreatment/addCurrentLoad/commandAddCurrentLoad.ts

@@ -281,8 +281,8 @@ export default class CommandAddCurrentLoad extends CommandComponent {
     let data = this.config.properties.items[0].data
 
     data.mudlineElevationOverride.value = ""
-    data.isElevationPercentOption.value = ""
-    data.isApparentWavePeriodOption.value = ""
+    data.isElevationPercentOption.value = false
+    data.isApparentWavePeriodOption.value = false
     data.factorOption.value = ""
     data.factor.value = ""
     data.elevation.value = ""

package/src/viewerWrapper/commands/aftertreatment/addWaveLoad/addWaveLoadConfig.ts

@@ -188,7 +188,7 @@ export default class AddWaveLoadConfig extends Config {
               value: PrintOption.PrintOption1,
             },
             {
-              label: "泥线处力与力矩合力",
+              label: "泥线的合力和合力矩",
               value: PrintOption.PrintOption2,
             },
             {

package/src/viewerWrapper/commands/aftertreatment/addWaveLoad/commandAddWaveLoad.ts

@@ -88,7 +88,7 @@ export default class CommandAddWaveLoad extends CommandComponent {
       data.criticalPosition.selectOptions.selections.push({ label: "所有位置 / 全工况", value: CriticalPosition.AL })
       data.printOption.selectOptions.selections.push({ label: "最简输出", value: PrintOption.PrintOption0 })
       data.printOption.selectOptions.selections.push({ label: "倾覆力矩与剪力", value: PrintOption.PrintOption1 })
-      data.printOption.selectOptions.selections.push({ label: "泥线处力与力矩合力", value: PrintOption.PrintOption2 })
+      data.printOption.selectOptions.selections.push({ label: "泥线的合力和合力矩", value: PrintOption.PrintOption2 })
       data.printOption.selectOptions.selections.push({ label: "网格点速度与加速度", value: PrintOption.PrintOption3 })
     }
   }
@@ -351,14 +351,14 @@ export default class CommandAddWaveLoad extends CommandComponent {
   private setConfig() {
     let data = this.config.properties.items[0].data;
       
-    data.waveType.value = WaveType.STRE
+    data.waveType.value = WaveType.AIRY
     data.waveHeight.value = ""
     data.wavePeriod.value = ""
     data.waveLength.value = ""
     data.waveAngle.value = ""
-    data.kinematFactor.value = 1
+    data.kinematFactor.value = ""
     data.orderOfStream.value = ""
-    data.isLocalAccelOnly.value = ""
+    data.isLocalAccelOnly.value = false
     data.inputMode.value = InputMode.Length
     data.crestPosition.value = ""
     data.stepSize.value = ""

package/src/viewerWrapper/commands/aftertreatment/addWindLoad/addWindLoadConfig.ts

@@ -109,7 +109,7 @@ export default class AddWindLoadConfig extends Config {
               value: MemberLoadingOption.None
             },
             {
-              label: "采用波浪/海流阻力系数",
+              label: "采用波浪/海流Cd值",
               value: MemberLoadingOption.W
             },
             {
@@ -129,7 +129,7 @@ export default class AddWindLoadConfig extends Config {
         value: null,
       },
       isPrintDetailedLoadReport: {
-        name: "为每个风区生成详细荷载报告",
+        name: "为每个受风面输出详细荷载报告",
         type: "switch",
         value: false,
       },

package/src/viewerWrapper/commands/aftertreatment/addWindLoad/commandAddWindLoad.ts

@@ -8,7 +8,7 @@ import { DesignBaseObject } from "gs-ceec-design";
 import { LoadConditionObject } from "../../../../gsDevFx/objects/loadObjects/loadConditionObject";
 import { BusinessState } from "gs-ceec-design";
 import { CaeNumber } from "../../../../utility/utility";
-import { WindLoadObject, MemberLoadingOption } from "../../../../gsDevFx/objects/loadObjects/windLoadObject";
+import { WindLoadObject, MemberLoadingOption, WindVariationDefinition } from "../../../../gsDevFx/objects/loadObjects/windLoadObject";
 import { SeastateLdopt } from "../../../../gsDevFx/objects/caeObjects/optionObjects/seastateLdopt"
 import { CardLDOPT } from "../../../../caeCardEditor/caeCardObjects/seainp/cardLDOPT"
 
@@ -45,7 +45,7 @@ export default class CommandAddWindLoad extends CommandComponent {
       data.memberLoadingOption.selectOptions.selections.push({ label: "Ignore load on member", value: MemberLoadingOption.I })
     }else {
       data.memberLoadingOption.selectOptions.selections.push({ label: "无覆盖", value: MemberLoadingOption.None })
-      data.memberLoadingOption.selectOptions.selections.push({ label: "采用波浪/海流阻力系数", value: MemberLoadingOption.W })
+      data.memberLoadingOption.selectOptions.selections.push({ label: "采用波浪/海流Cd值", value: MemberLoadingOption.W })
       data.memberLoadingOption.selectOptions.selections.push({ label: "忽略杆件荷载", value: MemberLoadingOption.I })
     }
   }
@@ -284,7 +284,7 @@ export default class CommandAddWindLoad extends CommandComponent {
 
     data.windVelocity.value = 1
     data.referenceHeightOrWindPressure.value = ""
-    data.windVariationDefinition.value = ""
+    data.windVariationDefinition.value = WindVariationDefinition.CONS
     data.windDirection.value = ""
     data.memberLoadingOption.value = ""
     data.isOriginElevationRatherThanWaterDepth.value = false

package/src/viewerWrapper/commands/aftertreatment/editCurrentLoad/commandEditCurrentLoad.ts

@@ -357,8 +357,8 @@ export default class CommandEditCurrentLoad extends CommandComponent {
     let data = this.config.properties.items[0].data
 
     data.mudlineElevationOverride.value = ""
-    data.isElevationPercentOption.value = ""
-    data.isApparentWavePeriodOption.value = ""
+    data.isElevationPercentOption.value = false
+    data.isApparentWavePeriodOption.value = false
     data.factorOption.value = ""
     data.factor.value = ""
     data.elevation.value = ""

package/src/viewerWrapper/commands/aftertreatment/editWaveLoad/commandEditWaveLoad.ts

@@ -87,11 +87,13 @@ export default class CommandEditWaveLoad extends CommandComponent {
       data.criticalPosition.selectOptions.selections.push({ label: "所有位置 / 全工况", value: CriticalPosition.AL })
       data.printOption.selectOptions.selections.push({ label: "最简输出", value: PrintOption.PrintOption0 })
       data.printOption.selectOptions.selections.push({ label: "倾覆力矩与剪力", value: PrintOption.PrintOption1 })
-      data.printOption.selectOptions.selections.push({ label: "泥线处力与力矩合力", value: PrintOption.PrintOption2 })
+      data.printOption.selectOptions.selections.push({ label: "泥线的合力和合力矩", value: PrintOption.PrintOption2 })
       data.printOption.selectOptions.selections.push({ label: "网格点速度与加速度", value: PrintOption.PrintOption3 })
     }
 
     this.config.loadConditionChange = () => {
+      this.setConfig()
+
       let data = this.config.properties.items[0].data;
       let loadCondition = data.loadCondition.value
     
@@ -434,14 +436,14 @@ export default class CommandEditWaveLoad extends CommandComponent {
   private setConfig() {
     let data = this.config.properties.items[0].data;
       
-    data.waveType.value = WaveType.STRE
+    data.waveType.value = WaveType.AIRY
     data.waveHeight.value = ""
     data.wavePeriod.value = ""
     data.waveLength.value = ""
     data.waveAngle.value = ""
-    data.kinematFactor.value = 1
+    data.kinematFactor.value = ""
     data.orderOfStream.value = ""
-    data.isLocalAccelOnly.value = ""
+    data.isLocalAccelOnly.value = false
     data.inputMode.value = InputMode.Length
     data.crestPosition.value = ""
     data.stepSize.value = ""