修正数值校验

pull/457/MERGE
ChenX 5 years ago
parent a83ab45dfd
commit c8f970b946

@ -118,7 +118,7 @@ export namespace CheckoutValid
case "sealedLeft": case "sealedLeft":
case "sealedRight": case "sealedRight":
if (!(safeEval(v) >= 0)) if (!(safeEval(v) >= 0))
return "数值必须大于0"; return "数值必须大于等于0";
return ""; return "";
case "height": case "height":
case "width": case "width":
@ -126,7 +126,7 @@ export namespace CheckoutValid
case "divCount": case "divCount":
case "thickness": case "thickness":
case "footThickness": case "footThickness":
if (!(safeEval(v) >= 0)) if (!(safeEval(v) > 0))
return "数值必须大于0"; return "数值必须大于0";
default: default:
if (!isNum(v)) if (!isNum(v))
@ -164,12 +164,12 @@ export namespace CheckoutValid
case "wdepth": case "wdepth":
case "originDist": case "originDist":
case "retDist": case "retDist":
if (!(safeEval(v) > 0)) // if (!(safeEval(v) > 0))
return "数值必须大于0"; // return "数值必须大于0";
default: default:
if (!(isNum(v))) if (!(isNum(v)))
return "数值不能为空且必须为数字"; return "数值不能为空且必须为数字";
else if (safeEval(v) < 0) else if (!(safeEval(v) > 0))
return "数值必须大于0"; return "数值必须大于0";
} }
return ""; return "";
@ -299,7 +299,7 @@ export namespace CheckoutValid
case "boardThick": case "boardThick":
case "brThick2": case "brThick2":
case "gripWidth": case "gripWidth":
if (!isNaN(safeEval(v)) && safeEval(v) <= 0) if (!(safeEval(v) > 0))
return "数值必须大于0"; return "数值必须大于0";
default: default:
if (!isNum(v)) if (!isNum(v))

Loading…
Cancel
Save