From be45726618bae7454b8b04e6d4b550d246e3e1f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E4=B8=89?= <940119273@qq.com>
Date: Mon, 8 May 2023 06:56:41 +0000
Subject: [PATCH] =?UTF-8?q?!2201=20=E6=96=B0=E5=A2=9E:=E6=9F=A5=E6=89=BE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E5=A4=87=E6=B3=A8=E6=8B=BE?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Add-on/BoardFindModify.ts                   | 17 +++++++++++++----
 src/Common/BoardKeyList.ts                      |  2 ++
 src/UI/Components/Board/BoardFindModify.tsx     |  6 ++++--
 .../Components/Modal/ModalStyle/BoardFind.less  | 15 +++++++++++++++
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/Add-on/BoardFindModify.ts b/src/Add-on/BoardFindModify.ts
index dee065320..675d8de9b 100644
--- a/src/Add-on/BoardFindModify.ts
+++ b/src/Add-on/BoardFindModify.ts
@@ -2,9 +2,9 @@ import { toJS } from "mobx";
 import { app } from "../ApplicationServices/Application";
 import { arrayLast } from "../Common/ArrayExt";
 import { EBoardKeyList } from "../Common/BoardKeyList";
-import { safeEval } from "../Common/eval";
 import { UpdateDraw } from "../Common/Status";
 import { FixedNotZero } from "../Common/Utils";
+import { safeEval } from "../Common/eval";
 import { CylinderHole, GangDrillType } from "../DatabaseServices/3DSolid/CylinderHole";
 import { BoardIsLong, BoardIsShort } from "../DatabaseServices/BoardLinesReactor";
 import { LineAngularDimension } from "../DatabaseServices/Dimension/2LineAngularDimension";
@@ -517,7 +517,7 @@ export class BoardFindModify implements Command
         {
             let br = brRes.Entity as Board;
 
-            switch (data.key as (keyof EBoardKeyList))
+            switch (data.key as EBoardKeyList)
             {
                 case EBoardKeyList.Height:
                     option[data.key] = FixedNotZero(br.Height, 3);
@@ -545,14 +545,23 @@ export class BoardFindModify implements Command
                 case EBoardKeyList.BigHole:
                 case EBoardKeyList.DrillType:
                 case EBoardKeyList.ComposingFace:
-                    option[data.key] = br.BoardProcessOption[data.key];
-                    break;
                 case EBoardKeyList.UpSealed:
                 case EBoardKeyList.DownSealed:
                 case EBoardKeyList.LeftSealed:
                 case EBoardKeyList.RightSealed:
                     option[data.key] = br.BoardProcessOption[data.key];
                     break;
+                case EBoardKeyList.Remarks:
+                case EBoardKeyList.ExtraRemarks:
+                    let remarks = br.BoardProcessOption[EBoardKeyList.Remarks];
+                    for (let i = 0; i < 10; i++)
+                    {
+                        for (i; i < remarks.length; i++)
+                            option[data.key][i] = remarks[i];
+                        //剩下为空
+                        option[data.key][i] = ["", ""];
+                    }
+                    break;
                 default:
                     break;
             }
diff --git a/src/Common/BoardKeyList.ts b/src/Common/BoardKeyList.ts
index 061bc1725..e691671c4 100644
--- a/src/Common/BoardKeyList.ts
+++ b/src/Common/BoardKeyList.ts
@@ -32,4 +32,6 @@ export enum EBoardKeyList
     SpliteWidth = "spliteWidth",
     SpliteThickness = "spliteThickness",
     DrawNumber = "drawNumber",
+    Remarks = "remarks",//备注
+    ExtraRemarks = "extraRemarks"//追加备注
 }
diff --git a/src/UI/Components/Board/BoardFindModify.tsx b/src/UI/Components/Board/BoardFindModify.tsx
index d2b590975..4130e3e2c 100644
--- a/src/UI/Components/Board/BoardFindModify.tsx
+++ b/src/UI/Components/Board/BoardFindModify.tsx
@@ -548,7 +548,7 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
                             />
                         </div>
                     </div>
-                    <div>
+                    <div className='boardFindRemarks'>
                         <Checkbox
                             checked={option.condition.useKeyWord}
                             label="查找修改备注"
@@ -581,8 +581,9 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
                             }
                             target={<Button intent={Intent.PRIMARY}>编辑备注</Button>}
                         />
+                        <Button text="拾取" className='getRemarksButtom' onClick={() => this.getBoardOption(EBoardKeyList.Remarks, "选择板件获取备注")} />
                     </div>
-                    <div>
+                    <div className='boardFindRemarks'>
                         <Checkbox
                             checked={option.condition.addRemarks}
                             label="追加备注"
@@ -615,6 +616,7 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
                             }
                             target={<Button intent={Intent.PRIMARY}>编辑备注</Button>}
                         />
+                        <Button text="拾取" className='getRemarksButtom' onClick={() => this.getBoardOption(EBoardKeyList.ExtraRemarks, "选择板件获取备注")} />
                     </div>
                     <div>
                         <Checkbox
diff --git a/src/UI/Components/Modal/ModalStyle/BoardFind.less b/src/UI/Components/Modal/ModalStyle/BoardFind.less
index d6cd04090..3615941cd 100644
--- a/src/UI/Components/Modal/ModalStyle/BoardFind.less
+++ b/src/UI/Components/Modal/ModalStyle/BoardFind.less
@@ -134,6 +134,21 @@
                 flex: 1;
             }
         }
+
+        .boardFindRemarks {
+            height     : 32px;
+            display    : flex;
+            align-items: center;
+
+            label {
+                width        : 100px;
+                margin-bottom: 3px;
+            }
+            
+            .getRemarksButtom {
+                margin-left: 3px;
+            }
+        }
     }
 
     .select-ent {