!699 优化排钻框校验

pull/699/MERGE
ZoeLeeFZ 5 years ago committed by ChenX
parent b92ac5c580
commit 8ada6313ff

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

@ -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)
{
//基点修改

@ -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":

@ -311,16 +311,15 @@ export class DrillModal extends React.Component<{ store?: DrillStore; }, {}> {
</div>
<h5 className={Classes.HEADING}></h5>
<div className="small-input flexWrap flex-col">
<div>
<div className="br-set">
<span></span>
<input
className="bp3-input"
value={store.UIOption["notGangDist"]}
onChange={e =>
{
store.UIOption["notGangDist"] = e.target.value;
store.m_Option.notGangDist = safeEval(e.target.value);
}} />
<ToasterInput
type={CheckObjectType.DR}
optKey="notGangDist"
option={store.m_Option}
uiOption={store.UIOption}
inline={true}
/>
<span></span>
</div>
<Checkbox

Loading…
Cancel
Save