!2609 功能:收口条绘制功能，要求可以自定义板件名称。

src/Add-on/DrawBoard/DrawClosingStrip.ts

@@ -160,20 +160,18 @@ export class DrawClosingStrip implements Command
             }
             else
             {
-                br = Board.CreateBoard(width, size.x, thickness,
-                    BoardType.Behind);
+                br = Board.CreateBoard(width, size.x, thickness, BoardType.Behind);
                 br.BoardProcessOption = store.BoardProcessOption;
                 br.BoardProcessOption.lines = LinesType.Reverse;
                 pos.set(min.x, min.y + thickness + frontShrink, max.z);
                 if (opt.isDrawFuZhu)
                 {
-                    br2 = Board.CreateBoard(size.x, opt.fzWidth, opt.fzThickness,
-                        BoardType.Layer);
+                    br2 = Board.CreateBoard(size.x, opt.fzWidth, opt.fzThickness, BoardType.Layer);
                     br2.Position = new Vector3(max.x, min.y + frontShrink + thickness, max.z);
                     br2.Name = "上收口条";
                 }
             }
-            br.Name = "上收口条";
+            br.Name = store.m_Option.brName;
         }
         else
         {
@@ -190,6 +188,7 @@ export class DrawClosingStrip implements Command
 
             if (opt.boardRelative === BrRelativePos.Left)
             {
+                br.BoardProcessOption = store.BoardProcessOption;
                 if (opt.striptype === StripType.H)
                 {
                     pos.set(min.x - width, min.y + thickness + frontShrink, min.z);
@@ -203,10 +202,11 @@ export class DrawClosingStrip implements Command
                 {
                     pos.copy(min.clone().add(new Vector3(-thickness, frontShrink)));
                 }
-                br.Name = "左收口条";
+                br.Name = store.m_Option.brName;
             }
             else
             {
+                br.BoardProcessOption = store.BoardProcessOption;
                 if (opt.striptype === StripType.H)
                 {
                     pos.set(max.x, min.y + thickness + frontShrink, min.z);
@@ -220,7 +220,7 @@ export class DrawClosingStrip implements Command
                 {
                     pos.copy(min.clone().add(new Vector3(0, frontShrink))).setX(max.x);
                 }
-                br.Name = "右收口条";
+                br.Name = store.m_Option.brName;
             }
             br.BoardProcessOption = store.BoardProcessOption;
         }

src/Editor/DefaultConfig.ts

@@ -303,9 +303,9 @@ export const DefaultSingleBoardOption: SingleBoardOption = {
 Object.freeze(DefaultSingleBoardOption);
 
 export const DefaultClosingStripOption: ClosingStripOption = {
-    version: 3,
+    version: 4,
     type: BoardType.Vertical,
-    name: "收口条",
+    name: "收口条", //辅助条占用
     striptype: StripType.H,
     boardRelative: BrRelativePos.Left,
     width: 54,
@@ -314,7 +314,8 @@ export const DefaultClosingStripOption: ClosingStripOption = {
     isDrawFuZhu: true,
     fzWidth: 80,
     fzThickness: 18,
-    addSKTCabinetName: true
+    addSKTCabinetName: true,
+    brName: "左收口",
 };
 Object.freeze(DefaultClosingStripOption);
 
@@ -701,10 +702,11 @@ export const DefaultToplineMetalsOption: IToplineOption = {
 Object.freeze(DefaultToplineMetalsOption);
 
 export const DefaultBoardProcessOption: BoardProcessOption = {
-    version: 4,
+    version: 3,
     roomName: "",
     cabinetName: "",
     boardName: "",
+    brName: "",
     material: "",
     color: "",
     lines: LinesType.Positive,

src/UI/Components/Board/BoardModal.tsx

@@ -4,6 +4,7 @@ import * as React from 'react';
 import * as xaop from 'xaop';
 import { DrillType } from '../../../Add-on/DrawDrilling/DrillType';
 import { app } from '../../../ApplicationServices/Application';
+import { CheckObjectType } from '../../../Common/CheckoutVaildValue';
 import { KeyBoard } from '../../../Common/KeyEnum';
 import { userConfig } from '../../../Editor/UserConfig';
 import { BehindBoardStore, BoardStore, ClosingStripStore, LayerBoardStore, SideBoardStore, SingleBoardStore, TopBottomBoardStore, VerticalBoardStore } from '../../Store/BoardStore';
@@ -12,7 +13,7 @@ import { AnyObject } from "../../Store/OptionInterface/IOptionInterface";
 import { ModalState } from '../Modal/ModalInterface';
 import { CommonModal } from './../Modal/ModalContainer';
 import { BehindBoardModal } from './BehindBoardModal';
-import { AutoCutCheckbox, Notes } from './BoardCommon';
+import { AutoCutCheckbox, Notes, SetBoardDataItem } from './BoardCommon';
 import { BoardModalType } from './BoardModalType';
 import { BoardProcessModal } from './BoardProcessModal';
 import { ClosingStripModal } from './ClosingStripModal';
@@ -175,6 +176,18 @@ export class BoardModal extends React.Component<BoardModalProps, {}>
                                         }}
                                     />
                                 }
+                                {
+                                    this.props.type === BoardModalType.Skt &&
+                                    <div className='board-info'>
+                                        <SetBoardDataItem
+                                            type={CheckObjectType.BR}
+                                            optKey="brName"
+                                            option={store.m_Option}
+                                            title="板名"
+                                            placeHolder="输入板名"
+                                        />
+                                    </div>
+                                }
                                 <BoardProcessModal type={this.props.type} opt={store.m_BoardProcessOption} topBottomOption={(store as TopBottomBoardStore).bottomBoardOption} drillOption={store.rectDrillOption} uiOpt={store.UIBoardProcessOption} />
                             </div>
                             <div className={Classes.CARD}>

src/UI/Components/Board/BoardProcessModal.tsx

@@ -43,7 +43,8 @@ interface BoardProcessProps
     isEdgeRemarks?: boolean;
 }
 @observer
-export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
+export class BoardProcessModal extends React.Component<BoardProcessProps, {}>
+{
     private showShops = observable.box(false);
     private showAlert = observable.box(false);
     @observable private tags: string[] = [];
@@ -102,10 +103,12 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
             store.boardEdgeRemarksStore.isNotUpdateStore = false;
         }, 0);
     }
+
     private renderEl = () =>
     {
         const el =
-            <><SetBoardDataItem
+            <>
+                <SetBoardDataItem
                     type={CheckObjectType.BR}
                     optKey="roomName"
                     option={this.props.opt}

src/UI/Components/Board/ClosingStripModal.tsx

@@ -61,6 +61,7 @@ export const ClosingStripModal =
                             }
 
                             store.ChangeCabinetName();
+                            store.ChangeBrName();
                         }}
                         selectedValue={opt.boardRelative}
                     >

src/UI/Components/Modal/ModalStyle/BoardModal.less

@@ -127,6 +127,7 @@
 
 /* 板材信息 */
 #commonModal {
+
     .bp3-input,
     .lr-br .bp3-input {
         width: @inputWidth;
@@ -135,7 +136,12 @@
     .boardSize .bp3-input {
         width: 3rem;
     }
+
+    .board-info .bp3-input {
+        width: 9rem;
+    }
 }
+
 /* 板长宽厚尺寸拾取，板件拾取*/
 #commonModal {
     .br-lkg {
@@ -191,6 +197,7 @@
         }
     }
 }
+
 /* 尺寸拾取*/
 #modal .pick-br {
     .bp3-label {

src/UI/Store/BoardStore.ts

@@ -784,6 +784,7 @@ export class ClosingStripStore extends BoardStore<ClosingStripOption>
         super();
         this.m_BoardProcessOption[EBoardKeyList.DrillType] = DrillType.None;
     }
+
     ChangeCabinetName(cof?: IConfigOption)
     {
         let [option, processData] = cof ? [cof.option, cof.processData] : [this.m_Option, this.m_BoardProcessOption];
@@ -813,11 +814,32 @@ export class ClosingStripStore extends BoardStore<ClosingStripOption>
             }
         }
     }
+
+    ChangeBrName(cof?: IConfigOption)
+    {
+        let option = cof ? cof.option : this.m_Option;
+        let title = "左";
+        switch (option.boardRelative)
+        {
+            case BrRelativePos.Right:
+                title = "右";
+                break;
+            case BrRelativePos.Top:
+                title = "上";
+            default:
+                break;
+        }
+        // 收口条名称
+        let brName = title + "收口";
+        option.brName = brName;
+    }
+
     InitOption()
     {
         Object.assign(this.m_Option, DefaultClosingStripOption);
         super.InitOption();
     }
+
     UpdateOption(cof: IConfigOption<ClosingStripOption>)
     {
         if (cof.option.version < 2)
@@ -832,6 +854,11 @@ export class ClosingStripStore extends BoardStore<ClosingStripOption>
             cof.option.addSKTCabinetName = true;
             cof.option.version = 3;
         }
+        if (cof.option.version < 4)
+        {
+            cof.option.version = 4;
+            this.ChangeBrName(cof);
+        }
         this.ChangeCabinetName(cof);
         super.UpdateOption(cof);
     }

src/UI/Store/OptionInterface/BoardProcessOption.ts

@@ -9,6 +9,7 @@ export interface BoardProcessOption extends IBaseOption
 {
     [EBoardKeyList.RoomName]?: string;
     [EBoardKeyList.CabinetName]?: string; //柜名
+    [EBoardKeyList.BrName]?: string; //板名
     [EBoardKeyList.BrMat]?: string; //板材名
     [EBoardKeyList.Mat]?: string; //材料
     [EBoardKeyList.Color]?: string;

src/UI/Store/OptionInterface/ClosingStripOption.ts

@@ -16,4 +16,5 @@ export interface ClosingStripOption extends BoardConfigOption
     fzWidth: number;
     fzThickness: number;
     addSKTCabinetName: boolean; //柜名加收口名称
+    brName: string;//收口条板名   name被辅助条占用
 }