diff --git a/src/Add-on/RotateLayerBoard.ts b/src/Add-on/RotateLayerBoard.ts index bf15fdbe7..b2aa7cac2 100644 --- a/src/Add-on/RotateLayerBoard.ts +++ b/src/Add-on/RotateLayerBoard.ts @@ -54,7 +54,7 @@ export class RotateLayerBoard implements Command return; let brs = enRes.SelectSet.SelectEntityList as Board[]; - this.data = res.Data; + this.data = res.Data as any; for (let br of brs) { this.currentBoard = br; diff --git a/src/Add-on/twoD2threeD/Modals/Curve2RecModal.tsx b/src/Add-on/twoD2threeD/Modals/Curve2RecModal.tsx index bc2f0cbf2..dbc13c406 100644 --- a/src/Add-on/twoD2threeD/Modals/Curve2RecModal.tsx +++ b/src/Add-on/twoD2threeD/Modals/Curve2RecModal.tsx @@ -14,6 +14,7 @@ import { BoardModalType } from "../../../UI/Components/Board/BoardModal"; import { IConfigOption, UserConfig } from "../../../UI/Components/Board/UserConfig"; import { GetCompoentObjectIdString } from "../../../UI/Components/ComponentObjectId"; import { ModalFooter, ModalHeader } from "../../../UI/Components/Modal/ModalContainer"; +import { ModalState } from "../../../UI/Components/Modal/ModalInterface"; import { ToasterInput, ToasterValueError } from "../../../UI/Components/Toaster"; import { IBaseOption, IUiOption } from "../../../UI/Store/BoardInterface"; import { IConfigStore } from "../../../UI/Store/BoardStore"; @@ -83,7 +84,7 @@ export class Curve2RecModalStore extends Singleton implements IConfigStore { let invail = this.HasInvailValue(); if (!invail) - app.Editor.ModalManage.DestoryAndExec(); + app.Editor.ModalManage.DestoryAndExec({ Status: ModalState.Ok, Data: { cname: "c2r" } }); } } @observer diff --git a/src/UI/Components/Modal/ModalsManage.ts b/src/UI/Components/Modal/ModalsManage.ts index 6f63b3a47..4984fa0fd 100644 --- a/src/UI/Components/Modal/ModalsManage.ts +++ b/src/UI/Components/Modal/ModalsManage.ts @@ -13,10 +13,13 @@ import { CADModal, DATA_KEY } from './CadModal'; import { ModalPosition, ModalState } from './ModalInterface'; import './ModalStyle/Modal.less'; -export interface IModalResult +export interface IModalResult { Status: ModalState | Pick; - Data?: T; + Data?: { + cname?: string; + [key: string]: any; + }; } export interface IModalProps @@ -229,7 +232,10 @@ export class ModalManage { this.CurrentModal.Callback = callback; } - async ExecCmd(data?: { cname?: string;[key: string]: any; }) + async ExecCmd(data?: { + cname?: string; + [key: string]: any; + }) { await this.EndExecingCmd(); //开始执行命令最小化其他非模态框