!2125 新增:查找修改功能,增加板件备注批量追加功能

src/Add-on/BoardFindModify.ts

@@ -447,6 +447,15 @@ export class BoardFindModify implements Command
                         }
                         br.BoardProcessOption.remarks = remarks;
                         break;
+                    case "addRemarks":
+                        let remarks1: [string, string][] = [];
+                        for (let d of option.extraRemarks)
+                        {
+                            if (d[0] && d[1])
+                                remarks1.push([d[0], d[1]]);
+                        }
+                        br.BoardProcessOption.remarks = (br.BoardProcessOption.remarks.concat(remarks1)).slice(0, 12);
+                        break;
                     case "useChaidan":
                         br.IsChaiDan = option.isChaidan;
                         break;

src/Editor/DefaultConfig.ts

@@ -291,7 +291,7 @@ export const DefaultClosingStripOption: ClosingStripOption = {
 Object.freeze(DefaultClosingStripOption);
 
 export const DefaultBoardFindOption: IBoardFindOption = {
-    version: 6,
+    version: 7,
     condition: {
         layer: false,
         height: false,
@@ -313,6 +313,7 @@ export const DefaultBoardFindOption: IBoardFindOption = {
         bigHoleDir: false,
         drillType: false,
         useKeyWord: false,
+        addRemarks: false,
         composingFace: false,
         sealedUp: false,
         sealedDown: false,
@@ -373,6 +374,7 @@ export const DefaultBoardFindOption: IBoardFindOption = {
     upDownDrill: [true, true],
     isClose: false,
     remarks: Array.from({ length: 10 }, () => ["", ""]),
+    extraRemarks: Array.from({ length: 10 }, () => ["", ""]),
     isChaidan: false,
     [EBoardKeyList.KnifeRad]: "",
 };

src/UI/Components/Board/BoardFindModify.tsx

@@ -551,7 +551,7 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
                     <div>
                         <Checkbox
                             checked={option.condition.useKeyWord}
-                            label="备注关键字"
+                            label="查找修改备注"
                             inline
                             onChange={() => option.condition.useKeyWord = !option.condition.useKeyWord}
                         />
@@ -582,6 +582,40 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
                             target={<Button intent={Intent.PRIMARY}>编辑备注</Button>}
                         />
                     </div>
+                    <div>
+                        <Checkbox
+                            checked={option.condition.addRemarks}
+                            label="追加备注"
+                            inline
+                            onChange={() => option.condition.addRemarks = !option.condition.addRemarks}
+                        />
+                        <Popover
+                            usePortal={false}
+                            canEscapeKeyClose={false}
+                            autoFocus
+                            onOpened={el =>
+                            {
+                                el.onkeydown = e =>
+                                {
+                                    if (e.code === KeyCode.Escape)
+                                    {
+                                        let btn = el.parentElement.previousElementSibling.children[0] as HTMLButtonElement;
+                                        btn?.click();
+                                    }
+                                    e.stopPropagation();
+                                };
+                            }}
+                            onClosed={el => el.onkeydown = null}
+                            content={
+                                <Card tabIndex={-1} >
+                                    <Notes
+                                        remarks={store.m_Option.extraRemarks}
+                                    />
+                                </Card>
+                            }
+                            target={<Button intent={Intent.PRIMARY}>编辑备注</Button>}
+                        />
+                    </div>
                     <div>
                         <Checkbox
                             label="是否拆单"

src/UI/Store/BoardFindInterface.ts

@@ -31,6 +31,7 @@ export interface IBoardFindOption extends IBaseOption
     upDownDrill: [boolean, boolean];
     isClose: boolean;
     remarks: [string, string][];
+    extraRemarks: [string, string][];
     isChaidan: boolean;
     [EBoardKeyList.KnifeRad]: string;
 }
@@ -56,6 +57,7 @@ export interface IFindCondition
     [EBoardKeyList.BigHole]: boolean;
     [EBoardKeyList.DrillType]: boolean;
     useKeyWord: boolean;
+    addRemarks: boolean;
     [EBoardKeyList.ComposingFace]: boolean;
     [EBoardKeyList.UpSealed]: boolean;
     [EBoardKeyList.DownSealed]: boolean;

src/UI/Store/BoardFindModifyStore.ts

@@ -107,6 +107,12 @@ export class BoardFindStore extends BoardStore
             cof.option.condition.hardwareName = false;
             cof.option.hardwareName = "";
         }
+        if (cof.option.version < 7)
+        {
+            cof.option.version = 7;
+            cof.option.condition.addRemarks = false;
+            cof.option.extraRemarks = Array.from({ length: 10 }, () => ["", ""]);
+        }
 
         Object.assign(this.m_Option, cof.option);
         if (this.m_UiOption)