Public
/
WebCAD
mirror of https://gitee.com/cf-fz/WebCAD.git
7
1
Fork 0
Code Issues Projects Releases Wiki Activity

!527 #I131CL 优化正酒格UI行为

Browse Source
pull/527/MERGE
ZoeLeeFZ 5 years ago committed by ChenX
parent fabf40262e
commit 3fb5294417
1 changed files with 91 additions and 82 deletions
Show Stats Download Patch File Download Diff File

173
src/UI/Components/Board/WineRack.tsx
Unescape View File

@ -71,7 +71,7 @@ export class WineRackModal extends React.Component<{ store?: WineRackStore }, {}
} }
if (isByCountArray) if (isByCountArray)
{ {
return !m_Option.isLock && fullByWidth; return m_Option.type !== EWineRackType.Upright && (!m_Option.isLock && fullByWidth);
} }
return false; return false;
case "widthCount": case "widthCount":
@ -248,6 +248,8 @@ export class WineRackModal extends React.Component<{ store?: WineRackStore }, {}
onChange={(e) => onChange={(e) =>
{ {
store.m_Option.type = parseInt(e.currentTarget.value); store.m_Option.type = parseInt(e.currentTarget.value);
if (store.m_Option.type === EWineRackType.Upright && store.m_Option.arrayType === EWRackArrayType.Fixed)
store.m_Option.arrayType = EWRackArrayType.ByWidth;
}} }}
> >
<Radio label="斜酒格" value={EWineRackType.Oblique} /> <Radio label="斜酒格" value={EWineRackType.Oblique} />
@ -263,88 +265,95 @@ export class WineRackModal extends React.Component<{ store?: WineRackStore }, {}
> >
<Radio label="选取空间,按格子宽" value={EWRackArrayType.ByWidth} /> <Radio label="选取空间,按格子宽" value={EWRackArrayType.ByWidth} />
<Radio label="选取空间,按个数" value={EWRackArrayType.ByCount} /> <Radio label="选取空间,按个数" value={EWRackArrayType.ByCount} />
<Radio label="个数固定,格子宽固定" value={EWRackArrayType.Fixed} /> {
store.m_Option.type === EWineRackType.Oblique && <Radio label="个数固定,格子宽固定" value={EWRackArrayType.Fixed} />
}
</RadioGroup> </RadioGroup>
<H5>铺满方式</H5> {
<div className="flex full-type"> store.m_Option.type === EWineRackType.Oblique &&
<RadioGroup <>
selectedValue={store.m_Option.fullType} <H5>铺满方式</H5>
disabled={m_Option.arrayType === EWRackArrayType.Fixed || m_Option.type === EWineRackType.Upright} <div className="flex full-type">
onChange={(e) => <RadioGroup
{ selectedValue={store.m_Option.fullType}
store.m_Option.fullType = parseInt(e.currentTarget.value); disabled={m_Option.arrayType === EWRackArrayType.Fixed || m_Option.type === EWineRackType.Upright}
}} onChange={(e) =>
> {
<Radio label="宽度优先" value={EFullType.ByWidth} /> store.m_Option.fullType = parseInt(e.currentTarget.value);
<Radio label="高度优先" value={EFullType.ByHeight} /> }}
<Radio label="全对称" value={EFullType.Symmetry} disabled={m_Option.arrayType === EWRackArrayType.ByCount} /> >
</RadioGroup> <Radio label="宽度优先" value={EFullType.ByWidth} />
<div> <Radio label="高度优先" value={EFullType.ByHeight} />
<RadioGroup <Radio label="全对称" value={EFullType.Symmetry} disabled={m_Option.arrayType === EWRackArrayType.ByCount} />
selectedValue={store.m_Option.fullDir} </RadioGroup>
disabled={ <div>
(m_Option.type === EWineRackType.Upright <RadioGroup
&& m_Option.arrayType !== EWRackArrayType.Fixed) selectedValue={store.m_Option.fullDir}
|| disabled={
( (m_Option.type === EWineRackType.Upright
m_Option.fullType !== EFullType.ByHeight && m_Option.arrayType !== EWRackArrayType.Fixed)
&& m_Option.arrayType !== EWRackArrayType.Fixed ||
)} (
onChange={(e) => m_Option.fullType !== EFullType.ByHeight
{ && m_Option.arrayType !== EWRackArrayType.Fixed
store.m_Option.fullDir = parseInt(e.currentTarget.value); )}
}} onChange={(e) =>
> {
<Radio label="靠左" value={EFullDir.Left} /> store.m_Option.fullDir = parseInt(e.currentTarget.value);
<Radio label="靠右" value={EFullDir.Right} /> }}
</RadioGroup> >
<Checkbox <Radio label="靠左" value={EFullDir.Left} />
checked={m_Option.isFull} <Radio label="靠右" value={EFullDir.Right} />
disabled={m_Option.arrayType === EWRackArrayType.ByCount </RadioGroup>
|| m_Option.arrayType === EWRackArrayType.Fixed <Checkbox
|| m_Option.type === EWineRackType.Upright} checked={m_Option.isFull}
label="布满" onChange={() => disabled={m_Option.arrayType === EWRackArrayType.ByCount
{ || m_Option.arrayType === EWRackArrayType.Fixed
m_Option.isFull = !m_Option.isFull; || m_Option.type === EWineRackType.Upright}
}} /> label="布满" onChange={() =>
</div> {
</div> m_Option.isFull = !m_Option.isFull;
<H5>补板</H5> }} />
<SetBoardDataItem </div>
type={CheckObjectType.WR} </div>
optKey="brThick2" <H5>补板</H5>
option={m_Option} <SetBoardDataItem
uiOption={UIOption} type={CheckObjectType.WR}
title="补板厚" optKey="brThick2"
/> option={m_Option}
<div> uiOption={UIOption}
<Checkbox title="补板厚"
checked={m_Option.isDrawLy} />
label="层板" <div>
inline={true} <Checkbox
disabled={ checked={m_Option.isDrawLy}
m_Option.arrayType !== EWRackArrayType.Fixed && label="层板"
(m_Option.type === EWineRackType.Upright || inline={true}
m_Option.fullType !== EFullType.ByWidth) disabled={
} m_Option.arrayType !== EWRackArrayType.Fixed &&
onChange={() => (m_Option.type === EWineRackType.Upright ||
{ m_Option.fullType !== EFullType.ByWidth)
m_Option.isDrawLy = !m_Option.isDrawLy; }
}} /> onChange={() =>
<Checkbox {
checked={m_Option.isDrawVer} m_Option.isDrawLy = !m_Option.isDrawLy;
inline={true} }} />
label="立板" <Checkbox
disabled={ checked={m_Option.isDrawVer}
m_Option.arrayType !== EWRackArrayType.Fixed && inline={true}
(m_Option.type === EWineRackType.Upright || label="立板"
m_Option.fullType !== EFullType.ByHeight) disabled={
} m_Option.arrayType !== EWRackArrayType.Fixed &&
onChange={() => (m_Option.type === EWineRackType.Upright ||
{ m_Option.fullType !== EFullType.ByHeight)
m_Option.isDrawVer = !m_Option.isDrawVer; }
}} /> onChange={() =>
</div> {
m_Option.isDrawVer = !m_Option.isDrawVer;
}} />
</div>
</>
}
</div> </div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save