!1454 功能:根据板件名称改属性,增加<是否拆单>属性

pull/1454/MERGE
ZoeLeeFZ 4 years ago committed by ChenX
parent 3bb82178b1
commit 264f79e3b5

@ -147,6 +147,9 @@ export class UpdateBoardInfos implements Command
SetRectHighDrill(br, drillOption); SetRectHighDrill(br, drillOption);
} }
break; break;
case "isChaiDan":
br.IsChaiDan = option.isChaiDan;
break;
default: default:
break; break;
} }

@ -543,6 +543,7 @@ export const DefaultCurve2RecOption: Curve2RecOption = {
Object.freeze(DefaultCurve2RecOption); Object.freeze(DefaultCurve2RecOption);
export const DefaultUpdateInfoOption: IUpdateBoardInfosOption = { export const DefaultUpdateInfoOption: IUpdateBoardInfosOption = {
version: 1,
[EBoardKeyList.RoomName]: "", [EBoardKeyList.RoomName]: "",
[EBoardKeyList.CabinetName]: "", [EBoardKeyList.CabinetName]: "",
[EBoardKeyList.Lines]: LinesType.Positive, [EBoardKeyList.Lines]: LinesType.Positive,
@ -563,6 +564,7 @@ export const DefaultUpdateInfoOption: IUpdateBoardInfosOption = {
grooveAddLength: "0", grooveAddLength: "0",
grooveAddWidth: "0", grooveAddWidth: "0",
highDrill: [], highDrill: [],
isChaiDan: true,
condition: { condition: {
[EBoardKeyList.RoomName]: false, [EBoardKeyList.RoomName]: false,
[EBoardKeyList.CabinetName]: false, [EBoardKeyList.CabinetName]: false,
@ -585,6 +587,7 @@ export const DefaultUpdateInfoOption: IUpdateBoardInfosOption = {
downDrill: true, downDrill: true,
leftDrill: true, leftDrill: true,
rightDrill: true, rightDrill: true,
isChaiDan: true,
} }
}; };

@ -24,6 +24,7 @@ export interface IUpdateBoardInfosOption extends IBaseOption
grooveAddWidth: string; grooveAddWidth: string;
grooveAddDepth: string; grooveAddDepth: string;
highDrill: string[]; highDrill: string[];
isChaiDan: boolean;
} }
export interface IUpdateInfoCondition export interface IUpdateInfoCondition
@ -49,4 +50,5 @@ export interface IUpdateInfoCondition
downDrill: boolean; downDrill: boolean;
leftDrill: boolean; leftDrill: boolean;
rightDrill: boolean; rightDrill: boolean;
isChaiDan: boolean;
} }

@ -96,7 +96,6 @@ export class UpdateBoardInfoModal extends React.Component<IUpdateBoardInfoModalP
</Card> </Card>
<Card className="flex u-body"> <Card className="flex u-body">
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<H5></H5>
<div className="info-item"> <div className="info-item">
<Checkbox <Checkbox
label="柜名" label="柜名"
@ -203,6 +202,19 @@ export class UpdateBoardInfoModal extends React.Component<IUpdateBoardInfoModalP
/> />
</div> </div>
</div> </div>
<div>
<Checkbox
inline
checked={condition.isChaiDan}
label="是否拆单"
onChange={() => condition.isChaiDan = !condition.isChaiDan}
/>
<Checkbox
inline
checked={option.isChaiDan}
onChange={() => option.isChaiDan = !option.isChaiDan}
/>
</div>
<Checkbox <Checkbox
inline inline
checked={condition.remarks} checked={condition.remarks}
@ -308,6 +320,9 @@ export class UpdateBoardInfoModal extends React.Component<IUpdateBoardInfoModalP
case EBoardKeyList.DrillType: case EBoardKeyList.DrillType:
option.drillType = brOption.drillType; option.drillType = brOption.drillType;
break; break;
case "isChaiDan":
option.isChaiDan = br.IsChaiDan;
break;
default: default:
if (option.hasOwnProperty(key) && brOption.hasOwnProperty(key)) if (option.hasOwnProperty(key) && brOption.hasOwnProperty(key))
{ {

@ -96,7 +96,7 @@ export class UpdateBoardInfosStore extends BoardStore
return cof; return cof;
} }
@action @action
UpdateOption(cof: IConfigOption) UpdateOption(cof: IConfigOption<{ [key: string]: IUpdateBoardInfosOption; }>)
{ {
let option = cof.option; let option = cof.option;
this.nameOptionMap.clear(); this.nameOptionMap.clear();
@ -107,6 +107,12 @@ export class UpdateBoardInfosStore extends BoardStore
this.currentBoardName = name; this.currentBoardName = name;
if (option.hasOwnProperty(name)) if (option.hasOwnProperty(name))
{ {
if (!option[name].version)
{
option[name].version = 1;
option[name].isChaiDan = true;
option[name].condition.isChaiDan = true;
}
if (!option[name].highDrill || option[name].highDrill.length === 0) if (!option[name].highDrill || option[name].highDrill.length === 0)
option[name].highDrill = Array(4).fill(option[name].drillType); option[name].highDrill = Array(4).fill(option[name].drillType);
this.nameOptionMap.set(name, option[name]); this.nameOptionMap.set(name, option[name]);

Loading…
Cancel
Save