!2201 新增:查找修改新增备注拾取

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;
             }

src/Common/BoardKeyList.ts

@@ -32,4 +32,6 @@ export enum EBoardKeyList
     SpliteWidth = "spliteWidth",
     SpliteThickness = "spliteThickness",
     DrawNumber = "drawNumber",
+    Remarks = "remarks",//备注
+    ExtraRemarks = "extraRemarks"//追加备注
 }

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

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 {