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

Write Preview
Loading…
Cancel
Save