diff --git a/src/Add-on/BoardFindModify.ts b/src/Add-on/BoardFindModify.ts index 7b05c5743..28d312ef8 100644 --- a/src/Add-on/BoardFindModify.ts +++ b/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) diff --git a/src/UI/Components/Board/BoardFindModify.tsx b/src/UI/Components/Board/BoardFindModify.tsx index 8c6141a06..19eb00b80 100644 --- a/src/UI/Components/Board/BoardFindModify.tsx +++ b/src/UI/Components/Board/BoardFindModify.tsx @@ -614,36 +614,44 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar onChange={() => option.isClose = !option.isClose} /> -
-
+
+
diff --git a/src/UI/Components/Modal/ModalStyle/BoardFind.less b/src/UI/Components/Modal/ModalStyle/BoardFind.less index 68d407cc2..d6cd04090 100644 --- a/src/UI/Components/Modal/ModalStyle/BoardFind.less +++ b/src/UI/Components/Modal/ModalStyle/BoardFind.less @@ -163,6 +163,12 @@ } } + .removeGroup{ + button{ + margin: 1px; + } + } + } #modal .find-sealed { diff --git a/src/UI/Store/BoardFindInterface.ts b/src/UI/Store/BoardFindInterface.ts index 5b27c55f7..24a46c61a 100644 --- a/src/UI/Store/BoardFindInterface.ts +++ b/src/UI/Store/BoardFindInterface.ts @@ -109,6 +109,7 @@ export enum EFindType ModifyHardware = 8, FindMinSize = 9, GetHardWareOption = 10, + RemoveSplitSize = 11, //去除拆单尺寸 } export enum ECompareType