From c02de9779255e6fd03195d96a63f1293fe896898 Mon Sep 17 00:00:00 2001
From: "wupoli3@huawei.com" <wupoli3@huawei.com>
Date: Fri, 2 Aug 2024 15:46:00 +0800
Subject: [PATCH 1/2] search issue fixed

Signed-off-by: wupoli3@huawei.com <wupoli3@huawei.com>
---
 ide/src/trace/SpApplication.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ide/src/trace/SpApplication.ts b/ide/src/trace/SpApplication.ts
index e37aac6a5..b76f0df68 100644
--- a/ide/src/trace/SpApplication.ts
+++ b/ide/src/trace/SpApplication.ts
@@ -1937,7 +1937,7 @@ export class SpApplication extends BaseElement {
       } else {
         this.progressEL!.loading = false;
       }
-      if (this.litSearch!.index > 0) {
+      if (this.litSearch!.list.length > 0) {
         let currentEntry = this.litSearch!.list[this.litSearch!.index];
         cancelCurrentTraceRowHighlight(this.spSystemTrace!, currentEntry);
       }
-- 
Gitee


From a444c3ee5d476b10903c65a6e1185715e0b33ed2 Mon Sep 17 00:00:00 2001
From: "wupoli3@huawei.com" <wupoli3@huawei.com>
Date: Thu, 8 Aug 2024 10:06:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A1=86=E9=80=89=E5=90=8E=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9name=E6=90=9C=E7=B4=A2=E5=90=8E=EF=BC=8C=E6=A1=86?=
 =?UTF-8?q?=E9=80=89=E5=8C=BA=E5=9F=9F=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=8B=96?=
 =?UTF-8?q?=E5=8A=A8=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wupoli3@huawei.com <wupoli3@huawei.com>
---
 ide/src/trace/component/SpSystemTrace.event.ts | 6 ++++--
 ide/src/trace/component/SpSystemTrace.init.ts  | 1 +
 ide/src/trace/component/SpSystemTrace.ts       | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ide/src/trace/component/SpSystemTrace.event.ts b/ide/src/trace/component/SpSystemTrace.event.ts
index e633f754b..355c6a0bb 100644
--- a/ide/src/trace/component/SpSystemTrace.event.ts
+++ b/ide/src/trace/component/SpSystemTrace.event.ts
@@ -518,12 +518,14 @@ export function spSystemTraceDocumentOnMouseMove(sp: SpSystemTrace, ev: MouseEve
   handleActions(sp, rows, ev);
 }
 
-function spSystemTraceDocumentOnMouseMoveMouseDown(sp: SpSystemTrace, search: LitSearch): void {
+export function spSystemTraceDocumentOnMouseMoveMouseDown(sp: SpSystemTrace, search: LitSearch): void {
   sp.refreshCanvas(true, 'sp move down');
   if (TraceRow.rangeSelectObject) {
     if (search && search.searchValue !== '') {
       search.clear();
-      search.valueChangeHandler?.('');
+      sp?.visibleRows.forEach((it) => {
+        it.highlight = false;
+      });
     }
   }
 }
diff --git a/ide/src/trace/component/SpSystemTrace.init.ts b/ide/src/trace/component/SpSystemTrace.init.ts
index 6a73dbc21..39805c3a0 100644
--- a/ide/src/trace/component/SpSystemTrace.init.ts
+++ b/ide/src/trace/component/SpSystemTrace.init.ts
@@ -579,6 +579,7 @@ function selectHandlerRows(sp: SpSystemTrace, rows: Array<TraceRow<unknown>>): v
   }
   sp.timerShaftEL!.selectionList.push(selection); // 保持选中对象，为后面的再次选中该框选区域做准备。
   sp.selectionParam = selection;
+  sp.refreshCanvas(true);
 }
 function resizeObserverHandler(sp: SpSystemTrace): void {
   // @ts-ignore
diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts
index 74c893600..ccbaf82b6 100644
--- a/ide/src/trace/component/SpSystemTrace.ts
+++ b/ide/src/trace/component/SpSystemTrace.ts
@@ -125,6 +125,7 @@ import spSystemTraceOnClickHandler, {
   spSystemTraceDocumentOnMouseMove,
   spSystemTraceDocumentOnMouseOut,
   spSystemTraceDocumentOnMouseUp,
+  spSystemTraceDocumentOnMouseMoveMouseDown,
 } from './SpSystemTrace.event';
 import { SampleStruct } from '../database/ui-worker/ProcedureWorkerBpftrace';
 import { readTraceFileBuffer } from '../SpApplicationPublicFunc';
@@ -132,6 +133,7 @@ import { PerfToolStruct } from '../database/ui-worker/ProcedureWorkerPerfTool';
 import { BaseStruct } from '../bean/BaseStruct';
 import { GpuCounterStruct } from '../database/ui-worker/ProcedureWorkerGpuCounter';
 import { SpProcessChart } from './chart/SpProcessChart';
+import { LitSearch } from './trace/search/Search';
 
 function dpr(): number {
   return window.devicePixelRatio || 1;
@@ -1164,6 +1166,10 @@ export class SpSystemTrace extends BaseElement {
       }
     }
     this.rangeTraceRow = rows;
+    let search = document.querySelector('body > sp-application')!.shadowRoot!.querySelector<LitSearch>('#lit-search');
+    if(search?.isClearValue) {
+      spSystemTraceDocumentOnMouseMoveMouseDown(this, search!);
+    }
     this.rangeSelect.selectHandler?.(this.rangeSelect.rangeTraceRow, false);
   };
   inFavoriteArea: boolean | undefined;
-- 
Gitee