!282 bug修复

Merge pull request !282 from ZoeLeeFZ/fixBugg

src/Common/CheckoutVaildValue.ts

@@ -246,6 +246,7 @@ export namespace CheckoutValid
                 {
                     return "数值不能为空且必须为数字"
                 }
+                return "";
         }
     }
     export function CheckoutLatticeOption(k: string, v: string): string
@@ -274,6 +275,7 @@ export namespace CheckoutValid
                 {
                     return "数值不能为空且必须为数字"
                 }
+                return "";
         }
     }
 }

src/DatabaseServices/Board.ts

@@ -108,7 +108,12 @@ export class Board extends ExtureSolid
         board.InitBoard(length, width, thickness, boardType);
         board.ApplyMatrix(board.RotateMat);
         board.m_SpecOCS.identity();
-        board.ColorIndex = boardType + 1;
+        if (boardType === BoardType.Layer)
+            board.ColorIndex = 2;
+        else if (boardType === BoardType.Vertical)
+            board.ColorIndex = 11;
+        else
+            board.ColorIndex = 3;
         return board;
     }
     get DrillList()

src/Geometry/SpaceParse/Point3SpaceParse,.ts

@@ -41,7 +41,7 @@ export class Point3SpaceParse extends ISpaceParse
         let zVec = ptRes.Point.sub(basePt).normalize();
         let yVec = zVec.clone().cross(xVec).normalize();
 
-        if (isPerpendicularityTo(zVec, yVec))
+        if (!isPerpendicularityTo(zVec, yVec))
         {
             AppToaster.show({
                 message: "x轴和z轴必须垂直",
@@ -54,7 +54,6 @@ export class Point3SpaceParse extends ISpaceParse
             Msg: "点选或者输入深度",
             BasePoint: basePt,
         });
-
         if (distRes.Status !== PromptStatus.OK)
             return;
 

src/UI/Components/Board/BoardConfigModal.tsx

@@ -159,6 +159,9 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
 
         await exec();
 
+        this.props.canDrawSpeical.set(this.props.br.IsSpecialShape);
+        this.props.canModeling.set(this.props.br.BoardModeling.length > 0);
+
         app.m_Editor.m_ModalManage.ToggleShow();
         commandMachine.CommandEnd();
         return;

src/UI/Components/Board/WineRack.tsx

@@ -99,7 +99,7 @@ export class WineRackModal extends React.Component<{ store?: WineRackStore }, {}
         return (
             <div
                 className={Classes.DIALOG_CONTAINER}
-                id="boardModal"
+                id="commonModal"
             >
                 <div className={Classes.DIALOG + " winerack"}>
                     <div

src/UI/Components/LatticeDrawer.tsx

@@ -26,7 +26,7 @@ export class LatticeDrawer extends React.Component<{ store?: LatticeDrawerStore
         return (
             <div
                 className={Classes.DIALOG_CONTAINER}
-                id="boardModal"
+                id="commonModal"
             >
                 <div className={Classes.DIALOG + " lattice"}>
                     <div

src/UI/Store/LatticeDrawerStore.ts

@@ -3,6 +3,7 @@ import { ILatticeOption, ELatticeArrayType } from "./LatticeInterface";
 import { observable, toJS } from "mobx";
 import { IConfigOption } from "../Components/Board/UserConfig";
 import { DataAdapter } from "../../Common/DataAdapter";
+import { CheckoutValid, CheckObjectType } from "../../Common/CheckoutVaildValue";
 
 export class LatticeDrawerStore extends BoardStore
 {
@@ -41,4 +42,8 @@ export class LatticeDrawerStore extends BoardStore
         if (this.m_UiOption)
             Object.assign(this.m_UiOption, DataAdapter.ConvertUIData(cof.option));
     }
+    HasInvailValue()
+    {
+        return CheckoutValid.HasInvailValue(this.UIOption, CheckObjectType.Lat)
+    }
 }