diff --git a/src/Add-on/ChangeColorByBoard/ChangeColorByMaterial.tsx b/src/Add-on/ChangeColorByBoard/ChangeColorByMaterial.tsx index 62b74ae3c..7136a4b0d 100644 --- a/src/Add-on/ChangeColorByBoard/ChangeColorByMaterial.tsx +++ b/src/Add-on/ChangeColorByBoard/ChangeColorByMaterial.tsx @@ -6,9 +6,10 @@ import { begin } from 'xaop'; import { app } from "../../ApplicationServices/Application"; import { EBoardKeyList } from "../../Common/BoardKeyList"; import { ColorMaterial } from '../../Common/ColorPalette'; +import { CommandNames } from '../../Common/CommandNames'; import { FixedNotZero } from "../../Common/Utils"; import { Board } from "../../DatabaseServices/Entity/Board"; -import { Command } from "../../Editor/CommandMachine"; +import { Command, commandMachine } from "../../Editor/CommandMachine"; import { PromptSsgetResult, PromptStatus } from '../../Editor/PromptResult'; import { SelectSetBase } from '../../Editor/SelectBase'; import { Production } from '../../Production/Product'; @@ -35,17 +36,20 @@ export class ChangeColorByMaterial implements Command KeyWordList: [{ key: "S", msg: "修改区分板材规则" }], }); - if (brRes.Status === PromptStatus.Cancel) - return; - else if (brRes.Status === PromptStatus.Keyword) + if (brRes.Status === PromptStatus.Keyword) { app.Editor.ModalManage.RenderModal(BoardInfoSelectPanel, { store }); await app.Editor.ModalManage.Wait(); } + else if (brRes.Status !== PromptStatus.OK) + return; else break; } + if (!app.Viewer.isLayout) + commandMachine.ExecCommand(CommandNames.ConceptualTransparent); + let config = new DialogUserConfig(store, BoardModalType.ChangeColorByBoardMaterial); await config.LoadAndInitConfig();//载入或者初始化