gs-cae-design 1.1.60 → 1.1.62

package/src/viewerWrapper/commands/aftertreatment/editWindLoad/commandEditWindLoad.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 } from "../../../../gsDevFx/objects/loadObjects/windLoadObject";
+import { WindLoadObject, MemberLoadingOption } from "../../../../gsDevFx/objects/loadObjects/windLoadObject";
 import { SeastateLdopt } from "../../../../gsDevFx/objects/caeObjects/optionObjects/seastateLdopt"
 import { CardLDOPT } from "../../../../caeCardEditor/caeCardObjects/seainp/cardLDOPT"
 
@@ -20,6 +20,7 @@ export default class CommandEditWindLoad extends CommandComponent {
   caeObjectSelector: CAEObjectSelector;
 
   loadConditionRO: LoadConditionObject = null;
+  loadGroupRO: DesignBaseObject = null;
   currentWindLoadRO: WindLoadObject = null;
 
   constructor() {
@@ -33,6 +34,19 @@ export default class CommandEditWindLoad extends CommandComponent {
     this.config = new EditWindLoadConfig();
     this.config.show();
 
+    let data = this.config.properties.items[0].data;
+
+    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: "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: MemberLoadingOption.W })
+      data.memberLoadingOption.selectOptions.selections.push({ label: "忽略杆件荷载", value: MemberLoadingOption.I })
+    }
+
     this.config.loadConditionChange = () => {
       let data = this.config.properties.items[0].data;
       let loadCondition = data.loadCondition.value;
@@ -40,13 +54,13 @@ export default class CommandEditWindLoad extends CommandComponent {
       this.loadConditionRO =
         this.getAndCreateLoadConditionObjectByName(loadCondition);
 
-      let loadGroupRO = this.getAndCreateLoadGroupByLoadCondition(
+      this.loadGroupRO = this.getAndCreateLoadGroupByLoadCondition(
         this.loadConditionRO
       );
 
       this.currentWindLoadRO = null;
-      for (let i = 0; i < loadGroupRO.childObjects.length; i++) {
-        let windLoad = loadGroupRO.childObjects[i] as WindLoadObject;
+      for (let i = 0; i < this.loadGroupRO.childObjects.length; i++) {
+        let windLoad = this.loadGroupRO.childObjects[i] as WindLoadObject;
         if (windLoad.checkBusinessStateIsActive()) {
           this.currentWindLoadRO = windLoad;
           data.windVelocity.value = windLoad.windVelocity;
@@ -54,7 +68,7 @@ export default class CommandEditWindLoad extends CommandComponent {
           data.windVariationDefinition.value = windLoad.windVariationDefinition;
           data.windDirection.value = windLoad.windDirection;
           data.memberLoadingOption.value = windLoad.memberLoadingOption;
-          data.isWaterDepthRatherThanOriginElevation.value = windLoad.isWaterDepthRatherThanOriginElevation;
+          data.isOriginElevationRatherThanWaterDepth.value = windLoad.isOriginElevationRatherThanWaterDepth;
           data.stillWaterDepthOverride.value = windLoad.stillWaterDepthOverride;
           data.isPrintDetailedLoadReport.value = windLoad.isPrintDetailedLoadReport;
         }
@@ -145,12 +159,12 @@ export default class CommandEditWindLoad extends CommandComponent {
     this.loadConditionRO =
       this.getAndCreateLoadConditionObjectByName(loadCondition);
 
-    let loadGroupRO = this.getAndCreateLoadGroupByLoadCondition(
+    this.loadGroupRO = this.getAndCreateLoadGroupByLoadCondition(
       this.loadConditionRO
     );
 
-    for (let i = 0; i < loadGroupRO.childObjects.length; i++) {
-      const item = loadGroupRO.childObjects[i] as DesignBaseObject;
+    for (let i = 0; i < this.loadGroupRO.childObjects.length; i++) {
+      const item = this.loadGroupRO.childObjects[i] as DesignBaseObject;
       item.tempDelete(this.viewer);
       item.businessState = BusinessState.Deleting;
     }
@@ -159,7 +173,7 @@ export default class CommandEditWindLoad extends CommandComponent {
 
     windLoad.businessState = BusinessState.Creating;
 
-    this.process.addRenderObject(loadGroupRO, windLoad);
+    this.process.addRenderObject(this.loadGroupRO, windLoad);
 
     windLoad.loadCondition = data.loadCondition.value;
 
@@ -175,8 +189,8 @@ export default class CommandEditWindLoad extends CommandComponent {
 
     windLoad.memberLoadingOption = data.memberLoadingOption.value;
 
-    windLoad.isWaterDepthRatherThanOriginElevation =
-      data.isWaterDepthRatherThanOriginElevation.value;
+    windLoad.isOriginElevationRatherThanWaterDepth =
+      data.isOriginElevationRatherThanWaterDepth.value;
 
     windLoad.stillWaterDepthOverride = CaeNumber(
       data.stillWaterDepthOverride.value
@@ -293,4 +307,63 @@ export default class CommandEditWindLoad extends CommandComponent {
     );
     return loadConditions;
   }
+  
+  deleteLoadGroup(loadConditionName: string) {
+    let data = this.config.properties.items[0].data;
+
+    // 添加或修改工况.
+    let loadConditionRO = this.getLoadConditionObjectByName(loadConditionName);
+    if (!loadConditionRO) {
+      // 没有查找到对应的工况或荷载组
+      data.tip.value = 2;
+      return;
+    }
+
+    let loadGroupRO = this.process.findCaeObjectByNameInChildObject(
+      loadConditionRO,
+      "WINDLoads"
+    ) as DesignBaseObject;
+    if (!loadGroupRO) {
+      // 没有查找到对应的工况或荷载组
+      data.tip.value = 2;
+      return;
+    }
+
+    let deletingList = new Array<WindLoadObject>();
+    let restObject = 0;
+    for (let i = 0; i < loadGroupRO.childObjects.length; i++) {
+      let child = loadGroupRO.childObjects[i] as DesignBaseObject;
+      if (child instanceof WindLoadObject) {
+        deletingList.push(child);
+      } else if (child.checkBusinessStateIsActive()) {
+        restObject++;
+      }
+    }
+
+    for (let i = 0; i < deletingList.length; i++) {
+      deletingList[i].tempDelete(this.viewer);
+      // this.process.removeRenderObject(deletingList[i]);
+    }
+
+    if (restObject === 0) {
+      loadGroupRO.tempDelete(this.viewer);
+    }
+
+    this.viewer.updateDisplay();
+    data.tip.value = 1;
+    // this.loadGroupRO.tempDelete(this.viewer);
+  }
+
+  private setConfig() {
+    let data = this.config.properties.items[0].data;
+
+    data.windVelocity.value = 1
+    data.referenceHeightOrWindPressure.value = ""
+    data.windVariationDefinition.value = ""
+    data.windDirection.value = ""
+    data.memberLoadingOption.value = ""
+    data.isOriginElevationRatherThanWaterDepth.value = false
+    data.stillWaterDepthOverride.value = ""
+    data.isPrintDetailedLoadReport.value = false
+  }
 }

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

@@ -131,7 +131,7 @@ export default class EditWindLoadConfig extends Config {
           ],
         },
       },
-      isWaterDepthRatherThanOriginElevation: {
+      isOriginElevationRatherThanWaterDepth: {
         name: "使用原点高程替代水深",
         type: "switch",
         value: false,

package/src/viewerWrapper/commands/commandSplitMemberBase.ts

@@ -59,6 +59,7 @@ export default class CommandSplitMemberBase extends CommandComponent {
       let oldGrup = this.process.cloneManager.cloneObject(
         member.grup
       ) as GrupObject;
+      oldGrup.businessState = BusinessState.Creating;
 
       if (member.grup.grupSegments.length > 1) {
         // 相当复杂.
@@ -84,6 +85,8 @@ export default class CommandSplitMemberBase extends CommandComponent {
             let newGrup1 = this.process.cloneManager.cloneObject(
               oldGrup
             ) as GrupObject;
+            newGrup1.businessState = BusinessState.Creating;
+
             newGrup1.name = grupNames[0];
             newGrup1.grupSegments = [];
             this.process.addRenderObject(
@@ -95,6 +98,9 @@ export default class CommandSplitMemberBase extends CommandComponent {
             let newGrup2 = this.process.cloneManager.cloneObject(
               oldGrup
             ) as GrupObject;
+            newGrup2.businessState = BusinessState.Creating;
+
+
             newGrup2.name = grupNames[1];
             newGrup2.grupSegments = [];
             this.process.addRenderObject(
@@ -157,6 +163,8 @@ export default class CommandSplitMemberBase extends CommandComponent {
           let grup1 = this.process.cloneManager.cloneObject(
             oldGrup
           ) as GrupObject;
+          grup1.businessState = BusinessState.Creating;
+
           grup1.grupSegments[0].segmentLength = 0;
           grup1.name = grupNames[0];
           cloneMember1.grup = grup1;
@@ -168,6 +176,8 @@ export default class CommandSplitMemberBase extends CommandComponent {
           let grup2 = this.process.cloneManager.cloneObject(
             oldGrup
           ) as GrupObject;
+          grup2.businessState = BusinessState.Creating;
+
           grup2.grupSegments[0].segmentLength = 0;
           grup2.name = grupNames[1];
           cloneMember2.grup = grup2;
@@ -250,6 +260,8 @@ export default class CommandSplitMemberBase extends CommandComponent {
         let currentGrup = this.process.cloneManager.cloneObject(
           member.grup
         ) as GrupObject;
+        currentGrup.businessState = BusinessState.Creating;
+
 
         if (!grupNames) {
           cloneMember.grup = member.grup;
@@ -257,6 +269,8 @@ export default class CommandSplitMemberBase extends CommandComponent {
           let newGrup = this.process.cloneManager.cloneObject(
             currentGrup
           ) as GrupObject;
+          newGrup.businessState = BusinessState.Creating;
+
           if (grupNames[i]) {
             newGrup.name = grupNames[i];
           } else {

package/src/viewerWrapper/commands/createGrup/commandCreateGrup.ts

@@ -647,6 +647,7 @@ export default class CommandCreateGrup extends CommandComponent {
     let cloneObj = this.process.cloneManager.cloneObject(
       targetGrup
     ) as GrupObject;
+    cloneObj.businessState = BusinessState.Creating;
     cloneObj.name = grupName;
     this.currentGrupObject = cloneObj;
     // this.showCurrentGrupData();

package/src/viewerWrapper/commands/createSection/commandCreateSection.ts

@@ -183,6 +183,7 @@ export default class CommandCreateSection extends CommandComponent {
     let newSectionObject = this.process.cloneManager.cloneObject(
       this.sectionObj
     ) as SectionObject;
+    newSectionObject.businessState = BusinessState.Creating;
     this.sectionObj = newSectionObject;
     // this.switchTypeOfConfig(this.sectionObj.crossSectionType);
 
@@ -481,6 +482,7 @@ export default class CommandCreateSection extends CommandComponent {
       this.sectionObj
     ) as SectionObject;
     tempObj.deserializeFormParams(params);
+    tempObj.businessState = BusinessState.Living;
 
     let data = this.config.properties.items[1].data;
     if (data.standardSize) {

package/src/viewerWrapper/commands/editGrup/commandEditGrup.ts

@@ -1,6 +1,4 @@
-import {
-  BusinessState,
-} from "gs-ceec-design";
+import { BusinessState } from "gs-ceec-design";
 import { CameraMouse } from "../../../gsDevFx/operators/cameraMouse";
 import { CommandSelect } from "../../../gsDevFx/commands/commandSelect";
 import {
@@ -24,6 +22,7 @@ export default class CommandEditGrup extends CommandComponent {
   targetGrupObject: GrupObject = null;
 
   // 添加/删除分段要改为在“应用”时才生效，因此添加一个复制的分段数组对象——20250801
+  // 仅在添加/删除分段时起效.
   copyedGrupSegments: GrupSegment[] = null;
 
   constructor(grupObject?: GrupObject) {
@@ -274,20 +273,20 @@ export default class CommandEditGrup extends CommandComponent {
 
     if (!currentGrupObject) {
       console.log("没有查找到该截面组");
-      this.copyedGrupSegments = new Array<GrupSegment>();
+      this.copyedGrupSegments = null;
       return;
     }
 
     if (!data.groupType.value) {
       data.tip.value = 6;
-      this.copyedGrupSegments = new Array<GrupSegment>();
+      this.copyedGrupSegments = null;
       return;
     }
 
     if (data.groupType.value === "0" && data.section.value === null) {
       if (!data.tubOuterDiameter.value || !data.tubWallThickness.value) {
         data.tip.value = 7;
-        this.copyedGrupSegments = new Array<GrupSegment>();
+        this.copyedGrupSegments = null;
         return;
       }
       if (
@@ -300,8 +299,8 @@ export default class CommandEditGrup extends CommandComponent {
       }
     }
 
-    // 
-    if(this.copyedGrupSegments && this.copyedGrupSegments.length > 0) {
+    //
+    if (this.copyedGrupSegments && this.copyedGrupSegments.length > 0) {
       currentGrupObject.grupSegments = this.copyedGrupSegments;
     }
 
@@ -323,7 +322,7 @@ export default class CommandEditGrup extends CommandComponent {
     });
 
     this.viewer.updateDisplay();
-    this.copyedGrupSegments = new Array<GrupSegment>();
+    this.copyedGrupSegments = null;
 
     this.viewer.addState(
       false,
@@ -483,6 +482,10 @@ export default class CommandEditGrup extends CommandComponent {
     let index = data.currentSegmentIndex.value;
 
     let grupSegment = currentGrupObject.grupSegments[index - 1];
+    if(!grupSegment) {
+      grupSegment = this.copyedGrupSegments[index - 1];
+    }
+
     if (grupSegment) {
       data.taperOption.value = grupSegment.taperOption;
       if (!grupSegment.section) {
@@ -531,41 +534,24 @@ export default class CommandEditGrup extends CommandComponent {
       data.definedGrups.value
     ) as GrupObject;
 
-    if(!this.copyedGrupSegments) {
+    if (!this.copyedGrupSegments || this.copyedGrupSegments.length === 0) {
       this.copyedGrupSegments = new Array<GrupSegment>();
-    }
-    for(let i = 0; i < currentGrupObject.grupSegments.length; i++) {
-      this.copyedGrupSegments.push(currentGrupObject.grupSegments[i]);
+
+      for (let i = 0; i < currentGrupObject.grupSegments.length; i++) {
+        let grupSegment = currentGrupObject.grupSegments[i];
+        this.copyedGrupSegments.push(grupSegment);
+      }
     }
 
-    // this.resetGrupSegmentConfigData();
-    // let grupSegment = new GrupSegment();
-    // grupSegment.elastic_E = "20.60";
-    // grupSegment.elastic_G = "7.900";
-    // grupSegment.elastic_SY = "35.50";
-    // grupSegment.kFactors_KY = "1.00";
-    // grupSegment.kFactors_KZ = "1.00";
-    // grupSegment.tubShearAreaModifier = "0.500";
-    // grupSegment.weightDensity = "7.8500";
-    // grupSegment.flooding = "N";
-    // this.setGrupSegmentDataByConfig(grupSegment);
-    let currentGrupSegment = currentGrupObject.grupSegments[index - 1];
+    let currentGrupSegment = this.copyedGrupSegments[index - 1];
     let grupSegment = currentGrupSegment.clone();
+    if(!grupSegment.segmentLength) {
+      // 若为0或没有填值，则默认赋值为0.1.
+      grupSegment.segmentLength = 0.1;
+    }
 
     let array = this.copyedGrupSegments;
     array.splice(index, 0, grupSegment);
-    // if (array.length > 0) {
-    //   let len = array.length;
-    //   for (let i = len; i > index; i--) {
-    //     tempArray.push(array.pop());
-    //   }
-    // }
-    // array.push(grupSegment);
-
-    // let tempLen = tempArray.length;
-    // for (let i = 0; i < tempLen; i++) {
-    //   array.push(tempArray.pop());
-    // }
 
     let segmentCount = data.segmentCount.value;
     segmentCount++;
@@ -595,9 +581,13 @@ export default class CommandEditGrup extends CommandComponent {
       data.definedGrups.value
     ) as GrupObject;
 
-    // this.copyedGrupSegments = new Array<GrupSegment>();
-    for(let i = 0; i < currentGrupObject.grupSegments.length; i++) {
-      this.copyedGrupSegments.push(currentGrupObject.grupSegments[i]);
+   if (!this.copyedGrupSegments || this.copyedGrupSegments.length === 0) {
+      this.copyedGrupSegments = new Array<GrupSegment>();
+      
+      for (let i = 0; i < currentGrupObject.grupSegments.length; i++) {
+        let grupSegment = currentGrupObject.grupSegments[i];
+        this.copyedGrupSegments.push(grupSegment);
+      }
     }
 
     let array = this.copyedGrupSegments;

package/src/viewerWrapper/commands/editSection/commandEditSection.ts

@@ -439,6 +439,7 @@ export default class CommandEditSection extends CommandComponent {
     let tempSectionObj = this.viewer.process.cloneManager.cloneObject(
       this.tempSectionObj
     ) as SectionObject;
+    tempSectionObj.businessState = BusinessState.Living;
     this.tempSectionObj = tempSectionObj;
 
     this.preview(tempSectionObj);
@@ -607,6 +608,8 @@ export default class CommandEditSection extends CommandComponent {
     let originName = currentSection.name;
     let renameString = data0.rename.value;
     currentSection.name = renameString;
+    currentSection.businessState = BusinessState.Editing
+    this.tempSectionObj.name = renameString;
     // 重命名成功
     data0.tip.value = 4;
 
@@ -746,6 +749,7 @@ export default class CommandEditSection extends CommandComponent {
       this.editedSectionObj
     ) as SectionObject;
     tempObj.deserializeFormParams(params);
+    tempObj.businessState = BusinessState.Living;
 
     let data = this.config.properties.items[1].data;
     if (data.standardSize) {

package/src/viewerWrapper/commands/pretreatment/addJointWeight/commandAddJointWeight.ts

@@ -192,6 +192,7 @@ export default class CommandAddJointWeight extends CommandComponent {
         }
         jointWeight.weight = CaeNumber(data.weight.value);
         jointWeight.density = CaeNumber(data.density.value);
+        jointWeight.isInclude = data.isInclude.value
 
         jointWeight.xFactor = CaeNumber(factorData.xFactor.value);
         jointWeight.yFactor = CaeNumber(factorData.yFactor.value);
@@ -327,7 +328,10 @@ export default class CommandAddJointWeight extends CommandComponent {
       if (weightGroups[i].name === weightGroupID) {
         for (let j = 0; j < weightGroups[i].childObjects.length; j++) {
           let weightId = weightGroups[i].childObjects[j] as WeightIdObject;
-          weightIds.push(weightId);
+          if(weightId.checkBusinessStateIsActive() && weightId instanceof WeightIdObject) {
+            weightIds.push(weightId);
+          }
+          
         }
       }
     }

package/src/viewerWrapper/commands/pretreatment/centerOfRoll/commandCenterOfRoll.ts

@@ -93,7 +93,7 @@ export default class commandCenterOfRoll extends CommandComponent {
 
 
 
-      let centerRoll = new CenterRenderObject();
+      let centerRoll = new CenterRenderObject(item.centerID);
 
       centerRoll.businessState = BusinessState.Creating;
 

package/src/viewerWrapper/commands/pretreatment/editJointWeight/commandEditJointWeight.ts

@@ -25,6 +25,8 @@ export default class CommandEditJointWeight extends CommandComponent {
   weightIdRO: WeightIdObject = null;
   expectFilter = SelectorFiliter.Joint;
 
+  prepareToDeleteWeightList = new Longan.List<JointWeightObject>();
+
   constructor() {
     super();
   }
@@ -43,6 +45,7 @@ export default class CommandEditJointWeight extends CommandComponent {
   }
 
   changeOperators(): void {
+    this.prepareToDeleteWeightList.clear();
     // 进入命令前清空选中与高亮.
     this.viewer.selectionManager.clearAllSelectionAndHighlight();
     this.viewer.updateDisplay();
@@ -83,6 +86,12 @@ export default class CommandEditJointWeight extends CommandComponent {
   }
 
   commandOk(): void {
+    // 正式删除点质量
+    for (let i = 0; i < this.prepareToDeleteWeightList.count(); i++) {
+      this.prepareToDeleteWeightList.items[i].tempDelete(this.viewer);
+    }
+    this.prepareToDeleteWeightList.clear();
+
     let data = this.config.properties.items[0].data;
     let factorData = this.config.properties.items[1].data;
     let axisData = this.config.properties.items[2].data;
@@ -154,7 +163,7 @@ export default class CommandEditJointWeight extends CommandComponent {
 
         for (let j = 0; j < this.weightIdRO.childObjects.length; j++) {
           let weight = this.weightIdRO.childObjects[j];
-          if (weight instanceof JointWeightObject) {
+          if (weight instanceof JointWeightObject && weight.checkBusinessStateIsActive()) {
             if (weight.jointName === selectedObj.name) {
               counter++;
               jointWeight = weight;
@@ -167,6 +176,7 @@ export default class CommandEditJointWeight extends CommandComponent {
         if (jointWeight) {
           jointWeight.weight = CaeNumber(data.weight.value);
           jointWeight.density = CaeNumber(data.density.value);
+          jointWeight.isInclude = data.isInclude.value
 
           jointWeight.xFactor = CaeNumber(factorData.xFactor.value);
           jointWeight.yFactor = CaeNumber(factorData.yFactor.value);
@@ -183,6 +193,70 @@ export default class CommandEditJointWeight extends CommandComponent {
     }
   }
 
+  /**
+   * 将点质量标记为待删除/或取消删除.
+   * 在应用时正式删除
+   * @param jointName 带有点质量的空间点名
+   * @param isDelete true——标记为待删除；false——取消待删除标记
+   * @returns 
+   */
+  markJointWeight(jointName: string, isDelete: boolean) {
+    let data = this.config.properties.items[0].data;
+
+    let weightGroupID = data.weightGroupID.value;
+    let weightID = data.weightID.value;
+    if (weightGroupID && weightID) {
+      let weightGroupRO =
+        this.getWeightGroupObjectByName(weightGroupID);
+      if (weightGroupRO) {
+        let weightIdRO = this.getWeightIdObjectByName(
+          weightGroupRO,
+          weightID
+        );
+        if (weightIdRO) {
+          let jointWeight: JointWeightObject = null;
+          for (let j = 0; j < weightIdRO.childObjects.length; j++) {
+            let child = weightIdRO.childObjects[j];
+            if (child instanceof JointWeightObject) {
+              if (child.jointName === jointName) {
+                jointWeight = child;
+                break;
+              }
+            }
+          }
+          if (jointWeight) {
+            if (isDelete) {
+              if (this.prepareToDeleteWeightList.indexOf(jointWeight) === -1) {
+                this.prepareToDeleteWeightList.add(jointWeight);
+              }
+              // 将点质量添加到待删除列表.
+              data.tip.value = 7 + "," + jointName;
+            } else {
+              if (this.prepareToDeleteWeightList.indexOf(jointWeight) > -1) {
+                this.prepareToDeleteWeightList.remove(jointWeight);
+              }
+              // 将点质量从待删除列表中移除.
+              data.tip.value = 8 + "," + jointName;
+            }
+
+            return;
+          } else {
+            // 没有查找到点质量.
+            data.tip.value = 9;
+            return;
+          }
+        }
+      }
+
+      // 无法查找到工况名对象或质量组对象.
+      data.tip.value = 6;
+      return;
+    } else {
+      // 没有填写工况名和质量组名
+      data.tip.value = 5;
+    }
+  }
+
   updatePanel() {
     if (
       this.viewer.selectionInterfaceManager.selectorFilter === this.expectFilter
@@ -267,6 +341,7 @@ export default class CommandEditJointWeight extends CommandComponent {
 
     data.weight.value = Number(ro.weight).toString();
     data.density.value = Number(ro.density).toString();
+    data.isInclude.value = ro.isInclude
 
     factorData.xFactor.value = Number(ro.xFactor).toString();
     factorData.yFactor.value = Number(ro.yFactor).toString();
@@ -284,6 +359,7 @@ export default class CommandEditJointWeight extends CommandComponent {
 
     data.weight.value = "";
     data.density.value = "";
+    data.isInclude.value = false
 
     factorData.xFactor.value = "";
     factorData.yFactor.value = "";
@@ -387,7 +463,9 @@ export default class CommandEditJointWeight extends CommandComponent {
       if (weightGroups[i].name === weightGroupID) {
         for (let j = 0; j < weightGroups[i].childObjects.length; j++) {
           let weightId = weightGroups[i].childObjects[j] as WeightIdObject;
-          weightIds.push(weightId);
+          if(weightId.checkBusinessStateIsActive() && weightId instanceof WeightIdObject) {
+            weightIds.push(weightId);
+          }
         }
       }
     }