!2084 新增:查找修改增加去除拆单尺寸按钮 #401

src/Add-on/BoardFindModify.ts

@@ -2,9 +2,9 @@ import { toJS } from "mobx";
 import { app } from "../ApplicationServices/Application";
 import { arrayLast } from "../Common/ArrayExt";
 import { EBoardKeyList } from "../Common/BoardKeyList";
+import { safeEval } from "../Common/eval";
 import { UpdateDraw } from "../Common/Status";
 import { FixedNotZero } from "../Common/Utils";
-import { safeEval } from "../Common/eval";
 import { CylinderHole, GangDrillType } from "../DatabaseServices/3DSolid/CylinderHole";
 import { BoardIsLong, BoardIsShort } from "../DatabaseServices/BoardLinesReactor";
 import { LineAngularDimension } from "../DatabaseServices/Dimension/2LineAngularDimension";
@@ -62,6 +62,7 @@ export class BoardFindModify implements Command
                 case EFindType.RemoveModeling:
                 case EFindType.RemoveSpecialShape:
                 case EFindType.RemoveModelingAndSpecial:
+                case EFindType.RemoveSplitSize:
                     await this.RemoveBoardModelingOrSpecialShape(res.type);
                 default:
                     break;
@@ -594,6 +595,13 @@ export class BoardFindModify implements Command
                 if (br.IsSpecialShape || br.ContourCurve.EndParam < 4)//0长度的板会造成是矩形,但是终点参数小于4的问题
                     br.ConverToRectSolid();
             }
+            if (removeType === EFindType.RemoveSplitSize)
+            {
+                //去除拆单尺寸
+                br.BoardProcessOption.spliteHeight = "";
+                br.BoardProcessOption.spliteWidth = "";
+                br.BoardProcessOption.spliteThickness = "";
+            }
         }
     }
     private async ModifyHardware(en: IHardwareType, option: IBoardFindOption)

src/UI/Components/Board/BoardFindModify.tsx

@@ -614,12 +614,8 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
                             onChange={() => option.isClose = !option.isClose}
                         />
                     </div>
-                    <div style={{
-                        position: "absolute",
-                        bottom: -10,
-                        width: "100%",
-                        textAlign: "right"
-                    }}>
+                    <div className='removeGroup'>
+                        <div>
                             <Button
                                 className={Classes.INTENT_PRIMARY}
                                 text="去除造型"
@@ -628,6 +624,16 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
                                     store.OnOk(ModalState.Ok, { type: EFindType.RemoveModeling });
                                 }}
                             />
+                            <Button
+                                className={Classes.INTENT_PRIMARY}
+                                text="去除造型异型"
+                                onClick={() =>
+                                {
+                                    store.OnOk(ModalState.Ok, { type: EFindType.RemoveModelingAndSpecial });
+                                }}
+                            />
+                        </div>
+                        <div>
                             <Button
                                 className={Classes.INTENT_PRIMARY}
                                 text="去除异型"
@@ -636,16 +642,18 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
                                     store.OnOk(ModalState.Ok, { type: EFindType.RemoveSpecialShape });
                                 }}
                             />
+
                             <Button
                                 className={Classes.INTENT_PRIMARY}
-                            text="去除造型异型"
+                                text="去除拆单尺寸"
                                 onClick={() =>
                                 {
-                                store.OnOk(ModalState.Ok, { type: EFindType.RemoveModelingAndSpecial });
+                                    store.OnOk(ModalState.Ok, { type: EFindType.RemoveSplitSize });
                                 }}
                             />
                         </div>
                     </div>
+                </div>
             </CommonModal>
         );
     }

src/UI/Components/Modal/ModalStyle/BoardFind.less

@@ -163,6 +163,12 @@
         }
     }
 
+    .removeGroup{
+        button{
+            margin: 1px;
+        }
+    }
+
 }
 
 #modal .find-sealed {

src/UI/Store/BoardFindInterface.ts

@@ -109,6 +109,7 @@ export enum EFindType
     ModifyHardware = 8,
     FindMinSize = 9,
     GetHardWareOption = 10,
+    RemoveSplitSize = 11, //去除拆单尺寸
 }
 
 export enum ECompareType