From 3fb529441703b1aa7387d8da0dfcd0fe66fdb29b Mon Sep 17 00:00:00 2001
From: ZoeLeeFZ <lizhou1021@qq.com>
Date: Fri, 11 Oct 2019 08:58:17 +0800
Subject: [PATCH] =?UTF-8?q?!527=20#I131CL=20=E4=BC=98=E5=8C=96=E6=AD=A3?=
 =?UTF-8?q?=E9=85=92=E6=A0=BCUI=E8=A1=8C=E4=B8=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UI/Components/Board/WineRack.tsx | 173 ++++++++++++++-------------
 1 file changed, 91 insertions(+), 82 deletions(-)

diff --git a/src/UI/Components/Board/WineRack.tsx b/src/UI/Components/Board/WineRack.tsx
index 6fe59592d..78f01b4c5 100644
--- a/src/UI/Components/Board/WineRack.tsx
+++ b/src/UI/Components/Board/WineRack.tsx
@@ -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>