!206 修复背板绘制数据错误bug

Merge pull request !206 from ZoeLeeFZ/fixbbr
pull/206/MERGE
ChenX 6 years ago
parent e16e89b8f4
commit 96ef01c107

@ -15,7 +15,6 @@ export class BehindBoardModal extends React.Component<{ store?: BehindBoardStore
["grooveAddLength", "槽加长"], ["grooveAddWidth", "槽加宽"], ["grooveAddDepth", "槽加深"]
];
@observable private moveDir = "移动";
private uiOption: Object;
componentWillMount()
{
let store = this.props.store;
@ -25,7 +24,6 @@ export class BehindBoardModal extends React.Component<{ store?: BehindBoardStore
this.moveDir = "上移";
else if (pos === BehindHeightPositon.ForBottom)
this.moveDir = "下移";
this.uiOption = store.UIOption;
}
render()
{
@ -50,7 +48,7 @@ export class BehindBoardModal extends React.Component<{ store?: BehindBoardStore
{
let value = e.currentTarget.value as BehindHeightPositon
store.m_Option.boardPosition = value;
this.uiOption["boardPosition"] = value;
store.UIOption["boardPosition"] = value;
if (value === BehindHeightPositon.ForTop)
{
@ -61,10 +59,10 @@ export class BehindBoardModal extends React.Component<{ store?: BehindBoardStore
this.moveDir = "下移";
}
else
this.uiOption["calcHeight"] = "H";
store.UIOption["calcHeight"] = "H";
}}
selectedValue={this.uiOption["boardPosition"]}
selectedValue={store.UIOption["boardPosition"]}
>
<Radio label="总高" value={BehindHeightPositon.AllHeight} />
<Radio label="靠上" value={BehindHeightPositon.ForTop} />
@ -75,22 +73,22 @@ export class BehindBoardModal extends React.Component<{ store?: BehindBoardStore
type={CheckObjectType.BR}
optKey="calcHeight"
option={store.m_Option}
uiOption={this.uiOption}
uiOption={store.UIOption}
title="板高"
isDisabled={this.uiOption["boardPosition"] === BehindHeightPositon.AllHeight}
isDisabled={store.UIOption["boardPosition"] === BehindHeightPositon.AllHeight}
/>
<SetBoardDataItem
type={CheckObjectType.BR}
optKey="moveDist"
option={store.m_Option}
uiOption={this.uiOption}
uiOption={store.UIOption}
title={this.moveDir}
isDisabled={this.uiOption["boardPosition"] === BehindHeightPositon.AllHeight}
isDisabled={store.UIOption["boardPosition"] === BehindHeightPositon.AllHeight}
/>
</div>
</div>
<BoardRePosBlock
uiOption={this.uiOption}
uiOption={store.UIOption}
option={store.m_Option}
posPars={new Map([[BrRelativePos.Front, "靠前"], [BrRelativePos.Back, "靠后"]])}
/>
@ -102,6 +100,7 @@ export class BehindBoardModal extends React.Component<{ store?: BehindBoardStore
title="上延伸"
optKey="topExt"
option={store.m_Option}
uiOption={store.UIOption}
inline={true}
/>
<div>
@ -110,6 +109,7 @@ export class BehindBoardModal extends React.Component<{ store?: BehindBoardStore
title="左延伸"
optKey="leftExt"
option={store.m_Option}
uiOption={store.UIOption}
inline={true} />
<BoardModel />
<SetBoardDataItem
@ -117,6 +117,7 @@ export class BehindBoardModal extends React.Component<{ store?: BehindBoardStore
title="右延伸"
optKey="rightExt"
option={store.m_Option}
uiOption={store.UIOption}
inline={true} />
</div>
<SetBoardDataItem
@ -124,6 +125,7 @@ export class BehindBoardModal extends React.Component<{ store?: BehindBoardStore
title="下延伸"
optKey="bottomExt"
option={store.m_Option}
uiOption={store.UIOption}
inline={true} />
</div>
</div>

Loading…
Cancel
Save