!3056 优化:追加备注如果备注名称一样可选是否覆盖备注信息

src/Add-on/BoardFindModify.ts

@@ -10,7 +10,7 @@ import { BoardIsLong, BoardIsShort } from "../DatabaseServices/BoardLinesReactor
 import { LineAngularDimension } from "../DatabaseServices/Dimension/2LineAngularDimension";
 import { AlignedDimension } from "../DatabaseServices/Dimension/AlignedDimension";
 import { Board } from "../DatabaseServices/Entity/Board";
-import { BoardOpenDir } from "../DatabaseServices/Entity/BoardInterface";
+import { AddRemarkType, BoardOpenDir } from "../DatabaseServices/Entity/BoardInterface";
 import { Entity } from "../DatabaseServices/Entity/Entity";
 import { HardwareCompositeEntity } from "../DatabaseServices/Hardware/HardwareCompositeEntity";
 import { HardwareTopline } from "../DatabaseServices/Hardware/HardwareTopline";
@@ -592,13 +592,13 @@ export class BoardFindModify implements Command
                         break;
                     case "addRemarks"://追加备注
                         let remarks1: [string, string][] = [];
-                        for (let d of option.extraRemarks)
+                        for (let d of option.appendRemark)
                         {
                             if (d[0] && d[1])
                             {
                                 br.WriteAllObjectRecord();
                                 const repeatIndex = br.BoardProcessOption.remarks.findIndex(([item]) => item === d[0]);
-                                if (repeatIndex !== -1)
+                                if (repeatIndex !== -1 && d[2] === AddRemarkType.Cover)
                                     br.BoardProcessOption.remarks[repeatIndex][1] = d[1];
                                 else
                                     remarks1.push([d[0], d[1]]);

src/DatabaseServices/Entity/BoardInterface.ts

@@ -43,3 +43,9 @@ export enum BrRelativePos
     Right = "right",
     Div = "div"
 }
+// 追加备注
+export enum AddRemarkType
+{
+    Cover = 1,//覆盖
+    NoCover = 0,//不覆盖
+}

src/Editor/DefaultConfig.ts

@@ -2,7 +2,7 @@ import { FaceDirection } from "../Add-on/DrawDrilling/DrillType";
 import { Curve2RecOption } from "../Add-on/twoD2threeD/Modals/Curve2RecOption";
 import { IParseBoardNameOption, IRec2BrOption, IRect2Br2Option } from "../Add-on/twoD2threeD/R2bInterface";
 import { EBoardKeyList } from "../Common/BoardKeyList";
-import { BoardOpenDir, BoardType, BrRelativePos, ComposingType, LinesType } from "../DatabaseServices/Entity/BoardInterface";
+import { AddRemarkType, BoardOpenDir, BoardType, BrRelativePos, ComposingType, LinesType } from "../DatabaseServices/Entity/BoardInterface";
 import { SpaceParseOption } from "../Geometry/SpaceParse/SpaceParseOption";
 import { RenderType } from "../GraphicsSystem/RenderType";
 import { FindModifyStyle } from "../UI/Components/Board/BoardFindInterface";
@@ -338,7 +338,7 @@ export const DefaultClosingStripOption: ClosingStripOption = {
 Object.freeze(DefaultClosingStripOption);
 
 export const DefaultBoardFindOption: IBoardFindOption = {
-    version: 12,
+    version: 13,
     condition: {
         // layer: false, //这个KEY看起来没用了
         height: false,
@@ -453,6 +453,7 @@ export const DefaultBoardFindOption: IBoardFindOption = {
     [EBoardKeyList.SpliteHeight]: "",
     [EBoardKeyList.SpliteWidth]: "",
     [EBoardKeyList.SpliteThickness]: "",
+    appendRemark: Array.from({ length: 10 }, () => ["", "", AddRemarkType.Cover]),
 };
 Object.freeze(DefaultBoardFindOption);
 

src/UI/Components/Board/BoardFindModify.tsx

@@ -8,6 +8,7 @@ import { EBoardKeyList } from '../../../Common/BoardKeyList';
 import { BigFaceSelectOption, ComposingFaceSelectOption, LineTypeSelectOption } from '../../../Common/CommonSelectOption';
 import { KeyBoard, KeyCode } from '../../../Common/KeyEnum';
 import { safeEval } from '../../../Common/eval';
+import { AddRemarkType } from '../../../DatabaseServices/Entity/BoardInterface';
 import { userConfig } from '../../../Editor/UserConfig';
 import { IGoodInfo } from '../../MaterialEditor/GoodsList';
 import { DRILL_KEYS, ECompareType, EFindType } from '../../Store/BoardFindInterface';
@@ -28,7 +29,6 @@ interface IBoardFindState
     hardwareInput: string;
     hardwareDoorName: string;
 }
-
 @inject('store')
 @observer
 export default class BoardFindModifyModal extends React.Component<{ store?: BoardFindStore; }, IBoardFindState>
@@ -718,9 +718,35 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
                             onClosed={el => el.onkeydown = null}
                             content={
                                 <Card tabIndex={-1} >
-                                    <Notes
-                                        remarks={store.m_Option.extraRemarks}
-                                    />
+                                    <div className="notes">
+                                        <div>
+                                            <label>备注名</label>
+                                            <label>备注信息</label>
+                                        </div>{
+                                            store.m_Option.appendRemark.map((d, i) =>
+                                                <div className=" note-item add-remark" key={i} style={{ alignItems: "center" }}>
+                                                    <input type="text" className="bp3-input" tabIndex={1} title={d[0]} value={d[0]} onChange={e => d[0] = e.target.value} />
+                                                    <input type="text" className="bp3-input" tabIndex={1} title={d[1]} value={d[1]} onChange={e => d[1] = e.target.value} />
+                                                    <HTMLSelect
+                                                        value={d[2] ? d[2] : AddRemarkType.Cover}
+                                                        options={[
+                                                            {
+                                                                label: "覆盖",
+                                                                value: AddRemarkType.Cover
+                                                            },
+                                                            {
+                                                                label: "不覆盖",
+                                                                value: AddRemarkType.NoCover
+                                                            }
+                                                        ]}
+                                                        onChange={e =>
+                                                        {
+                                                            d[2] = safeEval(e.target.value);
+                                                        }}
+                                                    />
+                                                </div>)
+                                        }
+                                    </div>
                                 </Card>
                             }
                             target={<Button intent={Intent.PRIMARY}>编辑备注</Button>}

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

@@ -58,6 +58,12 @@
 }
 
 #commonModal .notes {
+    .add-remark {
+        .bp3-html-select {
+            height: 1.6rem
+        }
+    }
+
     .bp3-html-select {
         height: @noteInputHeight;
     }

src/UI/Store/BoardFindInterface.ts

@@ -50,6 +50,7 @@ export interface IBoardFindOption extends IBaseOption
     [EBoardKeyList.SpliteHeight]: string;
     [EBoardKeyList.SpliteWidth]: string;
     [EBoardKeyList.SpliteThickness]: string;
+    appendRemark: [string, string, number][];
 }
 export interface IFindCondition
 {

src/UI/Store/BoardFindModifyStore.ts

@@ -3,7 +3,7 @@ import { app } from "../../ApplicationServices/Application";
 import { EBoardKeyList } from "../../Common/BoardKeyList";
 import { CheckObjectType, CheckoutValid } from "../../Common/CheckoutVaildValue";
 import { DataAdapter } from "../../Common/DataAdapter";
-import { BoardOpenDir } from "../../DatabaseServices/Entity/BoardInterface";
+import { AddRemarkType, BoardOpenDir } from "../../DatabaseServices/Entity/BoardInterface";
 import { DefaultBoardFindOption } from "../../Editor/DefaultConfig";
 import { userConfig } from "../../Editor/UserConfig";
 import { FindModifyStyle } from "../Components/Board/BoardFindInterface";
@@ -169,6 +169,11 @@ export class BoardFindStore extends BoardStore
             cof.option[EBoardKeyList.SpliteThickness] = "";
             cof.option.tolerance[EBoardKeyList.SpliteThickness] = "";
         }
+        if (cof.option.version < 13)
+        {
+            cof.option.version = 13;
+            cof.option.appendRemark = cof.option.extraRemarks.map(([first, second]) => [first, second, AddRemarkType.Cover]);
+        }
 
         Object.assign(this.m_Option, cof.option);
         if (this.m_UiOption)