diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts index d61a4bed0..76e6a9e6d 100644 --- a/packages/designer/src/builtin-simulator/host.ts +++ b/packages/designer/src/builtin-simulator/host.ts @@ -975,12 +975,11 @@ export class BuiltinSimulatorHost implements ISimulatorHost, selector: string): Element interface DropContainer { container: ParentalNode; instance: ComponentInstance; -} \ No newline at end of file +} diff --git a/packages/designer/src/document/node/modal-nodes-manager.ts b/packages/designer/src/document/node/modal-nodes-manager.ts index b5cb96963..e2c459521 100644 --- a/packages/designer/src/document/node/modal-nodes-manager.ts +++ b/packages/designer/src/document/node/modal-nodes-manager.ts @@ -4,8 +4,7 @@ import { DocumentModel } from '../document-model'; function getModalNodes(node: Node) { let nodes: any = []; - const prototype = node.getPrototype(); - if (prototype && prototype.isModal()) { + if (node.componentMeta.isModal) { nodes.push(node); } const children = node.getChildren(); @@ -85,8 +84,7 @@ export class ModalNodesManager { } private addNode(node: Node) { - const prototype = node.getPrototype(); - if (prototype && prototype.isModal()) { + if (node.componentMeta.isModal) { this.hideModalNodes(); this.modalNodes.push(node); this.addNodeEvent(node); @@ -96,8 +94,7 @@ export class ModalNodesManager { } private removeNode(node: Node) { - const prototype = node.getPrototype(); - if (prototype && prototype.isModal()) { + if (node.componentMeta.isModal) { const index = this.modalNodes.indexOf(node); if (index >= 0) { this.modalNodes.splice(index, 1); diff --git a/packages/plugin-outline-pane/src/main.ts b/packages/plugin-outline-pane/src/main.ts index dd2f55136..e4339ff9f 100644 --- a/packages/plugin-outline-pane/src/main.ts +++ b/packages/plugin-outline-pane/src/main.ts @@ -158,8 +158,8 @@ export class OutlineMain implements ISensor, ITreeBoard, IScrollable { const irect = this.getInsertionRect(); const originLoc = document.dropLocation; - const prop = e.dragObject.nodes ? e.dragObject.nodes[0].getPrototype() : null; - if (e.dragObject.type === 'node' && prop && prop.isModal()) { + const componentMeta = e.dragObject.nodes ? e.dragObject.nodes[0].componentMeta : null; + if (e.dragObject.type === 'node' && componentMeta && componentMeta.isModal) { return designer.createLocation({ target: document.rootNode, detail: { diff --git a/packages/plugin-outline-pane/src/views/root-tree-node.tsx b/packages/plugin-outline-pane/src/views/root-tree-node.tsx index 69d456ef1..efed91d78 100644 --- a/packages/plugin-outline-pane/src/views/root-tree-node.tsx +++ b/packages/plugin-outline-pane/src/views/root-tree-node.tsx @@ -29,7 +29,7 @@ class ModalTreeNodeView extends Component<{ treeNode: TreeNode }> { render() { const { treeNode } = this.props; const modalNodes = treeNode.children?.filter((item) => { - return item.node.getPrototype()?.isModal(); + return item.node.componentMeta.isModal; }); if (!modalNodes || modalNodes.length === 0) { return null; diff --git a/packages/plugin-outline-pane/src/views/tree-branches.tsx b/packages/plugin-outline-pane/src/views/tree-branches.tsx index f6471450b..8cbf9db48 100644 --- a/packages/plugin-outline-pane/src/views/tree-branches.tsx +++ b/packages/plugin-outline-pane/src/views/tree-branches.tsx @@ -72,7 +72,7 @@ class TreeNodeChildren extends Component<{ /> ); treeNode.children?.forEach((child, index) => { - const childIsModal = child.node.getPrototype()?.isModal() || false; + const childIsModal = child.node.componentMeta.isModal || false; if (isModal != childIsModal) { return; } diff --git a/packages/react-simulator-renderer/src/renderer.ts b/packages/react-simulator-renderer/src/renderer.ts index 10ee936d2..e2818395c 100644 --- a/packages/react-simulator-renderer/src/renderer.ts +++ b/packages/react-simulator-renderer/src/renderer.ts @@ -508,7 +508,7 @@ class ComponentCreator extends React.Component<{ schema: any; propsMap: any, com constructor(props: any) { super(props); const componentMeta = host.currentDocument?.getComponentMeta(props.schema.componentName); - if (componentMeta?.prototype?.isModal()) { + if (componentMeta?.isModal) { this.isModal = true; } }