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

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,8 +265,13 @@ 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>
+                                {
+                                    store.m_Option.type === EWineRackType.Oblique &&
+                                    <>
                                         <H5>铺满方式</H5>
                                         <div className="flex full-type">
                                             <RadioGroup
@@ -345,6 +352,8 @@ export class WineRackModal extends React.Component<{ store?: WineRackStore }, {}
                                                     m_Option.isDrawVer = !m_Option.isDrawVer;
                                                 }} />
                                         </div>
+                                    </>
+                                }
                             </div>
                         </div>
                     </div>