diff --git a/src/Add-on/BoardCutting/ReferenceCuttingModal.tsx b/src/Add-on/BoardCutting/ReferenceCuttingModal.tsx index 01c28a431..2f6cf3a42 100644 --- a/src/Add-on/BoardCutting/ReferenceCuttingModal.tsx +++ b/src/Add-on/BoardCutting/ReferenceCuttingModal.tsx @@ -1,5 +1,5 @@ import React = require("react"); -import { Button, Classes, Radio, RadioGroup } from "@blueprintjs/core"; +import { Button, Classes, Radio, RadioGroup, Intent } from "@blueprintjs/core"; import { observable } from "mobx"; import { inject, observer } from "mobx-react"; import { begin } from "xaop"; @@ -170,7 +170,7 @@ export class ReferenceCuttingModal extends React.Component<{ store: ReferenceCut onClick={() => { if (store.HasInvailValue()) - AppToaster.show({ message: "存在无效数值,请修正", timeout: 1000 }); + AppToaster.show({ message: "存在无效数值,请修正", timeout: 2000, intent: Intent.DANGER }); else store.OnOk(); }} diff --git a/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts b/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts index 45b233bb5..09fc43b56 100644 --- a/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts +++ b/src/Add-on/DrawBoard/DrawSpecialShapedBoard.ts @@ -36,6 +36,7 @@ export class DrawSpecialShapedBoard implements Command br.BoardType = store.m_Option.type; br.ApplyMatrix(br.OCSInv); br.Thickness = store.m_Option.thickness; + br.BoardProcessOption = store.BoardProcessOption; if (store.m_Option.type === BoardType.Layer) { //基点修改 diff --git a/src/Common/CheckoutVaildValue.ts b/src/Common/CheckoutVaildValue.ts index 6cca60cd6..73b3c3eb7 100644 --- a/src/Common/CheckoutVaildValue.ts +++ b/src/Common/CheckoutVaildValue.ts @@ -166,6 +166,7 @@ export namespace CheckoutValid case "grooveAddLength": case "grooveAddDepth": case "grooveAddWidth": + case "back": if (isNaN(val)) return "数值不能为空且必须为数字"; default: @@ -191,8 +192,11 @@ export namespace CheckoutValid case "pxlOffset": case "collsionDist": case "tHoleOffset": + case "notGangDist": if (v === "") return "不能为空"; + if (!(isNum(v))) + return "数值不能为空且必须为数字"; return ""; case "count": case "pxlRad": diff --git a/src/UI/Components/Board/GangDrillModal.tsx b/src/UI/Components/Board/GangDrillModal.tsx index 0d057b9ef..6c61eb387 100644 --- a/src/UI/Components/Board/GangDrillModal.tsx +++ b/src/UI/Components/Board/GangDrillModal.tsx @@ -311,16 +311,15 @@ export class DrillModal extends React.Component<{ store?: DrillStore; }, {}> {
其他
-
+
当板厚小于 - - { - store.UIOption["notGangDist"] = e.target.value; - store.m_Option.notGangDist = safeEval(e.target.value); - }} /> + 不排钻