!1196 优化:查找修改

src/Add-on/BoardFindModify.ts

@@ -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;
                 }

src/Editor/DefaultConfig.ts

@@ -179,7 +179,7 @@ export const DefaultClosingStripOption: ClosingStripOption = {
 Object.freeze(DefaultClosingStripOption);
 
 export const DefaultBoardFindOption: IBoardFindOption = {
-    version: 3,
+    version: 4,
     condition: {
         layer: false,
         height: false,
@@ -210,6 +210,7 @@ export const DefaultBoardFindOption: IBoardFindOption = {
         leftDrill: false,
         rightDrill: false,
         useZhengFanDrill: false,
+        useChaidan: false,
     },
     compareType: {
         height: ECompareType.Equal,
@@ -253,6 +254,7 @@ export const DefaultBoardFindOption: IBoardFindOption = {
     upDownDrill: [true, true],
     isClose: false,
     remarks: Array.from({ length: 10 }, () => ["", ""]),
+    isChaidan: false,
 };
 Object.freeze(DefaultBoardFindOption);
 

src/UI/Components/Board/BoardFindModify.tsx

@@ -419,6 +419,19 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
                             target={<Button intent={Intent.PRIMARY}>编辑备注</Button>}
                         />
                     </div>
+                    <div>
+                        <Checkbox
+                            label="是否拆单"
+                            inline
+                            checked={store.m_Option.condition.useChaidan}
+                            onChange={() => store.m_Option.condition.useChaidan = !store.m_Option.condition.useChaidan}
+                        />
+                        <Checkbox
+                            inline
+                            checked={store.m_Option.isChaidan}
+                            onChange={() => store.m_Option.isChaidan = !store.m_Option.isChaidan}
+                        />
+                    </div>
                     <div>
                         <Checkbox
                             checked={store.isSelectAll}
@@ -442,7 +455,7 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
                     </div>
                     <div style={{
                         position: "absolute",
-                        bottom: 0,
+                        bottom: -10,
                         width: "100%",
                         textAlign: "right"
                     }}>

src/UI/Store/BoardFindInterface.ts

@@ -30,6 +30,7 @@ export interface IBoardFindOption extends IBaseOption
     upDownDrill: [boolean, boolean];
     isClose: boolean;
     remarks: [string, string][];
+    isChaidan: boolean;
 }
 export interface IFindCondition
 {
@@ -62,6 +63,7 @@ export interface IFindCondition
     leftDrill: boolean;
     rightDrill: boolean;
     useZhengFanDrill: boolean;
+    useChaidan: boolean;
 }
 
 export interface ICompareType

src/UI/Store/BoardFindModifyStore.ts

@@ -71,9 +71,18 @@ export class BoardFindStore extends BoardStore
     {
         if (cof.option.version < 3)
         {
+            cof.option.version = 3;
             cof.option.compareType[EBoardKeyList.BrMat] = ECompareType.Equal;
             cof.option.compareType[EBoardKeyList.Color] = ECompareType.Equal;
         }
+
+        if (cof.option.version < 4)
+        {
+            cof.option.version = 4;
+            cof.option.isChaidan = false;
+            cof.option.condition.useChaidan = false;
+        }
+
         Object.assign(this.m_Option, cof.option);
         this.SetDrillType();
         this.CheckIsSelectAll();