gs-cae-design 1.1.60 → 1.1.62

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

@@ -79,6 +79,9 @@ export class MemberWeightDistributedObject extends MemberWeightBaseObject {
     if (this.notNullAndNotUndefined(this.weightValue)) {
       obj.weightValue = this.weightValue;
     }
+    if (this.notNullAndNotUndefined(this.distance)) {
+      obj.distance = this.distance;
+    }
     if (this.notNullAndNotUndefined(this.weightActiveLength)) {
       obj.weightActiveLength = this.weightActiveLength;
     }
@@ -121,6 +124,7 @@ export class MemberWeightDistributedObject extends MemberWeightBaseObject {
       this.weightID = obj.weightID;
     }
     this.weightValue = CaeNumber(obj.weightValue);
+    this.distance = CaeNumber(obj.distance);
     this.weightActiveLength = CaeNumber(obj.weightActiveLength);
     this.finalDistanceWeightValue = CaeNumber(obj.finalDistanceWeightValue);
     this.density = CaeNumber(obj.density);
@@ -141,6 +145,7 @@ export class MemberWeightDistributedObject extends MemberWeightBaseObject {
       cardWGTMEMUNIF.jointB.value = this.member.end.name;
       cardWGTMEMUNIF.weightGroupID.value = this.weightGroupID;
       cardWGTMEMUNIF.weightValue.value = this.weightValue ? this.weightValue.toString() : "";
+      cardWGTMEMUNIF.distance.value = this.distance ? this.distance.toString() : "";
       cardWGTMEMUNIF.weightActiveLength.value = this.weightActiveLength ? this.weightActiveLength.toString() : "";
       cardWGTMEMUNIF.finalDistanceWeightValue.value = this.finalDistanceWeightValue ? this.finalDistanceWeightValue.toString() : "";
       cardWGTMEMUNIF.weightID.value = this.weightID;
@@ -148,6 +153,7 @@ export class MemberWeightDistributedObject extends MemberWeightBaseObject {
       cardWGTMEMUNIF.xFactor.value = this.xFactor ? this.xFactor.toString() : "";
       cardWGTMEMUNIF.yFactor.value = this.yFactor ? this.yFactor.toString() : "";
       cardWGTMEMUNIF.zFactor.value = this.zFactor ? this.zFactor.toString() : "";
+      cardWGTMEMUNIF.cooSystemOption.value = this.cooSystemOption
 
       return cardWGTMEMUNIF.getLine();
     }

package/src/gsDevFx/process.ts

@@ -14,6 +14,9 @@ import { SectionObject } from "./objects/caeObjects/sectionObject";
 import { DesignBaseObject } from "gs-ceec-design";
 import { SvgManager } from "./objects/svgManager";
 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'
 
 export class Process extends CEECProcess {
   private _cloudMemberTransformManager: CloudMemberTransformManager = null;
@@ -43,6 +46,9 @@ export class Process extends CEECProcess {
   public nameMapPGrup = new Map<string, PGrupObject>();
   public nameMapMember = new Map<string, MemberObject>();
   public nameMapPlate = new Map<string, PlateObject>();
+  public nameCenterRoll =  new Map<string, CenterRenderObject>();
+  public nameSurfaceDefinition =  new Map<string, SurfaceDefinitionObject>();
+  public nameSurfaceWeight = new Map<string, SurfaceWeightObject>();
 
   protected _svgManager: SvgManager = null;
 
@@ -160,7 +166,10 @@ export class Process extends CEECProcess {
     super();
 
     this.svgManager = new SvgManager(this);
+    this.clearMapDatas();
+  }
 
+  clearMapDatas() {
     this.jointMapReleativeMembers = new Map<
       JointObject,
       Longan.List<MemberObject>
@@ -236,8 +245,14 @@ export class Process extends CEECProcess {
       this.nameMapPGrup.set(ro.name, ro);
     } else if (ro instanceof MemberObject) {
       this.nameMapMember.set(ro.name, ro);
-    } else if (ro instanceof PlateObject) {
-      this.nameMapPlate.set(ro.name, ro);
+    } else if(ro instanceof PlateObject) {
+      this.nameMapPlate.set(ro.name, ro)
+    } else if(ro instanceof CenterRenderObject) {
+      this.nameCenterRoll.set(ro.name, ro)
+    }else if(ro instanceof SurfaceDefinitionObject) {
+      this.nameSurfaceDefinition.set(ro.name, ro)
+    }else if(ro instanceof SurfaceWeightObject) {
+      this.nameSurfaceWeight.set(ro.name, ro)
     }
   }
 

package/src/gsDevFx/viewer.ts

@@ -841,10 +841,7 @@ export class Viewer extends CEECViewer {
       value.delete();
     });
 
-    console.log(
-      "clear all renderObjects---count:",
-      this.process.renderObjects.count()
-    );
+    process.clearMapDatas();
   }
 
   dispose(): void {

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

@@ -0,0 +1,60 @@
+import { Config } from "../../../../gsDevFx/propertyComponents/config"
+import { Process } from "../../../../gsDevFx/process"
+import { PropertyComponent } from "../../../../gsDevFx/propertyComponents/propertyComponent"
+import { CdmRenderObject } from "../../../../gsDevFx/objects/caeObjects/optionObjects/cdmRenderObject"
+
+export default class AddCoefficientDragMassConfig extends Config {
+  cdmList: Array<CdmRenderObject> = null
+
+  constructor() {
+    super()
+
+    this.cdmList = new Array<CdmRenderObject>()
+
+    let property = new PropertyComponent()
+    property.name = "添加拖曳和惯性系数"
+    property.data = {
+      defaultTableSelection: {
+        name: "表类型",
+        type: "select",
+        value: null,
+        selectOptions: {
+          selections: [{
+            label: "用户自定义",
+            value: ""
+          },{
+            label: "API默认值",
+            value: "AP"
+          },{
+            label: "API规范-绕射效应",
+            value: "WE"
+          },{
+            label: "DNV规范-绕射效应",
+            value: "WD"
+          }]
+        }
+      },
+      tip: {
+        name: "提示",
+        value: null
+      }
+    }
+    this.properties.add(property)
+    this.refreshList()
+  }
+
+  refreshList() {
+    const data = this._properties.items[0].data
+    this.cdmList = [];
+
+    let massAndDragParent = Process.activeProcess.findRenderObjectByName("拖曳和惯性系数")
+    if (massAndDragParent) {
+      massAndDragParent.childObjects.map((item) => {
+        if (item.checkBusinessStateIsActive()) {
+          data.defaultTableSelection.value = item.defaultTableSelection
+          this.cdmList.push(item)
+        }
+      })
+    }
+  }
+}

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

@@ -0,0 +1,167 @@
+import { CameraMouse } from "../../../../gsDevFx/operators/cameraMouse";
+import { CAEObjectPreSelector } from "../../../../gsDevFx/operators/cAEObjectPreSelector";
+import { CAEObjectSelector } from "../../../../gsDevFx/operators/caeObjectSelector";
+import { CommandSelect } from "../../../../gsDevFx/commands/commandSelect";
+import { CommandComponent } from "../../commandComponent";
+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";
+
+  config: AddCoefficientDragMassConfig;
+  preSelector: CAEObjectPreSelector;
+  caeObjectSelector: CAEObjectSelector;
+
+  constructor() {
+    super();
+  }
+
+  begin(): void {
+    this.changeOperators();
+
+    console.log("CommandAddCoefficientDragMass");
+    this.config = new AddCoefficientDragMassConfig();
+    this.config.show();
+
+    let data = this.config.properties.items[0].data;
+    
+        data.defaultTableSelection.selectOptions.selections = []
+        if(this.viewer.commonInterfaceManager.showEnglishText) {
+          data.defaultTableSelection.selectOptions.selections.push({label: "User defined", value: "" })
+          data.defaultTableSelection.selectOptions.selections.push({label: "API default", value: "AP" })
+          data.defaultTableSelection.selectOptions.selections.push({label: "API WE effect", value: "WE" })
+          data.defaultTableSelection.selectOptions.selections.push({label: "DNV WE effect", value: "WD" })
+        }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" })
+        }
+  }
+
+  restore(): void {
+    this.changeOperators();
+    this.config.show();
+  }
+
+  changeOperators(): void {
+    // 进入命令前清空选中与高亮.
+    this.viewer.selectionManager.clearAllSelectionAndHighlight();
+    this.viewer.updateDisplay();
+
+    // 清空操作器.
+    this.viewer.operatorManager.clear();
+    // 添加操作器
+    this.viewer.operatorManager.add(new CameraMouse());
+
+    this.preSelector = new CAEObjectPreSelector();
+    this.viewer.operatorManager.add(this.preSelector);
+
+    this.caeObjectSelector = new CAEObjectSelector();
+    this.viewer.operatorManager.add(this.caeObjectSelector);
+    //this.caeObjectSelector.isMultiSelect = true;
+
+    this.caeObjectSelector.lButtonUp.add(() => {
+      setTimeout(() => {
+        this.updatePanel();
+      }, 0);
+    });
+  }
+
+  end(): void {
+    this.config.hide();
+    super.end();
+
+    this.viewer.selectionManager.clearAllSelectionAndHighlight();
+    this.viewer.updateDisplay();
+
+    let commandSelect = new CommandSelect();
+    this.process.commandManager.execute(commandSelect);
+  }
+
+  commandOk(): void {
+    let data = this.config.properties.items[0].data;
+
+    let pretreatmentRO = this.viewer.process.findRenderObjectByName(
+      "后处理计算结果"
+    ) as DesignBaseObject;
+
+    let cdmParent = this.process.findCaeObjectByNameInChildObject(
+      pretreatmentRO,
+      "拖曳和惯性系数"
+    ) as DesignBaseObject;
+
+    if (!cdmParent) {
+      cdmParent = new DesignBaseObject();
+      cdmParent.businessState = BusinessState.Creating;
+      cdmParent.name = "拖曳和惯性系数";
+      this.process.addRenderObject(pretreatmentRO, cdmParent);
+    }else {
+      cdmParent.businessState = BusinessState.Editing;
+    }
+
+    this.viewer.selectionManager.clearAllSelectionAndHighlight();
+
+    const defaultTableSelection = data.defaultTableSelection.value;
+    if(defaultTableSelection !== "" && defaultTableSelection !== null) {
+      // 删除节点数据
+      for (let i = 0; i < cdmParent.childObjects.length; i++) {
+        const item = cdmParent.childObjects[i] as DesignBaseObject;
+        item.tempDelete(this.viewer);
+        item.businessState = BusinessState.Deleting;
+      }
+      const cdmRenderObject = new CdmRenderObject();
+      cdmRenderObject.defaultTableSelection = defaultTableSelection;
+      cdmRenderObject.businessState = BusinessState.Creating;
+
+      this.process.addRenderObject(cdmParent, cdmRenderObject);
+    }else {
+       let cdmList = this.config.cdmList
+
+      // 删除节点数据
+      for (let i = 0; i < cdmParent.childObjects.length; i++) {
+        const item = cdmParent.childObjects[i] as DesignBaseObject;
+        item.tempDelete(this.viewer);
+        item.businessState = BusinessState.Deleting;
+      }
+
+      let restObjects = new Array<CdmRenderObject>();
+
+      if(cdmList.some(item => Number(item.diameter) < 0)) {
+        data.tip.value = 2;
+        return
+      }
+
+      if(cdmList.some(item => (Number(item.cleanMember_normalDragCoef) < 0 || Number(item.cleanMember_tangentialDragCoef) < 0 || Number(item.cleanMember_normalInertiaCoeff) < 0 || Number(item.cleanMember_tangentialInertiaCoef) < 0 || Number(item.fouledMember_normalDragCoef) < 0 || Number(item.fouledMember_tangentialDragCoef) < 0 || Number(item.fouledMember_normalInertiaCoef) < 0 || Number(item.fouledMember_tangentialInertiaCoef) < 0))) {
+        data.tip.value = 3;
+        return
+      }
+
+      cdmList.sort((objA, objB) => {
+        return objA.diameter - objB.diameter
+      })
+
+      cdmList = cdmList.slice(0, 10)
+
+      for (let i = 0; i < cdmList.length; i++) {
+        let cdmRenderObject = cdmList[i] as CdmRenderObject;
+        cdmRenderObject.businessState = BusinessState.Creating;
+        this.process.addRenderObject(cdmParent, cdmRenderObject);
+      }
+    }
+
+    this.viewer.updateDisplay();
+    data.tip.value = 1;
+    this.config.refreshList()
+  }
+
+  updatePanel() {
+  }
+}

package/src/viewerWrapper/commands/aftertreatment/addCurrentLoad/commandAddCurrentLoad.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 { CurrLoadObject, CrsetStretchingOption } from "../../../../gsDevFx/objects/loadObjects/currLoadObject";
+import { CurrLoadObject, FactorOption, CrsetStretchingOption } from "../../../../gsDevFx/objects/loadObjects/currLoadObject";
 import { SeastateLdopt } from "../../../../gsDevFx/objects/caeObjects/optionObjects/seastateLdopt"
 import { CardLDOPT } from "../../../../caeCardEditor/caeCardObjects/seainp/cardLDOPT"
 
@@ -33,11 +33,29 @@ export default class CommandAddCurrentLoad extends CommandComponent {
     this.config = new AddCurrentLoadConfig();
     this.config.show();
 
-    let currLoadRO = new CurrLoadObject();
-    currLoadRO.crsetStretchingOption = CrsetStretchingOption.CN
-    currLoadRO.isVelocityUnitsOption = true
-    this.currLoadRO = currLoadRO;
-    this.setCurrLoadRODataToConfigData()
+    this.setConfig()
+
+    let data = this.config.properties.items[0].data;
+
+    data.factorOption.selectOptions.selections = []
+    data.crsetStretchingOption.selectOptions.selections = []
+    if(this.viewer.commonInterfaceManager.showEnglishText) {
+      data.factorOption.selectOptions.selections.push({ label: "None", value: FactorOption.None })
+      data.factorOption.selectOptions.selections.push({ label: "Auto", value: FactorOption.BC })
+      data.factorOption.selectOptions.selections.push({ label: "User defined", value: FactorOption.US })
+      data.crsetStretchingOption.selectOptions.selections.push({label: "Constant", value: CrsetStretchingOption.CN })
+      data.crsetStretchingOption.selectOptions.selections.push({label: "Non-Linear", value: CrsetStretchingOption.NL })
+      data.crsetStretchingOption.selectOptions.selections.push({label: "Linear", value: CrsetStretchingOption.LN })
+      // data.crsetStretchingOption.selectOptions.selections.push({label: "None", value: CrsetStretchingOption.None })
+    }else {
+      data.factorOption.selectOptions.selections.push({ label: "无", value: FactorOption.None })
+      data.factorOption.selectOptions.selections.push({ label: "自动", value: FactorOption.BC })
+      data.factorOption.selectOptions.selections.push({ label: "自定义", value: FactorOption.US })
+      data.crsetStretchingOption.selectOptions.selections.push({label: "常数", value: CrsetStretchingOption.CN })
+      data.crsetStretchingOption.selectOptions.selections.push({label: "非线性", value: CrsetStretchingOption.NL })
+      data.crsetStretchingOption.selectOptions.selections.push({label: "线性", value: CrsetStretchingOption.LN })
+      // data.crsetStretchingOption.selectOptions.selections.push({label: "无", value: CrsetStretchingOption.None })
+    }
   }
 
   restore(): void {
@@ -154,21 +172,22 @@ export default class CommandAddCurrentLoad extends CommandComponent {
           currLoad.elevation = CaeNumber(data.elevation.value)
           currLoad.crsetStretchingOption = data.crsetStretchingOption.value
           currLoad.minimumInlineCurrentVelocity = CaeNumber(data.minimumInlineCurrentVelocity.value)
+          currLoad.isVelocityUnitsOption = true
         }
       }
     }
 
-    let seastateNode = this.process.caeRenderObjectTreeManager.seastateNode
-    let seastateLdoptObj = this.process.findRenderObjectByType(
-      "SeastateLdopt"
-    ) as SeastateLdopt
-    if (!seastateLdoptObj) {
-      seastateLdoptObj = new SeastateLdopt();
-      seastateLdoptObj.businessState = BusinessState.Creating
-      seastateLdoptObj.cardObject = new CardLDOPT("LDOPT       NF+Z   1.025   7.849                GLOBMN    HYD                 K                                          ")
-      seastateLdoptObj.cardData = seastateLdoptObj.cardObject.getLine()
-      this.process.addRenderObject(seastateNode,seastateLdoptObj);
-    }
+    // let seastateNode = this.process.caeRenderObjectTreeManager.seastateNode
+    // let seastateLdoptObj = this.process.findRenderObjectByType(
+    //   "SeastateLdopt"
+    // ) as SeastateLdopt
+    // if (!seastateLdoptObj) {
+    //   seastateLdoptObj = new SeastateLdopt();
+    //   seastateLdoptObj.businessState = BusinessState.Creating
+    //   seastateLdoptObj.cardObject = new CardLDOPT("LDOPT       NF+Z   1.025   7.849                GLOBMN    HYD                 K                                          ")
+    //   seastateLdoptObj.cardData = seastateLdoptObj.cardObject.getLine()
+    //   this.process.addRenderObject(seastateNode,seastateLdoptObj);
+    // }
 
     this.viewer.updateDisplay();
     data.tip.value = 1;
@@ -258,12 +277,19 @@ export default class CommandAddCurrentLoad extends CommandComponent {
     return loadConditions;
   }
 
-  private setCurrLoadRODataToConfigData() {
-    if(this.currLoadRO) {
-      let data = this.config.properties.items[0].data;
-      let currLoadRO = this.currLoadRO;
-
-      data.crsetStretchingOption.value = currLoadRO.crsetStretchingOption
-    }
+  private setConfig() {
+    let data = this.config.properties.items[0].data
+
+    data.mudlineElevationOverride.value = ""
+    data.isElevationPercentOption.value = ""
+    data.isApparentWavePeriodOption.value = ""
+    data.factorOption.value = ""
+    data.factor.value = ""
+    data.elevation.value = ""
+    data.crsetStretchingOption.value = CrsetStretchingOption.CN
+    data.minimumInlineCurrentVelocity.value = ""
+    
+    let config = this.config;
+    config.currList = new Array<CurrLoadObject>();
   }
 }

package/src/viewerWrapper/commands/aftertreatment/addDeadLoad/commandAddDeadLoad.ts

@@ -8,12 +8,16 @@ import { DeadLoadObject } from "../../../../gsDevFx/objects/caeObjects/aftertrea
 export default class CommandAddDeadLoad extends CommandComponent {
   typeName: string = "CommandAddDeadLoad";
   config: AddDeadLoadConfig;
+  loadConditionRO: LoadConditionObject = null;
+  deadLoadRo:DeadLoadObject=null;
+
   constructor() {
     super();
   }
   begin(): void {
     this.config = new AddDeadLoadConfig();
     this.config.show();
+    this.deadLoadRo = new DeadLoadObject()
   }
 
   restore(): void {
@@ -24,21 +28,6 @@ export default class CommandAddDeadLoad extends CommandComponent {
     super.end();
   }
   commandOk(): void {
-    let aftertreatmentRO = this.viewer.process.findRenderObjectByName(
-      "后处理计算结果"
-    ) as DesignBaseObject;
-    // 自重荷载节点
-    let addDeadLoadParent = this.process.findCaeObjectByNameInChildObject(
-      aftertreatmentRO,
-      "自重荷载"
-    );
-    if (!addDeadLoadParent) {
-      addDeadLoadParent = new DesignBaseObject();
-      addDeadLoadParent.businessState = BusinessState.Creating;
-      addDeadLoadParent.name = "自重荷载";
-      this.process.addRenderObject(aftertreatmentRO, addDeadLoadParent);
-    }
-
     let data = this.config.properties.items[0].data;
     const {
       loadConditionName,
@@ -56,6 +45,7 @@ export default class CommandAddDeadLoad extends CommandComponent {
     data.tip.value = null;
     if (!loadConditionName.value) {
       data.tip.value = 1;
+      return
     }
     // 检查荷载工况输入是否合法
     let isLegal1 = LoadConditionObject.checkNamelegal(loadConditionName.value);
@@ -85,6 +75,7 @@ export default class CommandAddDeadLoad extends CommandComponent {
       waterDepthOverride.value < 0
     ) {
       data.tip.value = 2;
+      return
     }
     // 覆盖水密度 填写值需＞0，可为空；
     if (
@@ -93,9 +84,23 @@ export default class CommandAddDeadLoad extends CommandComponent {
       waterDensityOverride.value < 0
     ) {
       data.tip.value = 3;
+      return
     }
     // 校验结束
-    let deadLoadObjectItem = new DeadLoadObject(loadConditionName.value);
+        this.loadConditionRO =
+      this.getAndCreateLoadConditionObjectByName(loadConditionName.value)
+    let loadGroupRO = this.getAndCreateLoadGroupByLoadCondition(this.loadConditionRO);
+     for (let i = 0; i < loadGroupRO.childObjects.length; i++) {
+      const item = loadGroupRO.childObjects[i] as DesignBaseObject;
+      item.tempDelete(this.viewer);
+      item.businessState = BusinessState.Deleting;
+    }
+    console.log('loadConditionRO---', this.loadConditionRO);
+    console.log('loadGroupRO!!!',loadGroupRO)
+    this.deadLoadRo= new DeadLoadObject(loadConditionName.value);
+
+    let deadLoadObjectItem =  this.deadLoadRo
+
     deadLoadObjectItem.businessState = BusinessState.Creating;
     deadLoadObjectItem.loadConditionName = loadConditionName.value;
     deadLoadObjectItem.buoyancyCalculationMethod =
@@ -111,12 +116,11 @@ export default class CommandAddDeadLoad extends CommandComponent {
       includeBuoyancyBelowMudline.value;
     deadLoadObjectItem.includeMarineGrowthOnly = includeMarineGrowthOnly.value;
     deadLoadObjectItem.dlRationalOption = dlRationalOption.value;
-    this.process.addRenderObject(addDeadLoadParent, deadLoadObjectItem);
+    this.process.addRenderObject(loadGroupRO,deadLoadObjectItem);
     // 添加荷载工况
-    this.getAndCreateLoadConditionObjectByName(loadConditionName.value)
+
     data.tip.value = 6;
   }
-  // 获取荷载工况信息
   private getLoadConditionObjectByName(loadConditionName: string) {
     let pretreatmentRO = this.viewer.process.findRenderObjectByName(
       "后处理计算结果"
@@ -141,6 +145,7 @@ export default class CommandAddDeadLoad extends CommandComponent {
 
     return loadConditionRO;
   }
+
   private getAndCreateLoadConditionObjectByName(loadConditionName: string) {
     let loadConditionRO = this.getLoadConditionObjectByName(loadConditionName);
 
@@ -170,6 +175,27 @@ export default class CommandAddDeadLoad extends CommandComponent {
 
     return loadConditionRO;
   }
+
+  private getAndCreateLoadGroupByLoadCondition(
+    loadCondition: LoadConditionObject
+  ) {
+    let loadGroupRO = this.process.findCaeObjectByNameInChildObject(
+      loadCondition,
+      "DEADLoads"
+    ) as DesignBaseObject;
+    if (!loadGroupRO) {
+      loadGroupRO = new DesignBaseObject();
+      loadGroupRO.name = "DEADLoads";
+      loadGroupRO.businessState = BusinessState.Creating;
+      this.process.addRenderObject(loadCondition, loadGroupRO);
+    } else {
+      loadGroupRO.businessState = BusinessState.Editing;
+    }
+
+    return loadGroupRO;
+  }
+
+  // 获得指定名字的荷载组合
   private getLoadGroup(loadConditionName: string) {
     let pretreatmentRO = this.viewer.process.findRenderObjectByName(
       "后处理计算结果"
@@ -192,4 +218,5 @@ export default class CommandAddDeadLoad extends CommandComponent {
     ) as LoadCombinationGroupObject;
     return loadConditionRO;
   }
+
 }

package/src/viewerWrapper/commands/aftertreatment/addLoadCombination/commandAddLoadCombination.ts

@@ -9,6 +9,7 @@ import { DesignBaseObject } from "gs-ceec-design";
 import { BusinessState } from "gs-ceec-design";
 import { CaeNumber } from "../../../../utility/utility";
 import { LoadCombinationObject } from "../../../../gsDevFx/objects/loadCombinationObjects/loadCombinationObject";
+import { LoadConditionObject } from "../../../../gsDevFx/objects/loadObjects/loadConditionObject";
 
 export default class CommandAddLoadCombination extends CommandComponent {
   typeName: string = "CommandAddLoadCombination";
@@ -91,9 +92,9 @@ export default class CommandAddLoadCombination extends CommandComponent {
       return
     }
     
-    let loadCombinationGroupRO =
-      this.getLoadCombinationGroupObjectByName(combinationName);
-    if(loadCombinationGroupRO) {
+    let existLoadCondition =
+      this.getLoadCombinationGroupObjectByName(combinationName) || this.getLoadConditionObjectByName(combinationName)
+    if(existLoadCondition) {
       // 荷载组合名已存在
       data.tip.value = 5;
       return
@@ -123,7 +124,7 @@ export default class CommandAddLoadCombination extends CommandComponent {
       return;
     }
 
-    loadCombinationGroupRO = new LoadCombinationGroupObject(combinationName);
+    let loadCombinationGroupRO = new LoadCombinationGroupObject(combinationName);
     loadCombinationGroupRO.businessState = BusinessState.Creating;
     this.process.addRenderObject(loadCombinationGroupParent,loadCombinationGroupRO);
     // 每六个荷载进行组合
@@ -197,4 +198,29 @@ export default class CommandAddLoadCombination extends CommandComponent {
 
     return loadCombinationGroupRO;
   }
+
+  private getLoadConditionObjectByName(loadConditionName: string) {
+      let pretreatmentRO = this.viewer.process.findRenderObjectByName(
+        "后处理计算结果"
+      ) as DesignBaseObject;
+  
+      let conditionParent = this.process.findCaeObjectByNameInChildObject(
+        pretreatmentRO,
+        "荷载工况"
+      ) as DesignBaseObject;
+  
+      if (!conditionParent) {
+        conditionParent = new DesignBaseObject();
+        conditionParent.businessState = BusinessState.Creating;
+        conditionParent.name = "荷载工况";
+        this.process.addRenderObject(pretreatmentRO, conditionParent);
+      }
+  
+      let loadConditionRO = this.process.findCaeObjectByNameInChildObject(
+        conditionParent,
+        loadConditionName
+      ) as LoadConditionObject;
+  
+      return loadConditionRO;
+    }
 }

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

@@ -23,34 +23,34 @@ export default class AddWaveLoadConfig extends Config {
               label: "线性波",
               value: WaveType.AIRY,
             },
+            // {
+            //   label: "线性波浪",
+            //   value: WaveType.AIRC,
+            // },
             {
-              label: "线性波浪",
-              value: WaveType.AIRC,
-            },
-            {
-              label: "高阶非线性波",
+              label: "斯托克斯波",
               value: WaveType.STOK,
             },
+            // {
+            //   label: "精确流函数波",
+            //   value: WaveType.STRE,
+            // },
             {
-              label: "精确非线性波",
-              value: WaveType.STRE,
-            },
-            {
-              label: "精确非线性波（N阶）",
+              label: "N阶流函数波",
               value: WaveType.STRN,
             },
-            {
-              label: "浅水非线性波",
-              value: WaveType.CNOI,
-            },
-            {
-              label: "孤立波",
-              value: WaveType.SOLI,
-            },
-            {
-              label: "用户自定义波",
-              value: WaveType.LINE,
-            },
+            // {
+            //   label: "椭圆余弦波",
+            //   value: WaveType.CNOI,
+            // },
+            // {
+            //   label: "孤立波",
+            //   value: WaveType.SOLI,
+            // },
+            // {
+            //   label: "用户自定义波",
+            //   value: WaveType.LINE,
+            // },
             {
               label: "复用波浪设置",
               value: WaveType.REPT,