From 224e1b7b442f4944fe678a22b1308f4362f20c21 Mon Sep 17 00:00:00 2001 From: wangziyi Date: Thu, 1 Aug 2024 17:13:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E5=90=8E?= =?UTF-8?q?=E5=94=A4=E9=86=92=E5=85=B3=E7=B3=BB=E6=98=BE=E7=A4=BA=E4=B8=8D?= =?UTF-8?q?=E5=85=A8=E3=80=81=E5=88=86=E5=B8=83=E5=BC=8F=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BAcpu=E6=B3=B3=E9=81=93=E4=BB=A5=E5=8F=8A=E5=B1=95?= =?UTF-8?q?=E5=BC=80=E8=B4=9F=E8=BD=BD=E5=8C=BA=E7=82=B9=E5=87=BB=E5=A4=84?= =?UTF-8?q?=E4=B8=8B=E7=A7=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangziyi --- ide/src/trace/component/chart/SpChartManager.ts | 2 +- ide/src/trace/component/trace/base/TraceRow.ts | 6 +++++- ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ide/src/trace/component/chart/SpChartManager.ts b/ide/src/trace/component/chart/SpChartManager.ts index b6d0b2230..4bfc2ced0 100644 --- a/ide/src/trace/component/chart/SpChartManager.ts +++ b/ide/src/trace/component/chart/SpChartManager.ts @@ -261,7 +261,7 @@ export class SpChartManager { progress(`trace ${traceId} cpu`, 70); let count = await sliceSender(traceId); // @ts-ignore - await this.cpu.init(count.cpu, traceFolder, traceId); + await this.cpu.init(count.count.cpu, traceFolder, traceId); info(`initData trace ${traceId} cpu Data initialized`); progress(`trace ${traceId} cpu freq`, 75); // @ts-ignore diff --git a/ide/src/trace/component/trace/base/TraceRow.ts b/ide/src/trace/component/trace/base/TraceRow.ts index db2c3a27b..dea81fdb4 100644 --- a/ide/src/trace/component/trace/base/TraceRow.ts +++ b/ide/src/trace/component/trace/base/TraceRow.ts @@ -1536,7 +1536,11 @@ export class TraceRow extends HTMLElement { let rectY = myRect.y; let rectHeight = myRect.height; if (!inFavoriteArea && favoriteHeight !== undefined) { - y = e.offsetY + prevScrollY - 90 - favoriteHeight!; + let expand = sessionStorage.getItem('expand'); + let foldHeight = Number(sessionStorage.getItem('foldHeight')); + y = expand === 'true' ? + (e.offsetY + prevScrollY - 148 - favoriteHeight!) : + (e.offsetY + prevScrollY - (148 - foldHeight) - favoriteHeight!); rectY = this.offsetTop; rectHeight = this.clientHeight; } diff --git a/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts b/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts index a883d44e2..3b6ec7ee3 100644 --- a/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts +++ b/ide/src/trace/database/ui-worker/cpu/ProcedureWorkerCPU.ts @@ -98,7 +98,7 @@ export class CpuRender { CpuStruct.draw(req.ctx, re, req.translateY); }); req.ctx.closePath(); - if (row.traceId === Utils.currentSelectTrace) { + if ((row.traceId === Utils.currentSelectTrace) || (row.traceId === null && Utils.currentSelectTrace === undefined)) { let currentCpu = parseInt(req.type!.replace('cpu-data-', '')); let wakeup = req.type === `cpu-data-${CpuStruct.selectCpuStruct?.cpu || 0}` ? CpuStruct.selectCpuStruct : undefined; -- Gitee