!909 优化:拆单尺寸支持表达式

* fixes #I1DPSJ
pull/909/MERGE
ZoeLeeFZ 5 years ago committed by ChenX
parent 7b05034524
commit eb06db6e51

@ -122,9 +122,9 @@ export namespace CheckoutValid
case "spliteHeight":
case "spliteWidth":
case "spliteThickness":
if (v !== "" && isNaN(val))
if (v !== "" && isNaN(safeEval(v, { L: 1, H: 1, W: 1 })))
{
return "必须为数字";
return "表达式错误";
}
return "";
case "height":

@ -174,9 +174,10 @@ export namespace Production
export function GetBoardInfo(br: Board, size: Vector3): IBoardProdInfo
{
let data = br.BoardProcessOption;
let spliteHeight = safeEval(data.spliteHeight);
let spliteWidth = safeEval(data.spliteWidth);
let spliteThickness = safeEval(data.spliteThickness);
let param = { L: br.Height, W: br.Width, H: br.Thickness };
let spliteHeight = safeEval(data.spliteHeight, param);
let spliteWidth = safeEval(data.spliteWidth, param);
let spliteThickness = safeEval(data.spliteThickness, param);
let isRect = (!isNaN(spliteHeight) && !isNaN(spliteWidth) && !isNaN(spliteThickness)) || !br.IsSpecialShape;
return {
@ -432,9 +433,10 @@ export namespace Production
}
export function GetSpliteOutlineBySpliteSize(br: Board)
{
let spliteHeight = safeEval(br.BoardProcessOption.spliteHeight);
let spliteWidth = safeEval(br.BoardProcessOption.spliteWidth);
let spliteThickness = safeEval(br.BoardProcessOption.spliteThickness);
let param = { L: br.Height, W: br.Width, H: br.Thickness };
let spliteHeight = safeEval(br.BoardProcessOption.spliteHeight, param);
let spliteWidth = safeEval(br.BoardProcessOption.spliteWidth, param);
let spliteThickness = safeEval(br.BoardProcessOption.spliteThickness, param);
if (spliteHeight && spliteWidth && spliteThickness)
{

Loading…
Cancel
Save