From 28d7960c52f8ada1501f2a3d903973ca2a3d7729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= <lihao.ylh@alibaba-inc.com>
Date: Mon, 8 Mar 2021 10:57:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Dialog=20=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=9C=B0=E6=B7=BB=E5=8A=A0=E5=88=B0=E9=9D=9E=20Page?=
 =?UTF-8?q?=20=E8=8A=82=E7=82=B9=E4=B8=8B=20fix:=20scrollToNode=20?=
 =?UTF-8?q?=E6=97=B6,=20=E5=85=BC=E5=AE=B9=20comment=20=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=9A=84=E8=8A=82=E7=82=B9=20fix:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=BB=84=E4=BB=B6=E7=82=B9=E5=87=BB=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E9=85=8D=E7=BD=AE=E6=97=B6=E7=99=BD=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                                                | 1 +
 packages/designer/src/builtin-simulator/host.ts             | 6 +++---
 packages/designer/src/document/node/node.ts                 | 4 ++++
 packages/designer/src/utils/misc.ts                         | 4 ++++
 packages/editor-skeleton/src/components/stage-box/stage.tsx | 5 ++++-
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 4dd6c2db3..7f19d5ce7 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -26,5 +26,6 @@ module.exports = {
     '@typescript-eslint/no-inferrable-types': 0,
     'no-proto': 0,
     'prefer-const': 0,
+    'eol-last': 0,
   }
 };
diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts
index 05b655d0b..0486b5743 100644
--- a/packages/designer/src/builtin-simulator/host.ts
+++ b/packages/designer/src/builtin-simulator/host.ts
@@ -40,7 +40,7 @@ import clipboard from '../designer/clipboard';
 import { LiveEditing } from './live-editing/live-editing';
 import { Project } from '../project';
 import { Scroller } from '../designer/scroller';
-import { isDOMNodeVisible } from '../utils/misc';
+import { isElementNode, isDOMNodeVisible } from '../utils/misc';
 
 export interface LibraryItem {
   package: string;
@@ -196,7 +196,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
 
   get(key: string): any {
     if (key === 'device') {
-      return this.designer?.editor?.get('deviceMapper')?.transform?.(this._props.device) || this._props.device
+      return this.designer?.editor?.get('deviceMapper')?.transform?.(this._props.device) || this._props.device;
     }
     return this._props[key];
   }
@@ -847,7 +847,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
     if (!componentInstance) return;
     const domNode = this.findDOMNodes(componentInstance)?.[0] as Element;
     if (!domNode) return;
-    if (!isDOMNodeVisible(domNode, this.viewport)) {
+    if (isElementNode(domNode) && !isDOMNodeVisible(domNode, this.viewport)) {
       const { left, top } = domNode.getBoundingClientRect();
       const { scrollTop = 0, scrollLeft = 0 } = this.contentDocument?.documentElement!;
       opt.left = left + scrollLeft;
diff --git a/packages/designer/src/document/node/node.ts b/packages/designer/src/document/node/node.ts
index 3584fcbdb..2e9fb2baa 100644
--- a/packages/designer/src/document/node/node.ts
+++ b/packages/designer/src/document/node/node.ts
@@ -929,6 +929,10 @@ export class Node<Schema extends NodeSchema = NodeSchema> {
       return null;
     }
 
+    if (node.componentMeta?.getMetadata().configure.component?.isModal) {
+      return { container: this.document.rootNode, ref };
+    }
+
     const canDropIn = this.componentMeta?.prototype?.options?.canDropIn;
     if (this.isContainer()) {
       if (canDropIn === undefined ||
diff --git a/packages/designer/src/utils/misc.ts b/packages/designer/src/utils/misc.ts
index c13aa021f..ee79e5729 100644
--- a/packages/designer/src/utils/misc.ts
+++ b/packages/designer/src/utils/misc.ts
@@ -1,5 +1,9 @@
 import Viewport from '../builtin-simulator/viewport';
 
+export function isElementNode(domNode: Element) {
+  return domNode.nodeType === Node.ELEMENT_NODE;
+}
+
 export function isDOMNodeVisible(domNode: Element, viewport: Viewport) {
   const domNodeRect = domNode.getBoundingClientRect();
   const { width, height } = viewport.contentBounds;
diff --git a/packages/editor-skeleton/src/components/stage-box/stage.tsx b/packages/editor-skeleton/src/components/stage-box/stage.tsx
index eff8b07f5..1d3d3cea0 100644
--- a/packages/editor-skeleton/src/components/stage-box/stage.tsx
+++ b/packages/editor-skeleton/src/components/stage-box/stage.tsx
@@ -3,6 +3,7 @@ import React, { Component } from 'react';
 import classNames from 'classnames';
 import Icons from '@ali/ve-icons';
 import { Stage as StageWidget } from '../../widget/stage';
+import { isTitleConfig } from '@ali/lowcode-types';
 
 export const StageDefaultProps = {
   current: false,
@@ -55,6 +56,8 @@ export default class Stage extends Component<StageProps> {
   render() {
     const { stage, current, direction } = this.props;
     const content = stage?.getContent();
+    const { title } = stage!;
+    const newTitle = isTitleConfig(title) ? title.label : title;
 
     if (current) {
       if (direction) {
@@ -75,7 +78,7 @@ export default class Stage extends Component<StageProps> {
     const stageBacker = stage?.hasBack() ? (
       <div className="skeleton-stagebox-stagebacker">
         <Icons name="arrow" className="skeleton-stagebox-stage-arrow" size="medium" data-stage-target="stageback" />
-        <span className="skeleton-stagebox-stage-title">{stage.title}</span>
+        <span className="skeleton-stagebox-stage-title">{newTitle}</span>
         <Icons name="exit" className="skeleton-stagebox-stage-exit" size="medium" data-stage-target="stageexit" />
       </div>
     ) : null;