diff --git a/src/Add-on/ArcBoard/DrawArcBoard.ts b/src/Add-on/ArcBoard/DrawArcBoard.ts index 46f259744..0a66cec22 100644 --- a/src/Add-on/ArcBoard/DrawArcBoard.ts +++ b/src/Add-on/ArcBoard/DrawArcBoard.ts @@ -16,10 +16,9 @@ import { ZAxis, ZeroVec, equaln, equalv3, isPerpendicularityTo } from "../../Geo import { HotCMD } from "../../Hot/HotCommand"; import { BoardModal } from "../../UI/Components/Board/BoardModal"; import { BoardModalType } from "../../UI/Components/Board/BoardModalType"; -import { IConfigOption } from "../../UI/Components/Board/UserConfigComponent"; +import { DialogUserConfig } from "../../UI/Components/Board/UserConfigComponent"; import { ModalState } from "../../UI/Components/Modal/ModalInterface"; import { IArcBoardGrooveOption } from "../../UI/Store/OptionInterface/IOptionInterface"; -import { userConfigStore } from "../../UI/Store/UserConfigStore"; import { FaceDirection } from "../DrawDrilling/DrillType"; import { ArcBoardBuild } from "./ArcBoardBuild"; import { ArcBoardGroove } from "./ArcBoardGeooveConfig/ArcBoardGroove"; @@ -30,24 +29,13 @@ let arcBoardGrooveOption: IArcBoardGrooveOption = { ...DefaultArcBoardGrooveOpti @HotCMD export class Command_DrawArcBoard implements Command { - arcBoardGrooveStore: ArcBoardGrooveStore = ArcBoardGrooveStore.GetInstance(); - - constructor() - { - this.InitGrooveOption(); - } - async InitGrooveOption() - { - let config = await userConfigStore.GetConfig(BoardModalType.ArcBoardGrooves) as IConfigOption; - if (config) - { - this.arcBoardGrooveStore.UpdateOption(config); - arcBoardGrooveOption = config.option; - } - } async exec() { - arcBoardGrooveOption = { ...this.arcBoardGrooveStore.m_Option }; + const arcBoardGrooveStore = ArcBoardGrooveStore.GetInstance(); + let config = new DialogUserConfig(arcBoardGrooveStore, BoardModalType.ArcBoardGrooves); + await config.LoadAndInitConfig(); + + arcBoardGrooveOption = { ...arcBoardGrooveStore.m_Option }; // 1.选择要放样的路径 const pathRes = await app.Editor.GetEntity({ Msg: "选择要放样的路径:", Filter: { filterTypes: [Polyline] } }); if (pathRes.Status !== PromptStatus.OK) return;