gs-cae-design 1.1.64 → 1.1.65

package/src/viewerWrapper/commands/aftertreatment/LRFDFactors/commandLRFDFactors.ts

@@ -0,0 +1,77 @@
+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 LRFDFactorsConfig from './LRFDFactorsConfig'
+import { BusinessState } from 'gs-ceec-design'
+import { DesignBaseObject } from "gs-ceec-design";
+import { LRFDFactorsObject } from '../../../../gsDevFx/objects/caeObjects/aftertreatment/LRFDFactorsObject'
+export default class CommandLRFDFactors extends CommandComponent {
+  typeName = 'CommandLRFDFactors'
+  config: LRFDFactorsConfig
+  preSelector: CAEObjectPreSelector
+  caeObjectSelector: CAEObjectSelector
+  constructor() {
+    super()
+  }
+  begin(): void {
+    this.config = new LRFDFactorsConfig()
+    this.config.show()
+  }
+  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 pretreatmentRO = this.viewer.process.findRenderObjectByName(
+      "后处理计算结果"
+    ) as DesignBaseObject;
+    let lrfdParent = this.process.findCaeObjectByNameInChildObject(
+      pretreatmentRO,
+      "LRFD抗力系数"
+    ) as DesignBaseObject;
+
+    if (!lrfdParent) {
+      lrfdParent = new DesignBaseObject();
+      lrfdParent.businessState = BusinessState.Creating;
+      lrfdParent.name = "LRFD抗力系数";
+      this.process.addRenderObject(pretreatmentRO, lrfdParent);
+    } else {
+      lrfdParent.businessState = BusinessState.Editing;
+      for (let i = 0; i < lrfdParent.childObjects.length; i++) {
+        const item = lrfdParent.childObjects[i];
+        if (item instanceof LRFDFactorsObject) {
+          item.tempDelete(this.viewer);
+          item.businessState = BusinessState.Deleting;
+        }
+      }
+    }
+
+    console.log('commandOk', this.config);
+    const { data } = this.config.properties.items[0]
+    let lrfdfactorsObject = new LRFDFactorsObject()
+    lrfdfactorsObject.businessState = BusinessState.Creating;
+    lrfdfactorsObject.yieldStressFactor = data.yieldStressFactor.value
+    lrfdfactorsObject.tubularAxialTension = data.tubularAxialTension.value
+    lrfdfactorsObject.tubularAxialCompression = data.tubularAxialCompression.value
+    lrfdfactorsObject.tubularBending = data.tubularBending.value
+    lrfdfactorsObject.tubularShear = data.tubularShear.value
+    lrfdfactorsObject.tubularHoop = data.tubularHoop.value
+    lrfdfactorsObject.noTubularAxialTension = data.noTubularAxialTension.value
+    lrfdfactorsObject.noTubularAxialCompression = data.noTubularAxialCompression.value
+    lrfdfactorsObject.noTubularBending = data.noTubularBending.value
+    lrfdfactorsObject.noTubularShear = data.noTubularShear.value
+    this.process.addRenderObject(lrfdParent, lrfdfactorsObject);
+    data.tip.value = 2
+  }
+}

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

@@ -39,7 +39,7 @@ export default class AddCurrentLoadConfig extends Config {
           selections: [
             {
               label: "无",
-              value: FactorOption.None
+              value: ""
             },
             {
               label: "自动",
@@ -79,7 +79,7 @@ export default class AddCurrentLoadConfig extends Config {
             },
             {
               label: "无",
-              value: CrsetStretchingOption.None
+              value: ""
             },
           ],
         },

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

@@ -40,21 +40,19 @@ export default class CommandAddCurrentLoad extends CommandComponent {
     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: "None", value: "" })
       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: "" })
       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 })
     }
   }
 
@@ -177,17 +175,17 @@ export default class CommandAddCurrentLoad extends CommandComponent {
       }
     }
 
-    // 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;

package/src/viewerWrapper/commands/aftertreatment/addSeastateUcpart/addSeastateUcpartConfig.ts

@@ -0,0 +1,42 @@
+import { Config } from '../../../../gsDevFx/propertyComponents/config'
+import { PropertyComponent } from '../../../../gsDevFx/propertyComponents/propertyComponent'
+
+export default class AddSeastateUcpartConfig extends Config {
+  constructor() {
+    super()
+
+    let property = new PropertyComponent()
+    property.name = '应力比范围'
+    property.data = {
+      lowerLimmit_first: {
+        name: '',
+        value: null
+      },
+      upperLimmit_first: {
+        name: '',
+        value: null
+      },
+      lowerLimmit_second: {
+        name: '',
+        value: null
+      },
+      upperLimmit_second: {
+        name: '',
+        value: null
+      },
+      lowerLimmit_thrid: {
+        name: '',
+        value: null
+      },
+      upperLimmit_thrid: {
+        name: '',
+        value: null
+      },
+      tip: {
+        name: '提示',
+        value: null
+      }
+    }
+    this.properties.add(property)
+  }
+}

package/src/viewerWrapper/commands/aftertreatment/addSeastateUcpart/commandAddSeastateUcpart.ts

@@ -0,0 +1,227 @@
+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 AddSeastateUcpartConfig from './addSeastateUcpartConfig'
+import { BusinessState } from 'gs-ceec-design'
+import { SeastateUcpart } from '../../../../gsDevFx/objects/caeObjects/optionObjects/seastateUcpart'
+
+export default class CommandAddSeastateUcpart extends CommandComponent {
+  typeName = 'CommandAddSeastateUcpart'
+
+  config: AddSeastateUcpartConfig
+  preSelector: CAEObjectPreSelector
+  caeObjectSelector: CAEObjectSelector
+
+  currentSeastateUcpartObj: SeastateUcpart = null
+
+  constructor() {
+    super()
+  }
+
+  begin(): void {
+    this.changeOperators()
+
+    console.log('CommandAddSeastateUcpart')
+    this.config = new AddSeastateUcpartConfig()
+    this.config.show()
+
+    this.setToConfig();
+  }
+
+  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 seastateUcpartObj = this.process.findRenderObjectByType(
+      "SeastateUcpart"
+    ) as SeastateUcpart
+
+    if(!seastateUcpartObj) {
+      seastateUcpartObj = new SeastateUcpart()
+      seastateUcpartObj.businessState = BusinessState.Creating
+      this.process.addRenderObject(this.process.caeRenderObjectTreeManager.seastateNode, seastateUcpartObj)
+    }else {
+      seastateUcpartObj.businessState = BusinessState.Editing;
+    }
+
+    seastateUcpartObj.lowerLimmit_first = 0
+    seastateUcpartObj.upperLimmit_first = 0
+    seastateUcpartObj.lowerLimmit_second = 0
+    seastateUcpartObj.upperLimmit_second = 0
+    seastateUcpartObj.lowerLimmit_thrid = 0
+    seastateUcpartObj.upperLimmit_thrid = 0
+
+    let lowerLimmit_first = Number(data.lowerLimmit_first.value) || 0
+    let upperLimmit_first = Number(data.upperLimmit_first.value) || 0
+    let lowerLimmit_second = Number(data.lowerLimmit_second.value) || 0
+    let upperLimmit_second = Number(data.upperLimmit_second.value) || 0
+    let lowerLimmit_thrid = Number(data.lowerLimmit_thrid.value) || 0
+    let upperLimmit_thrid = Number(data.upperLimmit_thrid.value) || 0
+
+
+    data.tip.value = 2;
+    if(!lowerLimmit_first) {
+      return
+    }
+
+    seastateUcpartObj.lowerLimmit_first = lowerLimmit_first
+
+    if(!upperLimmit_first) {
+      this.viewer.updateDisplay()
+      data.tip.value = 1
+      this.setToConfig()
+      return
+    }
+
+    if(lowerLimmit_first >= upperLimmit_first) {
+      return
+    }
+
+    seastateUcpartObj.upperLimmit_first = upperLimmit_first
+
+    if(!lowerLimmit_second) {
+      this.viewer.updateDisplay()
+      data.tip.value = 1
+      this.setToConfig()
+      return
+    }
+    
+    if(upperLimmit_first > lowerLimmit_second) {
+      return
+    }
+    
+    seastateUcpartObj.lowerLimmit_second = upperLimmit_first;
+
+    if(!upperLimmit_second) {
+      this.viewer.updateDisplay()
+      data.tip.value = 1
+      this.setToConfig()
+      return
+    }
+
+    if(lowerLimmit_second >= upperLimmit_second) {
+      return
+    }
+
+    seastateUcpartObj.upperLimmit_second = upperLimmit_second
+
+    if(!lowerLimmit_thrid) {
+      this.viewer.updateDisplay()
+      data.tip.value = 1
+      this.setToConfig()
+      return
+    }
+
+    if(upperLimmit_second > lowerLimmit_thrid) {
+      return
+    }
+
+    seastateUcpartObj.lowerLimmit_thrid = upperLimmit_second
+
+    if(!upperLimmit_thrid) {
+      this.viewer.updateDisplay()
+      data.tip.value = 1
+      this.setToConfig()
+      return
+    }
+
+    if(lowerLimmit_thrid >= upperLimmit_thrid) {
+      return
+    }
+
+    seastateUcpartObj.upperLimmit_thrid = upperLimmit_thrid
+
+    this.viewer.updateDisplay()
+    data.tip.value = 1
+    this.setToConfig()
+  }
+
+  updatePanel() {}
+
+  setToConfig() {
+    let data = this.config.properties.items[0].data
+    data.lowerLimmit_first.value = "";
+    data.upperLimmit_first.value = "";
+    data.lowerLimmit_second.value = "";
+    data.upperLimmit_second.value = "";
+    data.lowerLimmit_thrid.value = "";
+    data.upperLimmit_thrid.value = "";
+
+    let seastateUcpartObj = this.process.findRenderObjectByType(
+      "SeastateUcpart"
+    ) as SeastateUcpart
+    if(seastateUcpartObj) {
+      if(seastateUcpartObj.checkBusinessStateIsActive()) {
+        this.currentSeastateUcpartObj = seastateUcpartObj;
+        data.lowerLimmit_first.value = seastateUcpartObj.lowerLimmit_first;
+        data.upperLimmit_first.value = seastateUcpartObj.upperLimmit_first;
+        data.lowerLimmit_second.value = seastateUcpartObj.lowerLimmit_second;
+        data.upperLimmit_second.value = seastateUcpartObj.upperLimmit_second;
+        data.lowerLimmit_thrid.value = seastateUcpartObj.lowerLimmit_thrid;
+        data.upperLimmit_thrid.value = seastateUcpartObj.upperLimmit_thrid;
+      }
+    } 
+  }
+
+  deleteSeastateUcpart() {
+    let ro = this.viewer.process.findRenderObjectByType(
+          "SeastateUcpart"
+        ) as SeastateUcpart;
+    
+        ro.businessState = BusinessState.Editing;
+        ro.lowerLimmit_first = 0;
+        ro.upperLimmit_first = 0;
+        ro.lowerLimmit_second = 0;
+        ro.upperLimmit_second = 0;
+        ro.lowerLimmit_thrid = 0;
+        ro.upperLimmit_thrid = 0;
+    
+        this.setToConfig()
+        
+        this.currentSeastateUcpartObj = null
+    
+        let data = this.config.properties.items[0].data;
+        data.tip.value = 1;
+  }
+}

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

@@ -241,17 +241,17 @@ export default class CommandAddWaveLoad extends CommandComponent {
     this.viewer.updateDisplay();
     data.tip.value = 1;
 
-    // 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);
+    }
 
     // 添加或修改荷载组.
 

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

@@ -106,7 +106,7 @@ export default class AddWindLoadConfig extends Config {
           selections: [
             {
               label: "无覆盖",
-              value: MemberLoadingOption.None
+              value: ""
             },
             {
               label: "采用波浪/海流Cd值",

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

@@ -40,11 +40,11 @@ export default class CommandAddWindLoad extends CommandComponent {
 
     data.memberLoadingOption.selectOptions.selections = []
     if(this.viewer.commonInterfaceManager.showEnglishText) {
-      data.memberLoadingOption.selectOptions.selections.push({ label: "None", value: MemberLoadingOption.None })
+      data.memberLoadingOption.selectOptions.selections.push({ label: "None", value: "" })
       data.memberLoadingOption.selectOptions.selections.push({ label: "Use wave/current Cd", value: MemberLoadingOption.W })
       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: "" })
       data.memberLoadingOption.selectOptions.selections.push({ label: "采用波浪/海流Cd值", value: MemberLoadingOption.W })
       data.memberLoadingOption.selectOptions.selections.push({ label: "忽略杆件荷载", value: MemberLoadingOption.I })
     }
@@ -172,17 +172,17 @@ export default class CommandAddWindLoad extends CommandComponent {
     this.viewer.updateDisplay();
     data.tip.value = 1;
     
-    // 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);
+    }
 
     // 添加或修改荷载组.
 

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

@@ -39,21 +39,19 @@ export default class CommandEditCurrentLoad extends CommandComponent {
     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: "None", value: "" })
       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: "" })
       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 })
     }
 
     this.config.loadConditionChange = () => {

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

@@ -48,7 +48,7 @@ export default class EditCurrentLoadConfig extends Config {
           selections: [
             {
               label: "无",
-              value: FactorOption.None
+              value: ""
             },
             {
               label: "自动",
@@ -88,7 +88,7 @@ export default class EditCurrentLoadConfig extends Config {
             },
             {
               label: "无",
-              value: CrsetStretchingOption.None
+              value: ""
             },
           ],
         },

package/src/viewerWrapper/commands/aftertreatment/editWindLoad/commandEditWindLoad.ts

@@ -38,11 +38,11 @@ export default class CommandEditWindLoad extends CommandComponent {
 
     data.memberLoadingOption.selectOptions.selections = []
     if(this.viewer.commonInterfaceManager.showEnglishText) {
-      data.memberLoadingOption.selectOptions.selections.push({ label: "None", value: MemberLoadingOption.None })
+      data.memberLoadingOption.selectOptions.selections.push({ label: "None", value: "" })
       data.memberLoadingOption.selectOptions.selections.push({ label: "Use wave/current Cd", value: MemberLoadingOption.W })
       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: "" })
       data.memberLoadingOption.selectOptions.selections.push({ label: "采用波浪/海流Cd值", value: MemberLoadingOption.W })
       data.memberLoadingOption.selectOptions.selections.push({ label: "忽略杆件荷载", value: MemberLoadingOption.I })
     }

package/src/viewerWrapper/commands/aftertreatment/editWindLoad/editWindLoadConfig.ts

@@ -118,7 +118,7 @@ export default class EditWindLoadConfig extends Config {
           selections: [
             {
               label: "无覆盖",
-              value: MemberLoadingOption.None,
+              value: "",
             },
             {
               label: "采用波浪/海流Cd值",

package/src/viewerWrapper/commands/aftertreatment/setAndShowSeastateLoadOptions/commandSetAndShowSeastateLoadOptions.ts

@@ -115,7 +115,6 @@ export default class CommandSetAndShowSeastateLoadOptions extends CommandCompone
       this.process.addRenderObject(seastateNode,seastateLdoptObj);
     }else {
       seastateLdoptObj.businessState = BusinessState.Editing
-      seastateLdoptObj.businessState = BusinessState.Editing
     }
 
     let cardLDOPT = new CardLDOPT();
@@ -189,7 +188,9 @@ export default class CommandSetAndShowSeastateLoadOptions extends CommandCompone
       "SeastateLdopt"
     ) as SeastateLdopt;
 
-    ro.tempDelete(this.viewer)
+    ro.businessState = BusinessState.Editing;
+    ro.cardObject = new CardLDOPT("LDOPT       NF+Z   1.025   7.849                GLOBMN    HYD                 K                                          ")
+    ro.cardData = ro.cardObject.getLine()
 
     this.currentSeastateLdopt = null
 

package/src/viewerWrapper/commands/pretreatment/surfaceWeightEdit/surfaceWeightEditConfig.ts

@@ -12,7 +12,7 @@ export default class SurfaceEditWeightConfig extends Config {
     let property = new PropertyComponent();
 
     property.name = "编辑表面质量";
-      this.surfaceWeightList = new Array<SurfaceWeightObject>()
+    this.surfaceWeightList = new Array<SurfaceWeightObject>()
     property.data = {
       tip: {
         name: "提示",

package/src/viewerWrapper/commands/pretreatment/windArea/commandWindArea.ts

@@ -1,6 +1,6 @@
 import { CommandComponent } from "../../commandComponent";
 import { CAEObjectSelector } from "../../../../gsDevFx/operators/caeObjectSelector";
-import { WindAreaObject } from "../../../../gsDevFx/objects/caeObjects/pretreatment/WindAreaObject";
+import { WindAreaObject } from "../../../../gsDevFx/objects/caeObjects/pretreatment/windAreaObject";
 import { DesignBaseObject } from "gs-ceec-design";
 import { BusinessState } from "gs-ceec-design";
 import { JointObject } from "../../../../gsDevFx/objects/caeObjects/jointObject";
@@ -13,7 +13,7 @@ enum FocusOption {
   second = "second",
 }
 export default class commandWindArea extends CommandComponent {
-  typeName: string = "commandWindArea";
+  typeName: string = "CommandWindArea";
   config: WindAreaConfig;
   caeObjectSelector: CAEObjectSelector = null;
   preSelector: CAEObjectPreSelector = null;
@@ -126,17 +126,17 @@ export default class commandWindArea extends CommandComponent {
       return;
     }
     if (['F', 'B', 'D'].includes(areaDefinition.value)) {
-      if (this.validateNonNegative(xProjArea) || this.validateNonNegative(yProjArea) || this.validateNonNegative(zProjArea)) {
+      if (!this.validateNonNegative(xProjArea.value) || !this.validateNonNegative(yProjArea.value) || !this.validateNonNegative(zProjArea.value)) {
         data.tip.value = `3`;
         return
       }
-      if (!xProjArea && !yProjArea && !zProjArea) {
+      if (!xProjArea.value && !yProjArea.value && !zProjArea.value) {
         data.tip.value = `4`;
         return
       }
     }
     if (['A', 'R'].includes(areaDefinition.value)) {
-      if (!this.validateNonNegative(totalArea)) {
+      if (!this.validateNonNegative(totalArea.value)) {
         data.tip.value = `4`;
         return
       }
@@ -151,7 +151,7 @@ export default class commandWindArea extends CommandComponent {
       return
     }
     // 校验结束
-    let windAreaObject = new WindAreaObject(areaID);
+    let windAreaObject = new WindAreaObject(areaID.value);
     windAreaObject.businessState = BusinessState.Creating;
     windAreaObject.areaID = areaID.value
     windAreaObject.areaDefinition = areaDefinition.value
@@ -170,7 +170,7 @@ export default class commandWindArea extends CommandComponent {
       windAreaObject.YCoord = YCoord.value
       windAreaObject.ZCoord = ZCoord.value
       windAreaObject.shearFactor = shearFactor.value
-      windAreaObject.actionNodeList = actionNodeList.value
+      windAreaObject.actionNodeList= actionNodeList.listOptions.list.map(item=>item.label)
     }
      this.process.addRenderObject(windAreaParent, windAreaObject);
      data.tip.value = 7;