!1126 修复:bbs属性修改失败

src/UI/Components/Board/BoardInfosList.tsx

@@ -36,7 +36,7 @@ export interface IBoardInfoOptions extends IBaseOption
     [EBoardKeyList.Width]?: string;
     [EBoardKeyList.Thick]?: string;
     "brName"?: string;
-    "boardName"?: string;
+    [EBoardKeyList.BrMat]?: string;
     [EBoardKeyList.Mat]?: string;
     [EBoardKeyList.Color]?: string;
     [EBoardKeyList.RoomName]?: string;

src/UI/Components/Board/LookOverBoardInfos.tsx

@@ -37,6 +37,7 @@ import { AppToaster } from "../Toaster";
 import { HardwareCompositeEntity } from './../../../DatabaseServices/Hardware/HardwareCompositeEntity';
 import { HardwareTopline } from './../../../DatabaseServices/Hardware/HardwareTopline';
 import { BoardInfoList, IBoardInfoOptions } from "./BoardInfosList";
+import { CommandWrap } from "../../../Editor/CommandMachine";
 
 interface BoradDataInArray
 {
@@ -323,7 +324,7 @@ export class LookOverBoardInfosModal extends React.Component<LookOverBoardInfosM
             f();
         this.removeFuncs.length = 0;
     }
-    async OnOk<T>(state: number, data?: T)
+    async OnOk(state: number, data?: { type: EFindType; })
     {
         if (state === ModalState.Ok)
         {
@@ -335,16 +336,18 @@ export class LookOverBoardInfosModal extends React.Component<LookOverBoardInfosM
                     return;
                 }
             }
-            app.Editor.MaskManage.Clear();
-            app.Editor.ModalManage.ToggleShow();
-            app.Editor.ModalManage.SetCallback((res) =>
+            if (data.type === EFindType.Modify)
             {
-                if (res.type === EFindType.Modify)
+                app.Editor.MaskManage.Clear();
+                app.Editor.ModalManage.ToggleShow();
+                await CommandWrap(() =>
+                {
                     this.Modify();
+                }, "_modify");
+
                 app.Editor.ModalManage.ToggleShow();
                 app.Editor.MaskManage.ShowMask();
-            });
-            await app.Editor.ModalManage.ExecCmd(data);
+            }
         }
         else
         {
@@ -627,10 +630,11 @@ export class LookOverBoardInfosModal extends React.Component<LookOverBoardInfosM
             this.ModifyBoard(br, opts);
         }
         //重置修改数据
-        this.modifyBoardData = new Map();
+        this.modifyBoardData.clear();
     }
     ModifyBoard = (br: Board, opts: IBoardInfoOptions) =>
     {
+        br = br.__OriginalEnt__ ?? br;
         for (let i in opts)
         {
             switch (i)
@@ -648,7 +652,7 @@ export class LookOverBoardInfosModal extends React.Component<LookOverBoardInfosM
                     br.Name = opts.brName;
                     break;
                 case "boardName":
-                    br.BoardProcessOption.boardName = opts.boardName;
+                    br.BoardProcessOption[EBoardKeyList.BrMat] = opts.boardName;
                     break;
                 case EBoardKeyList.ProcessGroup:
                     let pgs = opts[i];
@@ -917,7 +921,7 @@ export class LookOverBoardInfosModal extends React.Component<LookOverBoardInfosM
                                 text="应用数据修改"
                                 intent={Intent.SUCCESS}
                                 onClick={() =>
-                                { this.OnOk(ModalState.Ok, { type: EFindType.Modify, cname: "_modify" }); }} />
+                                { this.OnOk(ModalState.Ok, { type: EFindType.Modify }); }} />
                             {/* <Button
                                 // 待补充
                                 text="修改选择板件的板材" /> */}