!2074 优化: 二维转三维房名位置移动到柜名那边 #535

src/Add-on/twoD2threeD/Modals/Rec2Br.less

@@ -60,6 +60,34 @@
         position: fixed;
         transform: translate(-55%, 10%);
     }
+
+    .roomName{
+        display: flex;
+
+        .roomNameBody{
+            width: 196px;
+        }
+
+        .inputGroup{
+            width: 110px;
+    
+            input{
+                width        : 100px;
+                margin-right : 10px;
+            }
+        }
+
+        button{
+            width : 30px;
+            height: 47px;
+        }
+    }
+
+    .multiBackBr{
+        .bp3-control.bp3-inline{
+            margin-right: 25px;
+        }
+    }
 }
 
 /* 备注信息 */

src/Add-on/twoD2threeD/Modals/Rec2Br.tsx

@@ -85,6 +85,8 @@ export class Rec2BrModal extends React.Component<{ store: Rec2BrStore; }, {}>
                     const data = (enRes1.Entity as Board).BoardProcessOption;
                     this.props.store.m_Option.roomName = data[EBoardKeyList.RoomName];
                     this.props.store.UIOption.roomName = data[EBoardKeyList.RoomName];
+                    this.props.store.m_Option.cabinetName = data[EBoardKeyList.CabinetName];
+                    this.props.store.UIOption.cabinetName = data[EBoardKeyList.CabinetName];
                 }
                 break;
             case GetOptionState.GetDistance:
@@ -139,7 +141,7 @@ export class Rec2BrModal extends React.Component<{ store: Rec2BrStore; }, {}>
                             <div className={Classes.DIALOG_BODY + " rec2br"} >
                                 <div style={{ display: "flex" }}>
                                     <R2BConfigComponent store={store} getOption={this.getOption} />
-                                    <ParseBoardName store={store} />
+                                    <ParseBoardName store={store} getOption={this.getOption} />
                                     <R2BProcessComponent store={store} getOption={this.getOption} />
                                 </div>
                             </div>

src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx

@@ -1,8 +1,9 @@
-import { Button, Card, Checkbox, H5, Intent, Radio, RadioGroup, Tooltip } from "@blueprintjs/core";
+import { Button, Card, Checkbox, Classes, H5, Intent, Radio, RadioGroup, Tooltip } from "@blueprintjs/core";
 import { observer } from 'mobx-react';
 import React, { Component } from 'react';
 import * as xaop from 'xaop';
 import { app } from '../../ApplicationServices/Application';
+import { EBoardKeyList } from "../../Common/BoardKeyList";
 import { CheckObjectType } from "../../Common/CheckoutVaildValue";
 import { CommandNames } from "../../Common/CommandNames";
 import { KeyBoard } from "../../Common/KeyEnum";
@@ -13,6 +14,7 @@ import { CommonModal } from '../../UI/Components/Modal/ModalContainer';
 import { AppToaster, ToasterInput } from "../../UI/Components/Toaster";
 import { IUiOption } from '../../UI/Store/BoardInterface';
 import { ParseBoardNameStore } from './ParseBoardNameStore';
+import { GetOptionState } from "./R2bConfigComponent";
 import { IParseBoardNameOption } from './R2bInterface';
 import { Rec2BrStore } from './Rec2BrStore';
 
@@ -22,6 +24,7 @@ interface IParseBoardProps
         m_Option: IParseBoardNameOption;
         UIOption: IUiOption<IParseBoardNameOption>;
     };
+    getOption?: (state: GetOptionState) => void;
 }
 
 @observer
@@ -167,10 +170,8 @@ export class ParseBoardName extends Component<IParseBoardProps>
                                 inline={true}
                             />
                         </div>
-                        <div>
+                        <div className="multiBackBr">
-                            <div>
+                            <H5>根据背板区分柜体</H5>
-                                根据背板区分柜体
-                            </div>
                             <Tooltip content="多背板=单个柜子(名称)  单背板=多个柜子">
                                 <RadioGroup
                                     inline
@@ -186,23 +187,60 @@ export class ParseBoardName extends Component<IParseBoardProps>
                                 </RadioGroup>
                             </Tooltip>
                         </div>
-                        <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
+                        <div className="roomName">
-                            <Checkbox
+                            <div className="roomNameBody">
-                                checked={store.m_Option.iscabinetName}
-                                label={"修改柜名"}
-                                onChange={() =>
                                 {
-                                    store.m_Option.iscabinetName = !store.m_Option.iscabinetName;
+                                    isR2B && <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
-                                    store.UIOption.iscabinetName = store.m_Option.iscabinetName;
+                                        <Checkbox
-                                }}
+                                            checked={store.m_Option.isModifyRoomName}
-                            />
+                                            label={"房间名"}
-                            <ToasterInput
+                                            onChange={() =>
-                                type={CheckObjectType.R2B}
+                                            {
-                                optKey="cabinetName"
+                                                store.m_Option.isModifyRoomName = !store.m_Option.isModifyRoomName;
-                                option={store.m_Option}
+                                                store.UIOption.isModifyRoomName = store.m_Option.isModifyRoomName;
-                                uiOption={store.UIOption}
+                                            }}
-                                inline={true}
+                                        />
-                            />
+                                        <div className="inputGroup">
+                                            <ToasterInput
+                                                type={CheckObjectType.R2B}
+                                                optKey={EBoardKeyList.RoomName}
+                                                option={store.m_Option}
+                                                uiOption={store.UIOption}
+                                                inline={true}
+                                            />
+
+                                        </div>
+                                    </div>
+                                }
+                                <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
+                                    <Checkbox
+                                        checked={store.m_Option.iscabinetName}
+                                        label={"柜名"}
+                                        onChange={() =>
+                                        {
+                                            store.m_Option.iscabinetName = !store.m_Option.iscabinetName;
+                                            store.UIOption.iscabinetName = store.m_Option.iscabinetName;
+                                        }}
+                                    />
+                                    <div className="inputGroup">
+                                        <ToasterInput
+                                            type={CheckObjectType.R2B}
+                                            optKey="cabinetName"
+                                            option={store.m_Option}
+                                            uiOption={store.UIOption}
+                                            inline={true}
+                                        />
+                                    </div>
+                                </div>
+                            </div>
+                            {
+                                isR2B && <Button
+                                    className={Classes.INTENT_SUCCESS}
+                                    text="拾取"
+                                    onClick={() => this.props.getOption(GetOptionState.GetBoard)}
+
+                                />
+                            }
                         </div>
                         <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
                             <Checkbox

src/Add-on/twoD2threeD/ParseBoardNameStore.ts

@@ -30,12 +30,20 @@ export class ParseBoardNameStore extends BoardStore<IParseBoardNameOption>
     @action
     UpdateOption(cof: IConfigOption<IParseBoardNameOption>)
     {
-        if (!cof.option.version)
+        let ver = cof.option.version;
+        if (!ver)
         {
             cof.option.version = 1;
             cof.option.isBack = true;
             cof.option.backName = "背板";
         }
+
+        if (ver < 2)
+        {
+            cof.option.version = 2;
+            cof.option.isModifyRoomName = true;
+        }
+
         Object.assign(this.m_Option, cof.option);
         if (this.m_UiOption)
             Object.assign(this.m_UiOption, DataAdapter.ConvertUIData(cof.option));

src/Add-on/twoD2threeD/Polyline2Board.ts

@@ -233,7 +233,8 @@ export class Polyline2Board implements Command
                 b.BoardProcessOption.color = storeOption.color;
                 b.BoardProcessOption.boardName = storeOption.boardMatName;
 
-                b.BoardProcessOption.roomName = storeOption.roomName;
+                if (storeOption.isModifyRoomName)
+                    b.BoardProcessOption.roomName = storeOption.roomName;
                 b.BoardProcessOption.drillType = storeOption.drillType;
                 b.BoardProcessOption.highDrill.fill(storeOption.drillType);
                 b.BoardProcessOption.sealedUp = storeOption.sealedUp;
@@ -670,7 +671,8 @@ export class Polyline2Board implements Command
                     backBoards[i].BoardProcessOption.material = storeOption.material;
                     backBoards[i].BoardProcessOption.color = storeOption.color;
                     backBoards[i].BoardProcessOption.boardName = storeOption.boardMatName;
-                    backBoards[i].BoardProcessOption.roomName = storeOption.roomName;
+                    if (storeOption.isModifyRoomName)
+                        backBoards[i].BoardProcessOption.roomName = storeOption.roomName;
                 }
             }
         }

src/Add-on/twoD2threeD/R2BProcessComponent.tsx

@@ -4,7 +4,7 @@ import { observer } from 'mobx-react';
 import * as React from 'react';
 import { CheckObjectType } from "../../Common/CheckoutVaildValue";
 import { userConfig } from '../../Editor/UserConfig';
-import { Input5Or4Component, Notes, SetBoardDataBlock, SetBoardDataItem } from "../../UI/Components/Board/BoardCommon";
+import { Input5Or4Component, Notes, SetBoardDataBlock } from "../../UI/Components/Board/BoardCommon";
 import { GoodsList, IGoodInfo } from '../../UI/MaterialEditor/GoodsList';
 import { SelectBrConfigName } from './R2BCommon';
 import { GetOptionState } from './R2bConfigComponent';
@@ -32,29 +32,6 @@ export class R2BProcessComponent extends React.Component<IR2BProcessComponentPro
             <Card>
                 <H5>材料信息</H5>
                 <div>
-
-                    <div className="flex br-mat">
-                        <div>
-                            <SetBoardDataItem
-                                titleStyle={{ width: "3.5rem" }}
-                                type={CheckObjectType.R2B}
-                                optKey="roomName"
-                                option={store.m_Option}
-                                title="房间名"
-                                placeHolder="输入房间名"
-                            />
-                        </div>
-                        <button
-                            style={{
-                                minHeight: 18,
-                                height: 18,
-                                padding: 0,
-                                fontSize: 8
-                            }}
-                            className="bp3-button bp3-intent-success"
-                            onClick={() => this.props.getOption(GetOptionState.GetBoard)}
-                        >拾取</button>
-                    </div>
                     <div className="flex br-mat">
                         <SetBoardDataBlock
                             type={CheckObjectType.R2B}

src/Add-on/twoD2threeD/R2bInterface.ts

@@ -26,6 +26,7 @@ export interface IParseBoardNameOption extends IBaseOption
     isbottomMostBackBrName: boolean;
     isstripeBrName: boolean;
     iscabinetName: boolean;//修改柜名
+    isModifyRoomName: boolean;//修改房名
     isMultiBackBr: boolean;//是否多背板柜子
     isBack: boolean;
     backName: string;

src/Add-on/twoD2threeD/Rec2BrStore.ts

@@ -102,6 +102,11 @@ export class Rec2BrStore extends BoardStore<IRec2BrOption>
             cof.option.version = 5;
             cof.option.closeStripThickness = cof.option.cabinetBrThick;
         }
+        if (cof.option.version < 6)
+        {
+            cof.option.version = 6;
+            cof.option.isModifyRoomName = true;
+        }
 
         delete cof.option.grooveOption;
         Object.assign(this.m_Option, cof.option);

src/Editor/DefaultConfig.ts

@@ -738,7 +738,7 @@ Object.freeze(DefaultKuGanOption);
 
 
 export const DefaultParseBoardNameOPtion: IParseBoardNameOption = {
-    version: 1,
+    version: 2,
     verticalBrShrink: 0,
     layerBrShrink: 0,
     topBrShrink: 0,
@@ -758,6 +758,7 @@ export const DefaultParseBoardNameOPtion: IParseBoardNameOption = {
     isbottomMostBackBrName: true,
     isstripeBrName: true,
     iscabinetName: false,//修改柜名
+    isModifyRoomName: true,//修改房名
     isMultiBackBr: false,
     isBack: true,
     backName: "背板",
@@ -766,7 +767,7 @@ export const DefaultParseBoardNameOPtion: IParseBoardNameOption = {
 Object.freeze(DefaultParseBoardNameOPtion);
 
 export const DefaultR2bOption: IRec2BrOption = {
-    version: 5,
+    version: 6,
     cabinetDeep: 400,
     cabinetBrThick: 18,
     cabinetCurtail: 0,