From 2bd7d6f5ffdea0556c378f6ffe65f35bc5ff1894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E8=8B=A5=E5=AF=92?=
 <13470150+qian-ruohan@user.noreply.gitee.com>
Date: Thu, 18 Jul 2024 02:52:37 +0000
Subject: [PATCH] =?UTF-8?q?!2794=20=E6=96=B0=E5=A2=9E:=E6=9D=BF=E4=BB=B6?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=BA=B8=E6=8B=BE?=
 =?UTF-8?q?=E5=8F=96=E6=9D=90=E6=96=99=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Add-on/twoD2threeD/Modals/Rec2Br.tsx      | 22 ++++++++++---
 .../twoD2threeD/R2BProcessComponent.tsx       |  9 ++++--
 src/UI/Components/Board/BoardCommon.tsx       |  3 +-
 src/UI/Components/Board/BoardProcessModal.tsx | 31 +++++++++++++++++--
 .../Modal/ModalStyle/BoardModal.less          | 17 ++++++++++
 src/UI/Components/RightPanel/BoardProps.less  |  4 +++
 6 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/src/Add-on/twoD2threeD/Modals/Rec2Br.tsx b/src/Add-on/twoD2threeD/Modals/Rec2Br.tsx
index 61972e1d8..c0227e04a 100644
--- a/src/Add-on/twoD2threeD/Modals/Rec2Br.tsx
+++ b/src/Add-on/twoD2threeD/Modals/Rec2Br.tsx
@@ -82,7 +82,7 @@ export class Rec2BrModal extends React.Component<{ store: Rec2BrStore; }, {}>
         this.removeFuncs.length = 0;
     }
     //拾取 距离 板件 模板
-    private getOption = async (state: GetOptionState) =>
+    private getOption = async (state: GetOptionState, isMaterial?: Boolean) =>
     {
         app.Editor.ModalManage.ToggleShow();
         app.Editor.MaskManage.Clear();
@@ -96,10 +96,22 @@ export class Rec2BrModal extends React.Component<{ store: Rec2BrStore; }, {}>
                 if (enRes1.Status === PromptStatus.OK)
                 {
                     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];
+                    if (isMaterial)
+                    {
+                        this.props.store.m_Option.boardMatName = data[EBoardKeyList.BrMat];
+                        this.props.store.UIOption.boardMatName = data[EBoardKeyList.BrMat];
+                        this.props.store.m_Option.color = data[EBoardKeyList.Color];
+                        this.props.store.UIOption.color = data[EBoardKeyList.Color];
+                        this.props.store.m_Option.material = data[EBoardKeyList.Mat];
+                        this.props.store.UIOption.material = data[EBoardKeyList.Mat];
+                    }
+                    else
+                    {
+                        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:
diff --git a/src/Add-on/twoD2threeD/R2BProcessComponent.tsx b/src/Add-on/twoD2threeD/R2BProcessComponent.tsx
index 154230ba5..16012905c 100644
--- a/src/Add-on/twoD2threeD/R2BProcessComponent.tsx
+++ b/src/Add-on/twoD2threeD/R2BProcessComponent.tsx
@@ -1,4 +1,4 @@
-import { Card, Classes, H5, HTMLSelect } from "@blueprintjs/core";
+import { Button, Card, Classes, H5, HTMLSelect } from "@blueprintjs/core";
 import { observable } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
@@ -14,11 +14,12 @@ import { Rec2BrStore } from './Rec2BrStore';
 export interface IR2BProcessComponentProps
 {
     store: Rec2BrStore;
-    getOption: (state: GetOptionState) => void;
+    getOption: (state: GetOptionState, isMaterial?: Boolean) => void;
 }
 
 @observer
-export class R2BProcessComponent extends React.Component<IR2BProcessComponentProps> {
+export class R2BProcessComponent extends React.Component<IR2BProcessComponentProps>
+{
     private showShops = observable.box(false);
 
     private matPars = [
@@ -45,6 +46,8 @@ export class R2BProcessComponent extends React.Component<IR2BProcessComponentPro
                             className="bp3-button bp3-intent-success"
                             onClick={() => this.showShops.set(true)}
                         >选择</button>
+                        <Button style={{ width: "2rem", height: "80px" }} text="拾取" intent="success"
+                            onClick={() => this.props.getOption(GetOptionState.GetBoard, true)} />
                         {
                             this.showShops.get() && <GoodsListDiv
                                 open={this.showShops}
diff --git a/src/UI/Components/Board/BoardCommon.tsx b/src/UI/Components/Board/BoardCommon.tsx
index 4d8cc957c..763b95ae3 100644
--- a/src/UI/Components/Board/BoardCommon.tsx
+++ b/src/UI/Components/Board/BoardCommon.tsx
@@ -833,12 +833,11 @@ export class DrillTypeSelectCom extends React.Component<IDrillTypeSelect, { isDa
         const options = this.Options;
 
         const select = <HTMLSelect
-            className="select-drillType"
+            className="select-drillType modal-pick"
             value={this.props.opt.drillType}
             disabled={isHeightDrillLock}
             style={{
                 padding: "0 5px",
-                width: this.props.br && this.props.isShowHigh && "100%",
                 outline: this.state.isDanger && "1px red solid",
             }}
             options={options}
diff --git a/src/UI/Components/Board/BoardProcessModal.tsx b/src/UI/Components/Board/BoardProcessModal.tsx
index 4e34d1586..c7a9ead7c 100644
--- a/src/UI/Components/Board/BoardProcessModal.tsx
+++ b/src/UI/Components/Board/BoardProcessModal.tsx
@@ -109,6 +109,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>
         const el =
             <>
                 <SetBoardDataItem
+                    className='modal-pick'
                     type={CheckObjectType.BR}
                     optKey="roomName"
                     option={this.props.opt}
@@ -116,6 +117,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>
                     placeHolder="输入房间名"
                 />
                 <SetBoardDataItem
+                    className='modal-pick'
                     type={CheckObjectType.BR}
                     optKey="cabinetName"
                     option={this.props.opt}
@@ -317,6 +319,26 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>
         }
         return options;
     }
+    private getBoardValue = async () =>
+    {
+        app.Editor.ModalManage.ToggleShow();
+        app.Editor.MaskManage.Clear();
+
+        let enRes = await app.Editor.GetEntity({
+            Msg: "选择板件",
+            Filter: { filterTypes: [Board] }
+        });
+
+        if (enRes.Status === PromptStatus.OK)
+        {
+            const data = (enRes.Entity as Board).BoardProcessOption;
+            this.props.opt[EBoardKeyList.BrMat] = data[EBoardKeyList.BrMat];
+            this.props.opt[EBoardKeyList.Mat] = data[EBoardKeyList.Mat];
+            this.props.opt[EBoardKeyList.Color] = data[EBoardKeyList.Color];
+        }
+        app.Editor.ModalManage.ToggleShow();
+        app.Editor.MaskManage.ShowMask();
+    };
 
     async UNSAFE_componentWillMount()
     {
@@ -346,6 +368,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>
                 }
                 <div className="flex br-mat">
                     <SetBoardDataBlock
+                        className='modal-pick'
                         type={CheckObjectType.BR}
                         pars={this.matPars}
                         option={this.props.opt}
@@ -356,6 +379,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>
                         style={{ width: "2rem" }}
                         onClick={() => this.showShops.set(true)}
                     >选择</button>
+                    <Button style={{ width: "2rem" }} text="拾取" intent="success" onClick={() => this.getBoardValue()} />
                     {
                         this.showShops.get() && <GoodsListDiv
                             open={this.showShops}
@@ -367,6 +391,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>
                     <label className="bp3-label bp3-inline .modifier">
                         <span>纹路:</span>
                         <HTMLSelect
+                            className='modal-pick'
                             value={this.props.opt.lines.toString()}
                             options={LineTypeSelectOption}
                             onChange={e =>
@@ -378,7 +403,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>
                     <label className="bp3-label bp3-inline .modifier" style={{ display: "flex" }}>
                         <span>加工组:</span>
                         <div className="flex" style={{ display: "inline-flex", width: "83%" }}>
-                            <input className="bp3-input br-process-input" title="双击查看详细内容" value={tagValue} readOnly style={{ flex: 1 }} onDoubleClick={this.onProcessInputDbClick} />
+                            <input className="bp3-input br-process-input modal-pick" title="双击查看详细内容" value={tagValue} readOnly style={{ flex: 1 }} onDoubleClick={this.onProcessInputDbClick} />
                             <Button
                                 text="更多"
                                 intent="success"
@@ -442,6 +467,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>
                     <label className="bp3-label bp3-inline .modifier">
                         <span>大孔面:</span>
                         <HTMLSelect
+                            className='modal-pick'
                             value={this.props.topBottomOption?.bigHoleDir != undefined ? this.props.topBottomOption.bigHoleDir.toString() : this.props.opt.bigHoleDir.toString()}
                             options={
                                 this.getOptions(this.props.type)
@@ -455,7 +481,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>
                             }}
                         />
                     </label>
-                    <label className="bp3-label bp3-inline .modifier" style={{ width: 175 }}>
+                    <label className="bp3-label bp3-inline .modifier" style={{ width: 180 }}>
                         <span>排钻:</span>
                         <DrillTypeSelectCom
                             opt={this.props.opt}
@@ -468,6 +494,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>
                     <label className="bp3-label  bp3-inline .modifier">
                         <span>排版面:</span>
                         <HTMLSelect
+                            className='modal-pick'
                             value={this.props.opt.composingFace.toString()}
                             options={ComposingFaceSelectOption}
                             onChange={e =>
diff --git a/src/UI/Components/Modal/ModalStyle/BoardModal.less b/src/UI/Components/Modal/ModalStyle/BoardModal.less
index aed087504..ab1b5f7fc 100644
--- a/src/UI/Components/Modal/ModalStyle/BoardModal.less
+++ b/src/UI/Components/Modal/ModalStyle/BoardModal.less
@@ -45,6 +45,15 @@
         .br-set input {
             margin-left: 5px;
         }
+
+        .modal-pick.br-set input {
+            width: 11rem;
+        }
+
+        .modal-pick select,
+        .br-set input {
+            width: 11rem;
+        }
     }
 }
 
@@ -144,6 +153,10 @@
     .closing-input .bp3-input {
         width: 8rem;
     }
+
+    .board-info .modal-pick.bp3-input {
+        width: 11rem;
+    }
 }
 
 /* 板长宽厚尺寸拾取，板件拾取*/
@@ -283,6 +296,10 @@
         input {
             width: 6.5rem;
         }
+
+        .modal-pick input {
+            width: 6rem;
+        }
     }
 
     .br-mat>div>div:last-child {
diff --git a/src/UI/Components/RightPanel/BoardProps.less b/src/UI/Components/RightPanel/BoardProps.less
index 854485062..25ec3eae0 100644
--- a/src/UI/Components/RightPanel/BoardProps.less
+++ b/src/UI/Components/RightPanel/BoardProps.less
@@ -79,6 +79,10 @@
     width: 15rem;
 }
 
+#boardPropsCom .board-info .modal-pick .br-set input {
+    width: 12.5rem;
+}
+
 #boardPropsCom {
     .boardSize {
         min-width: 151px;