!1389 修复:刀具界面无法关闭问题

pull/1389/MERGE
ZoeLeeFZ 4 years ago committed by ChenX
parent 65338a02c7
commit 8dc4673cd5

@ -194,7 +194,7 @@ export class CADModal
{ {
ReactDOM.unmountComponentAtNode(this.container); ReactDOM.unmountComponentAtNode(this.container);
this.minimizeEl = null; this.minimizeEl = null;
const { resizable = false } = option; const { resizable = false, isModal = false } = option;
ReactDOM.render( ReactDOM.render(
resizable ? resizable ?
<Rnd <Rnd
@ -251,6 +251,7 @@ export class CADModal
this.dragHandleEl = (this.container.getElementsByClassName('drag-handle')[0] as HTMLElement) ?? undefined; this.dragHandleEl = (this.container.getElementsByClassName('drag-handle')[0] as HTMLElement) ?? undefined;
} }
this.canResize = resizable; this.canResize = resizable;
this.IsModal = isModal;
this.container.focus(); this.container.focus();
} }
SetPosition(pos: ModalPosition) SetPosition(pos: ModalPosition)

@ -193,6 +193,7 @@ export class ModalManage
} }
RenderModal<T extends AnyObject>(Component: React.ComponentType<T>, props?: T, option: IModalProps = {}) RenderModal<T extends AnyObject>(Component: React.ComponentType<T>, props?: T, option: IModalProps = {})
{ {
let key: string = props?.type ?? GetCompoentObjectIdString(Component);
for (let [k, modal] of this._List) for (let [k, modal] of this._List)
{ {
if (modal.IsModal) if (modal.IsModal)
@ -200,6 +201,8 @@ export class ModalManage
console.error("未知情况"); console.error("未知情况");
continue; continue;
} }
if (k === key)
continue;
modal.IsLock = true; modal.IsLock = true;
} }
this.RenderModeless(Component, props, { ...option, isModal: true }); this.RenderModeless(Component, props, { ...option, isModal: true });

Loading…
Cancel
Save