diff --git a/src/Add-on/DrawDrilling/DrillingReactor.ts b/src/Add-on/DrawDrilling/DrillingReactor.ts index 02e17a345..f24706320 100644 --- a/src/Add-on/DrawDrilling/DrillingReactor.ts +++ b/src/Add-on/DrawDrilling/DrillingReactor.ts @@ -25,6 +25,7 @@ const ForbidReactorCmd = new Set([ CommandNames.ShowProcessingGroupModal, CommandNames.添加加工组, CommandNames.删除加工组, + CommandNames.封边属性编辑, ]); export class DrillingReactor diff --git a/src/Common/CommandNames.ts b/src/Common/CommandNames.ts index e8f7386c3..d2d18b689 100644 --- a/src/Common/CommandNames.ts +++ b/src/Common/CommandNames.ts @@ -243,5 +243,6 @@ export enum CommandNames M0 = "M0", PackageGroupMove0 = "PACKAGEGROUPMOVE0", ApplyMtl = "APPLYMTL",//应用材质 + 封边属性编辑 = "封边属性编辑" } diff --git a/src/UI/Store/RightPanelStore/SealingStore.ts b/src/UI/Store/RightPanelStore/SealingStore.ts index 8c4d6c079..9042d3cc1 100644 --- a/src/UI/Store/RightPanelStore/SealingStore.ts +++ b/src/UI/Store/RightPanelStore/SealingStore.ts @@ -1,13 +1,14 @@ +import { Intent } from "@blueprintjs/core"; import { observable } from "mobx"; import { log } from "util"; +import { CommandNames } from "../../../Common/CommandNames"; import { safeEval } from "../../../Common/eval"; import { Board } from "../../../DatabaseServices/Entity/Board"; import { CommandWrap } from "../../../Editor/CommandMachine"; -import { GetBoardSealingCurves, HandleRectBoardSealingData, GetBoardHighSeal } from "../../../GraphicsSystem/CalcEdgeSealing"; +import { GetBoardHighSeal, GetBoardSealingCurves, HandleRectBoardSealingData } from "../../../GraphicsSystem/CalcEdgeSealing"; import { ShowLinesToaster } from "../../Components/Toaster"; import { IHighSealedItem } from "../BoardInterface"; import { BoardEdgesEditor, Board_Editor_Key } from "./BoardEdgesEditor"; -import { Intent } from "@blueprintjs/core"; export class SealingStore extends BoardEdgesEditor { @@ -89,11 +90,12 @@ export class SealingStore extends BoardEdgesEditor for (let [b, cus] of this._brMap) { let data = this._dataMap.get(b); - HandleRectBoardSealingData(b, data, cus.map(c => c.ApplyMatrix(b.OCSInv))); + let ocsInv = b.OCSInv; + HandleRectBoardSealingData(b, data, cus.map(c => c.ApplyMatrix(ocsInv))); b.BoardProcessOption.highSealed = data; } this._dataMap.clear(); - }, "封边属性编辑"); + }, CommandNames.封边属性编辑); } }