From c01da52059f76fec8ec8c34926022e8aade0529c Mon Sep 17 00:00:00 2001 From: zhangzepeng Date: Wed, 5 Jul 2023 08:40:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E2=80=98=E9=A6=96=E9=A1=B5=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=EF=BC=8C=E5=88=A0=E9=99=A4=E4=BB=A3=E7=A0=81=E5=A4=8D?= =?UTF-8?q?=E5=8E=9F=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzepeng --- ide/src/trace/component/SpWelcomePage.ts | 13 +++++++++++++ ide/src/trace/component/trace/base/RangeSelect.ts | 9 +++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ide/src/trace/component/SpWelcomePage.ts b/ide/src/trace/component/SpWelcomePage.ts index 59d9e29a3..0ad0d6b5d 100644 --- a/ide/src/trace/component/SpWelcomePage.ts +++ b/ide/src/trace/component/SpWelcomePage.ts @@ -30,12 +30,25 @@ export class SpWelcomePage extends BaseElement { align-content: center; background: var(--dark-background5,#F6F6F6); } + .home-page{ + margin-top: -100px; + } .lit-icon{ + margin-top: 50px; + margin-left: 50px; content: var(--dark-img,url('img/pic.png')); }
+
+

黄区域名: https://smartperf.rnd.huawei.com/smartperf/

+

绿区域名: https://devecotesting.rnd.huawei.com/smartperf/

+

3ms社区: http://3ms.huawei.com/km/groups/3956611/home?|=zh-cn

+

welink讨论群: 群1: 473395703, 群2: 485625665

+
+ +
`; } diff --git a/ide/src/trace/component/trace/base/RangeSelect.ts b/ide/src/trace/component/trace/base/RangeSelect.ts index 4ab5da255..49843d4cf 100644 --- a/ide/src/trace/component/trace/base/RangeSelect.ts +++ b/ide/src/trace/component/trace/base/RangeSelect.ts @@ -90,7 +90,7 @@ export class RangeSelect { this.endY = 0; this.endY2 = mouseEventUp.pageY - this.spacerEL!.getBoundingClientRect().top - this.rowsPaneEL!.scrollTop; } else { - this.endY = mouseEventUp.pageY - this.rowsEL!.getBoundingClientRect().top + this.spacerEL.getBoundingClientRect().height; + this.endY = mouseEventUp.pageY - this.rowsEL!.getBoundingClientRect().top + this.spacerEL.getBoundingClientRect().height; this.endY2 = mouseEventUp.pageY - this.spacerEL!.getBoundingClientRect().top - this.rowsPaneEL!.scrollTop; } if (this.selectHandler) { @@ -125,7 +125,7 @@ export class RangeSelect { this.endY = 0; this.endY2 = mouseEventOut.pageY - this.spacerEL!.getBoundingClientRect().top - this.rowsPaneEL!.scrollTop; } else { - this.endY = mouseEventOut.pageY - this.rowsEL!.getBoundingClientRect().top + this.spacerEL.getBoundingClientRect().height; + this.endY = mouseEventOut.pageY - this.rowsEL!.getBoundingClientRect().top + this.spacerEL.getBoundingClientRect().height; this.endY2 = mouseEventOut.pageY - this.spacerEL!.getBoundingClientRect().top - this.rowsPaneEL!.scrollTop; } if (this.selectHandler && this.isMouseDown) { @@ -232,6 +232,11 @@ export class RangeSelect { rt = new Rect(xMin, Math.min(this.startY2, this.endY2), xMax - xMin, Math.abs(this.startY2 - this.endY2)); } else { bound = it.getBoundingClientRect(); + if (spacerRect.height > 0 && + (bound.y + bound.height) < (spacerRect.y + spacerRect.height)) { + it.rangeSelect = false; + return false; + } itRect = Rect.getIntersect( bound, new Rect(rowsRect.x, rowsRect.y + spacerRect.height, rowsRect.width, rowsRect.height - spacerRect.height) -- Gitee From 5012d52fbb552d3a186b67b34bd34b4c38f64a63 Mon Sep 17 00:00:00 2001 From: zhangzepeng Date: Wed, 5 Jul 2023 08:47:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E4=BB=A3=E7=A0=81=E5=A4=8D=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzepeng --- ide/src/trace/component/SpWelcomePage.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ide/src/trace/component/SpWelcomePage.ts b/ide/src/trace/component/SpWelcomePage.ts index 0ad0d6b5d..1087ab995 100644 --- a/ide/src/trace/component/SpWelcomePage.ts +++ b/ide/src/trace/component/SpWelcomePage.ts @@ -41,10 +41,10 @@ export class SpWelcomePage extends BaseElement {
-

黄区域名: https://smartperf.rnd.huawei.com/smartperf/

-

绿区域名: https://devecotesting.rnd.huawei.com/smartperf/

-

3ms社区: http://3ms.huawei.com/km/groups/3956611/home?|=zh-cn

-

welink讨论群: 群1: 473395703, 群2: 485625665

+

黄区域名: https://smartperf.rnd.huawei.com/smartperf/

+

绿区域名: https://devecotesting.rnd.huawei.com/smartperf/

+

3ms社区: http://3ms.huawei.com/km/groups/3956611/home?|=zh-cn

+

welink讨论群: 群1: 473395703, 群2: 485625665

-- Gitee