diff --git a/ide/src/trace/component/chart/SpChartManager.ts b/ide/src/trace/component/chart/SpChartManager.ts index b6d0b22303576f972d80a8bb8801600831b6533c..4bfc2ced03cdeef6adf4616b2e6f4d947a090a49 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 db2c3a27b4a57a42c0aa1b538d6d0058e9a2c285..dea81fdb486d2ff96ac14561267c7ed14a972399 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 a883d44e264d12afa218911e8f79476f66b2bc4c..3b6ec7ee3aba92461672bd069dda922fcef0716b 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;