diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts index bd4bac7e0372877a040ae373a9609980262eda2d..abc03fdbf409e02967913e9ffa6d66843fb840a0 100644 --- a/ide/src/trace/component/SpSystemTrace.ts +++ b/ide/src/trace/component/SpSystemTrace.ts @@ -3934,13 +3934,17 @@ export class SpSystemTrace extends BaseElement { } } } else { - findIndex = structs.findIndex((it, idx) => { - return ( - idx > currentIndex && - it.startTime! >= TraceRow.range!.startNS && - it.startTime! + it.dur! <= TraceRow.range!.endNS - ); - }); + if(currentIndex==-1) { + findIndex=0 + }else{ + findIndex = structs.findIndex((it, idx) => { + return ( + idx > currentIndex && + it.startTime! >= TraceRow.range!.startNS && + it.startTime! + it.dur! <= TraceRow.range!.endNS + ); + }); + } } let findEntry: any; if (findIndex >= 0) { diff --git a/ide/src/trace/component/trace/search/Search.ts b/ide/src/trace/component/trace/search/Search.ts index 9f7fd24539c8dccd4510d28e5ac50677b1df5cb9..24454769724250b718525a674e4eda1fcd84ba90 100644 --- a/ide/src/trace/component/trace/search/Search.ts +++ b/ide/src/trace/component/trace/search/Search.ts @@ -34,6 +34,7 @@ export class LitSearch extends BaseElement { private searchELList: Array = []; //定义翻页index private retarget_index: number = 0; + private _retarge_index: HTMLInputElement | null | undefined; get list(): Array { return this._list; @@ -225,7 +226,7 @@ export class LitSearch extends BaseElement { this.indexEL = this.shadowRoot!.querySelector('#index'); this.searchHistoryListEL = this.shadowRoot!.querySelector('.search-history-list'); - let _retarge_index = this.shadowRoot!.querySelector("input[name='retarge_index']") + this._retarge_index = this.shadowRoot!.querySelector("input[name='retarge_index']"); let _root = this.shadowRoot!.querySelector(".root") let _prompt = this.shadowRoot!.querySelector("#prompt") @@ -237,8 +238,11 @@ export class LitSearch extends BaseElement { }); this.search!.addEventListener('change', (event) => { this.index = -1; + this._retarge_index!.value = "" }); this.search!.addEventListener('keyup', (e: KeyboardEvent) => { + this._retarge_index!.value = "" + this.index = -1; this.searchKeyupListener(e); }); this.shadowRoot?.querySelector('#arrow-left')?.addEventListener('click', (e) => { @@ -263,7 +267,7 @@ export class LitSearch extends BaseElement { // 添加翻页监听事件 this.shadowRoot?.querySelector("input[name='retarge_index']")?.addEventListener('keyup', (e: any) => { if (e.keyCode == 13) { - this.retarget_index = Number(_retarge_index!.value) + this.retarget_index = Number(this._retarge_index!.value) if (this.retarget_index <= this._list.length && this.retarget_index != 0) { this.dispatchEvent( new CustomEvent('retarget-data', { @@ -281,7 +285,7 @@ export class LitSearch extends BaseElement { setTimeout(() => { _prompt!.style.display = 'none'; _root!.style.display = 'flex'; - _retarge_index!.value = "" + this._retarge_index!.value = "" }, 2000) } @@ -412,7 +416,7 @@ export class LitSearch extends BaseElement { @@ -446,8 +450,13 @@ export class LitSearch extends BaseElement { searchInfoOption.textContent = historyInfo.searchContent; searchInfoOption.addEventListener('click', () => { if (searchInfoOption.textContent) { + let flag=this.search!.value this.search!.value = searchInfoOption.textContent; this.valueChangeHandler?.(this.search!.value); + if(flag!=searchInfoOption.textContent) { + this._retarge_index!.value = "" + this.index=-1 + } } }); searchContainer.append(searchInfoOption);