gs-cae-design 1.1.65 → 1.1.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gs-cae-design",
-  "version": "1.1.65",
+  "version": "1.1.67",
   "description": "广州图石科技有限公司发布的基于gs-longan的CAE图形控件",
   "main": "lib/CAEDesign.umd.min.js",
   "types": "./types/caeDesign/src/index.d.ts",

package/src/caeCardEditor/caeCardObjects/cardObject.ts

@@ -39,26 +39,39 @@ export class CardObject {
           hasData = true;
         }
 
-        let value = (this[key].value === 0 || this[key].value)
-          ? this[key].value.toString().trimEnd().trim()
-          : "";
+        let value =
+          this[key].value === 0 || this[key].value
+            ? this[key].value.toString().trimEnd().trim()
+            : "";
 
-        let result = value;
+        let result = value as string;
 
         if (result) {
-          let num = Number(result);
           let axlen = this[key].range[1] - this[key].range[0];
-          let resultExp = num.toExponential();
-          let fix = Math.abs(Number((resultExp as string).split("e")[1]));
-          if (num > 0) {
-            if (fix > axlen - 1) {
-              result = num.toExponential(axlen - 4).toString();
-              result = (result as string).replace("e", "");
-            }
+          if (result.length > axlen && axlen <= 5) {
+            // 数值位数超出卡片限制的长度，则导出为""
+            result = "";
+            hasData = false;
           } else {
-            if (fix > axlen - 2) {
-              result = num.toExponential(axlen - 5).toString();
-              result = (result as string).replace("e", "");
+            let num = Number(result);
+            // 最多保留三位小数
+            num = Number(num.toFixed(3));
+            // 转科学计数法
+            let resultExp = num.toExponential();
+            // 单独提取指数
+            let fix = Math.abs(Number((resultExp as string).split("e")[1]));
+            if (num > 0) {
+              // 正数
+              if (fix > axlen - 1) {
+                result = num.toExponential(axlen - 4).toString();
+                result = (result as string).replace("e", "");
+              }
+            } else {
+              // 负数
+              if (fix > axlen - 2) {
+                result = num.toExponential(axlen - 5).toString();
+                result = (result as string).replace("e", "");
+              }
             }
           }
         }
@@ -67,9 +80,10 @@ export class CardObject {
           result += ".";
         }
 
-        let number = this[key].range[1] - this[key].range[0] - result.length;
+        // 补满空格.
+        let roopTime = this[key].range[1] - this[key].range[0] - result.length;
         let space = "";
-        for (let i = 0; i < number; i++) {
+        for (let i = 0; i < roopTime; i++) {
           space += " ";
         }
         result = space + result;

package/src/caeCardEditor/caeCardObjects/sacinp/cardSURFID.ts

@@ -53,7 +53,7 @@ export class CardSURFID extends CardObject {
   };
   outOfPlaneTolerance = {
     value: "",
-    range: [33, 40],
+    range: [33, 42],
     span: 0,
     label: "Out-of-Plane Tolerance",
     type: "Floating Point",

package/src/gsDevFx/managers/interfaceManagers/commonInterfaceManager.ts

@@ -64,6 +64,8 @@ export class CommonInterfaceManager extends Longan.ViewerManagerBase {
   elementKey = "cutline";
   activeBoreholeName = null;
 
+  currentSwitchColorDivide = SwitchColorDivide.Cancel;
+
   constructor(viewer: Viewer) {
     super(viewer);
   }
@@ -1509,6 +1511,17 @@ export class CommonInterfaceManager extends Longan.ViewerManagerBase {
         this.colorDivSwitch_ComponentGroup(false, isUpdate);
         break;
     }
+
+    this.currentSwitchColorDivide = state; 
+  }
+
+  refreshColorSwitch() {
+    if(this.currentSwitchColorDivide !== SwitchColorDivide.Cancel) {
+      let record = this.currentSwitchColorDivide;
+      this.colorSwitch(SwitchColorDivide.Cancel);
+      this.colorSwitch(record);
+      this.viewer.updateDisplay();
+    }
   }
 
   /**

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

@@ -53,10 +53,12 @@ export class ModelOptions extends DesignBaseObject {
   serializeToCard() {
     let result = null;
 
-    if (!this.cardObject.units.value) {
-      this.cardObject.units.value = "MN";
+    if (this.cardObject) {
+      if (!this.cardObject.units.value) {
+        this.cardObject.units.value = "MN";
+      }
+      result = this.cardObject.getLine();
     }
-    result = this.cardObject.getLine();
 
     return result;
   }

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

@@ -33,19 +33,19 @@ export class CorrzObject extends DesignBaseObject {
   /**
    * 最大作用壁厚
    */
-  maxThickness: string= "";
+  maxThickness: string = "";
   /**
    * 最小剩余壁厚
    */
-  minCorrodedThickness: string= "";
+  minCorrodedThickness: string = "";
   /**
    * 浪流荷载选项
    */
-  memberLoadOption: string= "";
+  memberLoadOption: string = "";
   /**
    * 垂向坐标
    */
-  verticalCoord: string= "";
+  verticalCoord: string = "";
   /**
    * 分色颜色
    */
@@ -150,11 +150,15 @@ export class CorrzObject extends DesignBaseObject {
     card.bottomOfZone.value = checkNotNullOrUndefinded(this.bottomOfZone)
       ? this.bottomOfZone.toString()
       : "";
-    card.topOfZone.value = checkNotNullOrUndefinded(this.topOfZone) ? this.topOfZone.toString() : "";
+    card.topOfZone.value = checkNotNullOrUndefinded(this.topOfZone)
+      ? this.topOfZone.toString()
+      : "";
     card.corrosionZoneOption.value = this.corrosIonOption
       ? this.corrosIonOption.toString()
       : "";
-    card.level_bottomOfZone.value = checkNotNullOrUndefinded(this.thicknessBottom)
+    card.level_bottomOfZone.value = checkNotNullOrUndefinded(
+      this.thicknessBottom
+    )
       ? this.thicknessBottom.toString()
       : "";
     card.level_topOfZone.value = checkNotNullOrUndefinded(this.thicknessTop)
@@ -170,7 +174,33 @@ export class CorrzObject extends DesignBaseObject {
       ? this.minCorrodedThickness.toString()
       : "";
     card.memberLoadOption.value = this.memberLoadOption;
-    card.verticalCoord.value = this.verticalCoord;
+    switch (this.verticalCoord) {
+      case "0":
+        {
+          card.verticalCoord.value = "";
+        }
+        break;
+      case "1":
+        {
+          card.verticalCoord.value = "X";
+        }
+        break;
+      case "2":
+        {
+          card.verticalCoord.value = "Y";
+        }
+        break;
+      case "3":
+        {
+          card.verticalCoord.value = "Z";
+        }
+        break;
+      default:
+        {
+          card.verticalCoord.value = "";
+        }
+        break;
+    }
 
     return card.getLine();
   }

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

@@ -201,7 +201,11 @@ export class ColorDivHeightObject extends ColorDivBaseObject {
 
   inactive(viewer: Viewer) {
     for (let i = 0; i < this.members.length; i++) {
-      this.members[i].visible = true;
+      let iro = viewer.findInstanceObject(this.members[i]);
+      if(iro) {
+        iro.visible = true;
+      }
+      // this.members[i].visible = true;
     }
 
     for (let i = 0; i < this.cloudMembers.length; i++) {
@@ -279,7 +283,7 @@ export class ColorDivHeightObject extends ColorDivBaseObject {
       ) {
         // 区域在杆件内，且下部
         distances.push(0);
-        distances.push((top - memberBottom) / Math.cos(angle));
+        distances.push((top - memberBottom) / Math.abs(Math.cos(angle)));
 
         let color = this.getColorByIndex(colors, i / 2);
         color = this.checkColorIsTemp(color, member);
@@ -288,7 +292,7 @@ export class ColorDivHeightObject extends ColorDivBaseObject {
         // 区域在杆件中间
         if (distances.length === 0) {
           distances.push(0);
-          distances.push((bottom - memberBottom) / Math.cos(angle));
+          distances.push((bottom - memberBottom) / Math.abs(Math.cos(angle)));
           divColors.push(member.faceColor[0] / 255);
           divColors.push(member.faceColor[1] / 255);
           divColors.push(member.faceColor[2] / 255);
@@ -299,8 +303,8 @@ export class ColorDivHeightObject extends ColorDivBaseObject {
           divColors.push(member.faceColor[3]);
         }
 
-        distances.push((bottom - memberBottom) / Math.cos(angle));
-        distances.push((top - memberBottom) / Math.cos(angle));
+        distances.push((bottom - memberBottom) / Math.abs(Math.cos(angle)));
+        distances.push((top - memberBottom) / Math.abs(Math.cos(angle)));
 
         let color = this.getColorByIndex(colors, i / 2);
         color = this.checkColorIsTemp(color, member);
@@ -312,7 +316,7 @@ export class ColorDivHeightObject extends ColorDivBaseObject {
       ) {
         if (distances.length === 0) {
           distances.push(0);
-          distances.push((bottom - memberBottom) / Math.cos(angle));
+          distances.push((bottom - memberBottom) / Math.abs(Math.cos(angle)));
           divColors.push(member.faceColor[0] / 255);
           divColors.push(member.faceColor[1] / 255);
           divColors.push(member.faceColor[2] / 255);
@@ -323,7 +327,7 @@ export class ColorDivHeightObject extends ColorDivBaseObject {
           divColors.push(member.faceColor[3]);
         }
 
-        distances.push((bottom - memberBottom) / Math.cos(angle));
+        distances.push((bottom - memberBottom) / Math.abs(Math.cos(angle)));
         distances.push(member.getMemberLength());
 
         let color = this.getColorByIndex(colors, i / 2);
@@ -378,7 +382,10 @@ export class ColorDivHeightObject extends ColorDivBaseObject {
       if (resultMembers && resultMembers.length > 0) {
         let parentRO = viewer.process.caeRenderObjectTreeManager.tempNode;
 
-        member.visible = false;
+        let iro = viewer.findInstanceObject(member);
+        if(iro) {
+          iro.visible = false;
+        }
         for (let j = 0; j < resultMembers.length; j++) {
           viewer.process.addRenderObject(parentRO, resultMembers[j]);
           resultMembers[j].setNeedUpdate();

package/src/viewerWrapper/commands/createMember/commandCreateMember.ts

@@ -302,6 +302,7 @@ export default class CommandCreateMember extends CommandComponent {
 
     // this.viewer.viewInterfaceManager.resetView();
     this.viewer.viewInterfaceManager.resetMemberView();
+    this.viewer.commonInterfaceManager.refreshColorSwitch();
     this.viewer.updateDisplay();
     data.tip.value = 3;
 

package/src/viewerWrapper/commands/createMember/memberConfig.ts

@@ -1,6 +1,7 @@
 import { Config } from "./../../../gsDevFx/propertyComponents/config";
 import { PropertyComponent } from "../../../gsDevFx/propertyComponents/propertyComponent";
 import { Process } from "../../../gsDevFx/process";
+import { DesignBaseObject } from "gs-ceec-design";
 
 export default class MemberConfig extends Config {
   constructor() {
@@ -58,13 +59,23 @@ export default class MemberConfig extends Config {
     let sectionObjectGroup =
       Process.activeProcess.findRenderObjectByName("杆件截面组");
     if (sectionObjectGroup) {
-      property.data.sectionGroup.selectOptions.selections =
-        sectionObjectGroup.childObjects.map((item) => {
-          return {
+      // property.data.sectionGroup.selectOptions.selections =
+      //   sectionObjectGroup.childObjects.map((item) => {
+      //     return {
+      //       label: item.name,
+      //       value: item.id,
+      //     };
+      //   });
+
+      property.data.sectionGroup.selectOptions.selections = [];
+      sectionObjectGroup.childObjects.map((item) => {
+        if((item as DesignBaseObject).checkBusinessStateIsActive()) {
+          property.data.sectionGroup.selectOptions.selections.push({
             label: item.name,
             value: item.id,
-          };
-        });
+          });
+        }
+      });
     }
   }
 }

package/src/viewerWrapper/commands/createPlate/commandCreatePlate.ts

@@ -229,6 +229,12 @@ export default class CommandCreatePlate extends CommandComponent {
     let pGrupObj: PGrupObject = this.viewer.process.findRenderObjectById(
       seletedGrupId
     ) as PGrupObject;
+    if(!pGrupObj) {
+      pGrupObj = this.viewer.process.findRenderObjectByNameInChildObject(
+        this.viewer.process.caeRenderObjectTreeManager.pGrupNode,
+        seletedGrupId
+      ) as PGrupObject;
+    }
     plateObject.pGrup = pGrupObj;
     // plateObject.plateThickness = CaeNumber(data.thickness.value);
 

package/src/viewerWrapper/commands/createPlate/plateConfig.ts

@@ -2,6 +2,7 @@ import { Config } from "../../../gsDevFx/propertyComponents/config";
 import { PropertyComponent } from "../../../gsDevFx/propertyComponents/propertyComponent";
 import { Process } from "../../../gsDevFx/process";
 import { PGrupObject } from "../../../gsDevFx/objects/caeObjects/pGrupObject";
+import { DesignBaseObject } from "gs-ceec-design";
 
 export default class PlateConfig extends Config {
   constructor() {
@@ -70,13 +71,23 @@ export default class PlateConfig extends Config {
     let sectionObjectGroup =
       Process.activeProcess.findRenderObjectByName("板截面组");
     if (sectionObjectGroup) {
-      property.data.sectionGroup.selectOptions.selections =
-        sectionObjectGroup.childObjects.map((item) => {
-          return {
+      // property.data.sectionGroup.selectOptions.selections =
+      //   sectionObjectGroup.childObjects.map((item) => {
+      //     return {
+      //       label: item.name,
+      //       value: item.id,
+      //     };
+      //   });
+
+      property.data.sectionGroup.selectOptions.selections = [];
+      sectionObjectGroup.childObjects.map((item) => {
+        if ((item as DesignBaseObject).checkBusinessStateIsActive()) {
+          property.data.sectionGroup.selectOptions.selections.push({
             label: item.name,
             value: item.id,
-          };
-        });
+          });
+        }
+      });
     }
   }
 

package/src/viewerWrapper/commands/createPlatesInRange/createPlatesInRangeConfig.ts

@@ -1,6 +1,7 @@
 import { PropertyComponent } from "../../../gsDevFx/propertyComponents/propertyComponent";
 import { Longan } from "gs-bim-air";
 import { Config } from "../../../gsDevFx/propertyComponents/config";
+import { DesignBaseObject } from "gs-ceec-design";
 
 export default class CreatePlatesInRangeConfig extends Config {
   constructor() {
@@ -53,15 +54,24 @@ export default class CreatePlatesInRangeConfig extends Config {
 
     let pGrups = Longan.Process.activeProcess.findRenderObjectByName("板截面组");
     if (pGrups) {
-      // let memberObject: MemberObject = this.commandData;
-      property.data.pGrups.selectOptions.selections = pGrups.childObjects.map(
-        (item) => {
-          return {
+      // property.data.pGrups.selectOptions.selections = pGrups.childObjects.map(
+      //   (item) => {
+      //     return {
+      //       label: item.name,
+      //       value: item.id,
+      //     };
+      //   }
+      // );
+
+      property.data.pGrups.selectOptions.selections = [];
+      pGrups.childObjects.map((item) => {
+       if ((item as DesignBaseObject).checkBusinessStateIsActive()) {
+          property.data.pGrups.selectOptions.selections.push({
             label: item.name,
             value: item.id,
-          };
+          });
         }
-      );
+      });
     }
   }
 }

package/src/viewerWrapper/commands/createXBracing/xBracingConfig.ts

@@ -1,3 +1,4 @@
+import { DesignBaseObject } from "gs-ceec-design";
 import { Config } from "../../../gsDevFx/propertyComponents/config";
 import { PropertyComponent } from "../../../gsDevFx/propertyComponents/propertyComponent";
 import { Longan } from "gs-bim-air";
@@ -63,23 +64,43 @@ export default class XBracingConfig extends Config {
     this.properties.add(property);
 
     let sectionObjectGroup =
-    Longan.Process.activeProcess.findRenderObjectByName("杆件截面组");
+      Longan.Process.activeProcess.findRenderObjectByName("杆件截面组");
     if (sectionObjectGroup) {
-      property.data.continuousGroup.selectOptions.selections =
-        sectionObjectGroup.childObjects.map((item) => {
-          return {
+      // property.data.continuousGroup.selectOptions.selections =
+      //   sectionObjectGroup.childObjects.map((item) => {
+      //     return {
+      //       label: item.name,
+      //       value: item.id,
+      //     };
+      //   });
+
+      property.data.continuousGroup.selectOptions.selections = [];
+      sectionObjectGroup.childObjects.map((item) => {
+        if ((item as DesignBaseObject).checkBusinessStateIsActive()) {
+          property.data.continuousGroup.selectOptions.selections.push({
             label: item.name,
             value: item.id,
-          };
-        });
+          });
+        }
+      });
+
+      // property.data.discontinuousGroup.selectOptions.selections =
+      //   sectionObjectGroup.childObjects.map((item) => {
+      //     return {
+      //       label: item.name,
+      //       value: item.id,
+      //     };
+      //   });
 
-      property.data.discontinuousGroup.selectOptions.selections =
-        sectionObjectGroup.childObjects.map((item) => {
-          return {
+      property.data.discontinuousGroup.selectOptions.selections = [];
+      sectionObjectGroup.childObjects.map((item) => {
+        if ((item as DesignBaseObject).checkBusinessStateIsActive()) {
+          property.data.discontinuousGroup.selectOptions.selections.push({
             label: item.name,
             value: item.id,
-          };
-        });
+          });
+        }
+      });
     }
   }
 }

package/src/viewerWrapper/commands/deleteMember/commandDeleteMember.ts

@@ -10,6 +10,7 @@ import { BusinessState } from "gs-ceec-design";
 import { SelectorFiliter } from "../../../gsDevFx/managers/interfaceManagers/selectionInterfaceManager";
 import { MemberObject } from "../../../gsDevFx/objects/caeObjects/memberObject";
 import { Longan } from "gs-bim-air";
+import { RenderObject } from "gs-longan/objects/renderObject";
 
 /**
  * 删除杆件
@@ -122,6 +123,9 @@ export default class CommandDeleteMember extends CommandComponent {
       }
     }
 
+    // 删除关联分色对象.
+    this.deleteTempNode(selectedMembers);
+
     // 批量删除.
     let deleteMember = selectedMembers;
     if (deleteMember.count() > 0) {
@@ -170,6 +174,31 @@ export default class CommandDeleteMember extends CommandComponent {
     data.tip.value = 3 + "," + deleteMember.count();
   }
 
+  //
+  private deleteTempNode(selectedMembers: Longan.List<MemberObject>) {
+    let tempNode = this.viewer.process.caeRenderObjectTreeManager.tempNode;
+
+    let ros = new Array<RenderObject>();
+    for (let i = 0; i < selectedMembers.count(); i++) {
+      let ro = selectedMembers.items[i];
+      for (let j = 0; j < tempNode.childObjects.length; j++) {
+        let child = tempNode.childObjects[j];
+        if (child.name === ro.name) {
+          ros.push(ro);
+          break;
+        }
+      }
+    }
+
+    for(let i = 0; i < ros.length; i++) {
+      let ro = ros[i];
+
+      let iro =this.viewer.findInstanceObject(ro);
+      iro.visible = false;
+      this.process.removeRenderObject(ro);
+    }
+  }
+
   updatePanel() {
     if (
       this.viewer.selectionInterfaceManager.selectorFilter ===

package/src/viewerWrapper/commands/pretreatment/colorDivideByEditComponentGroup/colorDivideByEditComponentGroupConfig.ts

@@ -152,7 +152,7 @@ export default class ColorDivideByEditComponentGroupConfig extends Config {
         // let obj = process.findRenderObjectById(id);
         let obj = process.findRenderObjectByNameInChildObject(process.caeRenderObjectTreeManager.jointNode, id);
 
-        if (obj && obj instanceof JointObject) {
+        if (obj && obj instanceof JointObject && obj.checkBusinessStateIsActive()) {
           data.groupJoints.listOptions.list.push({
             label: obj.name,
             value: id,
@@ -166,7 +166,7 @@ export default class ColorDivideByEditComponentGroupConfig extends Config {
         // let obj = process.findRenderObjectById(id);
         let obj = process.findRenderObjectByNameInChildObject(process.caeRenderObjectTreeManager.memberNode, id);
 
-        if (obj && obj instanceof MemberObject) {
+        if (obj && obj instanceof MemberObject && obj.checkBusinessStateIsActive()) {
           data.groupMembers.listOptions.list.push({
             label: obj.name,
             value: id,
@@ -180,7 +180,7 @@ export default class ColorDivideByEditComponentGroupConfig extends Config {
         // let obj = process.findRenderObjectById(id);
         let obj = process.findRenderObjectByNameInChildObject(process.caeRenderObjectTreeManager.plateNode, id);
 
-        if (obj && obj instanceof PlateObject) {
+        if (obj && obj instanceof PlateObject && obj.checkBusinessStateIsActive()) {
           data.groupPlates.listOptions.list.push({
             label: obj.name,
             value: id,
@@ -193,7 +193,7 @@ export default class ColorDivideByEditComponentGroupConfig extends Config {
       if (jointNode) {
         for (let i = 0; i < jointNode.childObjects.length; i++) {
           let item = jointNode.childObjects[i];
-          if (groupRO.refercenJointIds.indexOf(item.id) === -1) {
+          if (groupRO.refercenJointIds.indexOf(item.id) === -1 && (item as DesignBaseObject).checkBusinessStateIsActive()) {
             data.allJoints.listOptions.list.push({
               label: item.name,
               value: item.name,
@@ -207,7 +207,7 @@ export default class ColorDivideByEditComponentGroupConfig extends Config {
       if (memberNode) {
         for (let i = 0; i < memberNode.childObjects.length; i++) {
           let item = memberNode.childObjects[i];
-          if (groupRO.refercenMemberIds.indexOf(item.id) === -1) {
+          if (groupRO.refercenMemberIds.indexOf(item.id) === -1 && (item as DesignBaseObject).checkBusinessStateIsActive()) {
             data.allMembers.listOptions.list.push({
               label: item.name,
               value: item.name,
@@ -221,7 +221,7 @@ export default class ColorDivideByEditComponentGroupConfig extends Config {
       if (plateNode) {
         for (let i = 0; i < plateNode.childObjects.length; i++) {
           let item = plateNode.childObjects[i];
-          if (groupRO.refercenPlateIds.indexOf(item.id) === -1) {
+          if (groupRO.refercenPlateIds.indexOf(item.id) === -1 && (item as DesignBaseObject).checkBusinessStateIsActive()) {
             data.allPlates.listOptions.list.push({
               label: item.name,
               value: item.name,

package/src/viewerWrapper/commands/pretreatment/colorDivideByGrupName/colorDivideByGrupNameConfig.ts

@@ -2,6 +2,7 @@ import { Config } from "../../../../gsDevFx/propertyComponents/config";
 import { PropertyComponent } from "../../../../gsDevFx/propertyComponents/propertyComponent";
 import { Process } from "../../../../gsDevFx/process";
 import { ColorProperty } from "../../../../gsDevFx/propertyComponents/colorProperty";
+import { DesignBaseObject } from "gs-ceec-design";
 
 export default class ColorDivideByGrupNameConfig extends Config {
   constructor() {
@@ -33,10 +34,12 @@ export default class ColorDivideByGrupNameConfig extends Config {
       Process.activeProcess.findRenderObjectByName("杆件截面组");
     if (grupObjectGroup) {
       grupObjectGroup.childObjects.map((item) => {
-        this.properties.items[0].data.grups.listOptions.list.push({
-          label: item.name,
-          value: "UnAssigned",
-        });
+        if ((item as DesignBaseObject).checkBusinessStateIsActive()) {
+          this.properties.items[0].data.grups.listOptions.list.push({
+            label: item.name,
+            value: "UnAssigned",
+          });
+        }
       });
     }
   }