!1866 优化:拆单输入值判断

pull/1865/MERGE
黄诗津 3 years ago committed by ChenX
parent 9b7b170918
commit 544f30c52e

@ -40,7 +40,7 @@ export function AddCommonBoardProps(Com: React.ComponentType<ICommonOptionProps>
{
static displayName = 'BoardOption';
public _ConfigOption: SingleBoardOption = observable({
name: "", type: 0, rotateX: 0, rotateY: 0, rotateZ: 0, drawNumber: 1
name: "", type: 0, rotateX: 0, rotateY: 0, rotateZ: 0
});
public _ProcessOption: BoardProcessOption = observable({
...DefaultBoardProcessOption
@ -64,7 +64,7 @@ export function AddCommonBoardProps(Com: React.ComponentType<ICommonOptionProps>
public remarks: [string, string][] = observable(Array.from({ length: 12 }, () => ["", ""]) as [string, string][]);
public otherBoardData = observable({ isChaiDan: true });
public _UIConfigOPtion: IUiOption<SingleBoardOption> = observable({
name: "", type: "0", rotateX: "0", rotateY: "0", rotateZ: "0", drawNumber: "1"
name: "", type: "0", rotateX: "0", rotateY: "0", rotateZ: "0"
});
constructor(props)
{
@ -192,10 +192,10 @@ export function AddCommonBoardProps(Com: React.ComponentType<ICommonOptionProps>
return;
}
const [H, W, T] = [this._ConfigOption.height, this._ConfigOption.width, this._ConfigOption.height];
if (safeEval(this._ProcessOption.spliteHeight, { H, W, T }) <= 1 ||
safeEval(this._ProcessOption.spliteWidth, { H, W, T }) <= 1 ||
safeEval(this._ProcessOption.spliteThickness, { H, W, T }) <= 1)
const [L, W, H] = [this._ConfigOption.height, this._ConfigOption.width, this._ConfigOption.thickness];
if (safeEval(this._ProcessOption.spliteHeight, { L, W, H }, 'L') <= 1 ||
safeEval(this._ProcessOption.spliteWidth, { L, W, H }, "W") <= 1 ||
safeEval(this._ProcessOption.spliteThickness, { L, W, H }, "H") <= 1)
{
AppToaster.show({
message: "拆单尺寸错误!值不能小等于1",

@ -341,7 +341,7 @@ export interface SingleBoardOption extends BoardConfigOption
rotateX: number;
rotateY: number;
rotateZ: number;
drawNumber: number;
drawNumber?: number;
}
export enum StripType

Loading…
Cancel
Save