|
|
|
@ -19,7 +19,7 @@ import { equaln } from "../Geometry/GeUtils";
|
|
|
|
|
import { IHardwareType } from "../Production/Product";
|
|
|
|
|
import BoardFindModifyModal from "../UI/Components/Board/BoardFindModify";
|
|
|
|
|
import { InitRectBoardDrillOption, SetRectHighDrill } from "../UI/Components/Board/CommonBoardOption";
|
|
|
|
|
import { DRILL_KEYS, ECompareType, EFindType, IBoardFindOption } from "../UI/Store/BoardFindInterface";
|
|
|
|
|
import { DRILL_KEYS, ECompareType, EFindType, IBoardFindOption, IFindCondition } from "../UI/Store/BoardFindInterface";
|
|
|
|
|
import { BoardFindStore } from "../UI/Store/BoardFindModifyStore";
|
|
|
|
|
import { LinesType, BoardOpenDir } from "../UI/Store/BoardInterface";
|
|
|
|
|
|
|
|
|
@ -142,7 +142,7 @@ export class BoardFindModify implements Command
|
|
|
|
|
if (option.condition[i])
|
|
|
|
|
{
|
|
|
|
|
hadVailCondition = true;
|
|
|
|
|
switch (i)
|
|
|
|
|
switch (i as keyof IFindCondition)
|
|
|
|
|
{
|
|
|
|
|
case EBoardKeyList.Height:
|
|
|
|
|
compareBrValue = br.Height;
|
|
|
|
@ -162,7 +162,7 @@ export class BoardFindModify implements Command
|
|
|
|
|
torValue = safeEval(option.tolerance.thickness) || DEFAULT_TOR;
|
|
|
|
|
isVail = this.FilterBrSize(compareBrValue, compareValue, torValue, option.compareType.thickness);
|
|
|
|
|
break;
|
|
|
|
|
case "uerDoor":
|
|
|
|
|
case "useDoor":
|
|
|
|
|
case "useSpecial":
|
|
|
|
|
isVail = br.IsSpecialShape;
|
|
|
|
|
break;
|
|
|
|
@ -241,6 +241,9 @@ export class BoardFindModify implements Command
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
case "useChaidan":
|
|
|
|
|
isVail = br.IsChaiDan === option.isChaidan;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
isVail = false;
|
|
|
|
@ -303,7 +306,7 @@ export class BoardFindModify implements Command
|
|
|
|
|
{
|
|
|
|
|
if (option.condition[i])
|
|
|
|
|
{
|
|
|
|
|
switch (i as keyof EBoardKeyList)
|
|
|
|
|
switch (i as keyof IFindCondition)
|
|
|
|
|
{
|
|
|
|
|
case EBoardKeyList.Height:
|
|
|
|
|
let height = safeEval(option.height);
|
|
|
|
@ -395,6 +398,9 @@ export class BoardFindModify implements Command
|
|
|
|
|
}
|
|
|
|
|
br.BoardProcessOption.remarks = remarks;
|
|
|
|
|
break;
|
|
|
|
|
case "useChaidan":
|
|
|
|
|
br.IsChaiDan = option.isChaidan;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|