From 65d18286b60edeee51e937f3398cf6c4ec3437dd Mon Sep 17 00:00:00 2001 From: zhangzepeng Date: Tue, 10 Dec 2024 14:30:22 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=991210=E4=BB=A3=E7=A0=81=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E6=B8=85=E7=90=86=E2=80=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzepeng --- ide/src/base-ui/tabs/lit-tabs.ts | 4 ++-- ide/src/statistics/util/SpStatisticsHttpUtil.ts | 9 ++++----- ide/src/trace/SpApplication.ts | 12 ++++++------ ide/src/trace/component/SpAdvertisement.ts | 6 +++--- ide/src/trace/component/SpAiAnalysisPage.ts | 16 ++++++++-------- ide/src/trace/component/SpRecordTrace.ts | 4 ++-- ide/src/trace/component/SpSystemTrace.ts | 16 ++++++++-------- ide/src/trace/component/chart/FrameChart.ts | 2 +- ide/src/trace/component/chart/SpProcessChart.ts | 2 +- ide/src/trace/component/chart/SpXpowerChart.ts | 4 ++-- .../component/trace/base/shadowRootInput.ts | 8 ++++---- .../trace/sheet/process/TabPaneSlices.ts | 6 +++--- ide/src/webSocket/WebSocketManager.ts | 4 ++-- 13 files changed, 46 insertions(+), 47 deletions(-) diff --git a/ide/src/base-ui/tabs/lit-tabs.ts b/ide/src/base-ui/tabs/lit-tabs.ts index e2014306d..f91d371b2 100644 --- a/ide/src/base-ui/tabs/lit-tabs.ts +++ b/ide/src/base-ui/tabs/lit-tabs.ts @@ -17,7 +17,7 @@ import { element } from '../BaseElement'; import { LitTabpane } from './lit-tabpane'; import { SpStatisticsHttpUtil } from '../../statistics/util/SpStatisticsHttpUtil'; import { LitTabsHtml } from './lit-tabs.html'; -import { shadowRootInput } from '../../trace/component/trace/base/shadowRootInput'; +import { ShadowRootInput } from '../../trace/component/trace/base/ShadowRootInput'; @element('lit-tabs') export class LitTabs extends HTMLElement { @@ -295,7 +295,7 @@ export class LitTabs extends HTMLElement { let tbp = this.querySelector(`lit-tabpane[key='${key}']`); if (tbp) { setTimeout(() => { - shadowRootInput.preventBubbling(tbp); + ShadowRootInput.preventBubbling(tbp); }, 500); } } diff --git a/ide/src/statistics/util/SpStatisticsHttpUtil.ts b/ide/src/statistics/util/SpStatisticsHttpUtil.ts index 42ba45b94..ff29b5394 100644 --- a/ide/src/statistics/util/SpStatisticsHttpUtil.ts +++ b/ide/src/statistics/util/SpStatisticsHttpUtil.ts @@ -185,8 +185,7 @@ export class SpStatisticsHttpUtil { }).then( res => { } ).catch(err => { - - }) + }); } static recordPluginUsage(): void { @@ -242,7 +241,7 @@ export class SpStatisticsHttpUtil { } }).catch(err => { response.status = 700; - }) + }); return response; } @@ -289,8 +288,8 @@ export class SpStatisticsHttpUtil { response.data = '请求错误'; } reject(response); - }) - }) + }); + }); } } diff --git a/ide/src/trace/SpApplication.ts b/ide/src/trace/SpApplication.ts index 62e1e7d2c..b5c4b2af2 100644 --- a/ide/src/trace/SpApplication.ts +++ b/ide/src/trace/SpApplication.ts @@ -86,7 +86,7 @@ import './component/SpAiAnalysisPage'; import { WebSocketManager } from '../webSocket/WebSocketManager'; import { SpAiAnalysisPage } from './component/SpAiAnalysisPage'; import './component/SpAdvertisement'; -import { shadowRootInput } from './component/trace/base/shadowRootInput'; +import { ShadowRootInput } from './component/trace/base/ShadowRootInput'; import { SpBubblesAI } from './component/SpBubblesAI'; @element('sp-application') @@ -2218,8 +2218,8 @@ export class SpApplication extends BaseElement { } if (node === showNode) { showNode.style.visibility = 'visible'; - let recordSetting = document.querySelector("body > sp-application")?.shadowRoot?.querySelector("#sp-record-trace")?.shadowRoot?.querySelector("#app-content > record-setting"); - shadowRootInput.preventBubbling(recordSetting!); + let recordSetting = document.querySelector('body > sp-application')?.shadowRoot?.querySelector('#sp-record-trace')?.shadowRoot?.querySelector('#app-content > record-setting'); + ShadowRootInput.preventBubbling(recordSetting!); //@ts-ignore } else if (node.id! === 'sp-ai-analysis' && node.style!.visibility! === 'visible') { return; @@ -2527,10 +2527,10 @@ export class SpApplication extends BaseElement { let a = document.createElement('a'); a.href = URL.createObjectURL(new Blob([reqBufferDB])); a.download = fileName; - await a.click(); - await this.itemIconLoading(mainMenu, 'Current Trace', 'Download Database', true); + a.click(); + this.itemIconLoading(mainMenu, 'Current Trace', 'Download Database', true); let timer = setInterval(async () => { - await this.itemIconLoading(mainMenu, 'Current Trace', 'Download Database', false); + this.itemIconLoading(mainMenu, 'Current Trace', 'Download Database', false); clearInterval(timer); }, 4000); // 存入缓存 diff --git a/ide/src/trace/component/SpAdvertisement.ts b/ide/src/trace/component/SpAdvertisement.ts index 83922144b..29af7c867 100644 --- a/ide/src/trace/component/SpAdvertisement.ts +++ b/ide/src/trace/component/SpAdvertisement.ts @@ -41,8 +41,8 @@ export class SpAdvertisement extends BaseElement { this.closeEL?.addEventListener('click', () => { this.advertisementEL!.style!.display = 'none'; localStorage.setItem('isdisplay', 'false'); - }) - } + }); + }; private getMessage(): void { SpStatisticsHttpUtil.getNotice().then(res => { @@ -76,7 +76,7 @@ export class SpAdvertisement extends BaseElement { } }).catch(err => { this.advertisementEL!.style!.display = 'none'; - }) + }); } initHtml(): string { diff --git a/ide/src/trace/component/SpAiAnalysisPage.ts b/ide/src/trace/component/SpAiAnalysisPage.ts index ee8c48995..b3fc26ffe 100644 --- a/ide/src/trace/component/SpAiAnalysisPage.ts +++ b/ide/src/trace/component/SpAiAnalysisPage.ts @@ -130,7 +130,7 @@ export class SpAiAnalysisPage extends BaseElement { aiAssistant?.style.visibility = 'hidden'; //@ts-ignore aiAssistant?.style.display = 'none'; - }) + }); // 输入框发送消息 this.inputEl?.addEventListener('keydown', (e) => { @@ -341,7 +341,7 @@ export class SpAiAnalysisPage extends BaseElement { collection: 'smart_perf_test', scope: 'smartperf' }; - let answer = await (await SpStatisticsHttpUtil.askAi(requestBody)); + let answer = await SpStatisticsHttpUtil.askAi(requestBody); if (answer.status === 200) { SpStatisticsHttpUtil.generalRecord('AI_statistic', 'large_model_q&a', []); } @@ -359,7 +359,7 @@ export class SpAiAnalysisPage extends BaseElement { } // 创建用户聊天对话气泡 - createChatBox() { + createChatBox(): void { // 生成头像 let headerDiv = document.createElement('div'); headerDiv.className = 'userHeader headerDiv'; @@ -539,7 +539,7 @@ export class SpAiAnalysisPage extends BaseElement { // 每90min重新获取token async getToken90Min(isChat: boolean): Promise { await this.getToken(isChat); - await setInterval(async () => { + setInterval(async () => { await this.getToken(isChat); }, 5400000); } @@ -553,7 +553,7 @@ export class SpAiAnalysisPage extends BaseElement { timeList: Array ): void { SpStatisticsHttpUtil.askAi({ - token: this.token, + token: this.token, // @ts-ignore question: dataList[i].description + ',请问该怎么优化？', collection: '' @@ -675,9 +675,9 @@ export class SpAiAnalysisPage extends BaseElement { // 整理数据,渲染数据 await this.renderData(dataList); } - } - } - } + }; + }; + }; // 发起诊断 initiateDiagnosis(): void { diff --git a/ide/src/trace/component/SpRecordTrace.ts b/ide/src/trace/component/SpRecordTrace.ts index 158bcd66d..d74b1c649 100644 --- a/ide/src/trace/component/SpRecordTrace.ts +++ b/ide/src/trace/component/SpRecordTrace.ts @@ -67,7 +67,7 @@ import { } from './SpRecordConfigModel'; import { SpRecordTraceHtml } from './SpRecordTrace.html'; import { SpFFRTConfig } from './setting/SpFFRTConfig'; -import { shadowRootInput } from '../../trace/component/trace/base/shadowRootInput'; +import { ShadowRootInput } from './trace/base/ShadowRootInput'; const DEVICE_NOT_CONNECT = '
1.请确认抓取设备上是否已勾选并确认总是允许smartPerf-Host调试的弹窗
' + @@ -870,7 +870,7 @@ export class SpRecordTrace extends BaseElement { clickHandler: (): void => { this.appContent!.innerHTML = ''; this.appContent!.append(configPage); - shadowRootInput.preventBubbling(configPage); + ShadowRootInput.preventBubbling(configPage); this.freshMenuItemsStatus(title); if (clickHandlerFun) { clickHandlerFun(this); diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts index ec193b177..395959078 100644 --- a/ide/src/trace/component/SpSystemTrace.ts +++ b/ide/src/trace/component/SpSystemTrace.ts @@ -1106,7 +1106,7 @@ export class SpSystemTrace extends BaseElement { // 一直按着回车键的时候执行搜索功能 continueSearch = (ev: KeyboardEvent): void => { - if(!this.keyboardEnable){ + if (!this.keyboardEnable) { return; } if (ev.key === 'Enter') { @@ -1658,14 +1658,14 @@ export class SpSystemTrace extends BaseElement { let startParentRow = startRow ? this.shadowRoot?.querySelector>(`trace-row[row-id='${startRow.rowParentId}'][folder]`) : this.shadowRoot?.querySelector>( `trace-row[row-id='${pid}'][folder]` ); - if (startParentRow && startParentRow.expansion){ - let filterRow = startParentRow?.childrenList.filter((item)=>item.rowId === tid)[0]; - !filterRow && startParentRow?.childrenList.forEach((i)=>{ - if(i.rowId === 'sameThreadProcess'){// @ts-ignore - filterRow = startParentRow?.childrenList.concat(i.childrenList).filter((item)=>item.rowId === String(tid))[0]; + if (startParentRow && startParentRow.expansion) { + let filterRow = startParentRow?.childrenList.filter((item) => item.rowId === tid)[0]; + !filterRow && startParentRow?.childrenList.forEach((i) => { + if (i.rowId === 'sameThreadProcess') {// @ts-ignore + filterRow = startParentRow?.childrenList.concat(i.childrenList).filter((item) => item.rowId === String(tid))[0]; // @ts-ignore startParentRow = filterRow!.parentRowEl!; - } + } }); } const expansionFlag = this.collectionHasThread(startRow); @@ -2019,7 +2019,7 @@ export class SpSystemTrace extends BaseElement { // 底部 tab 为 最小化 或者隐藏 时候 if (this.rowsEL!.scrollHeight > this.scrollH) { heightTimeOut = setTimeout(() => { - let litTab = this.traceSheetEL?.shadowRoot?.querySelector("#tabs"); + let litTab = this.traceSheetEL?.shadowRoot?.querySelector('#tabs'); if (this.traceSheetEL?.getAttribute('mode') === 'hidden') { this.rowsEL!.scrollTop = this.rowsEL!.scrollTop - data.delta; } diff --git a/ide/src/trace/component/chart/FrameChart.ts b/ide/src/trace/component/chart/FrameChart.ts index 69a5613be..521479ddb 100644 --- a/ide/src/trace/component/chart/FrameChart.ts +++ b/ide/src/trace/component/chart/FrameChart.ts @@ -79,7 +79,7 @@ export class FrameChart extends BaseElement { } set data(val: Array) { - this.tabPaneFilter = document.querySelector('body > sp-application')?.shadowRoot?.querySelector('#sp-system-trace')?.shadowRoot?.querySelector('div > trace-sheet')?.shadowRoot?.querySelector('#box-native-calltree > tabpane-nm-calltree')?.shadowRoot?.querySelector("#nm-call-tree-filter") as TabPaneFilter; + this.tabPaneFilter = document.querySelector('body > sp-application')?.shadowRoot?.querySelector('#sp-system-trace')?.shadowRoot?.querySelector('div > trace-sheet')?.shadowRoot?.querySelector('#box-native-calltree > tabpane-nm-calltree')?.shadowRoot?.querySelector('#nm-call-tree-filter') as TabPaneFilter; ChartStruct.lastSelectFuncStruct = undefined; this.setSelectStatusRecursive(ChartStruct.selectFuncStruct, true); ChartStruct.selectFuncStruct = undefined; diff --git a/ide/src/trace/component/chart/SpProcessChart.ts b/ide/src/trace/component/chart/SpProcessChart.ts index 925c8d0a3..8876d6966 100644 --- a/ide/src/trace/component/chart/SpProcessChart.ts +++ b/ide/src/trace/component/chart/SpProcessChart.ts @@ -1144,7 +1144,7 @@ export class SpProcessChart { differentThreadList.length && this.addDifferentThread(it, pRow, expectedRow, actualRow, soRow, startupRow, differentThreadList, traceId!); if (sameThreadList.length) { - let sameThreadFolder = await this.initSameThreadFolder(it, pRow, sameThreadList, traceId!); + let sameThreadFolder = this.initSameThreadFolder(it, pRow, sameThreadList, traceId!); if (sameThreadFolder) { pRow.addChildTraceRow(this.sameThreadFolder); this.addProcessRowListener(this.sameThreadFolder, actualRow); diff --git a/ide/src/trace/component/chart/SpXpowerChart.ts b/ide/src/trace/component/chart/SpXpowerChart.ts index f933b4c6c..92df2496e 100644 --- a/ide/src/trace/component/chart/SpXpowerChart.ts +++ b/ide/src/trace/component/chart/SpXpowerChart.ts @@ -78,7 +78,7 @@ export class SpXpowerChart { }; this.rowFolder = xpowerFolder; this.trace.rowsEL?.appendChild(xpowerFolder); - } + }; initSystemFolder = async (traceId?: string): Promise => { let systemFolder = TraceRow.skeleton(traceId); @@ -111,7 +111,7 @@ export class SpXpowerChart { }; this.systemFolder = systemFolder; this.rowFolder?.addChildTraceRow(systemFolder); - } + }; private xpowerSupplierFrame( traceRow: TraceRow, diff --git a/ide/src/trace/component/trace/base/shadowRootInput.ts b/ide/src/trace/component/trace/base/shadowRootInput.ts index c9e4c76e7..5664b8776 100644 --- a/ide/src/trace/component/trace/base/shadowRootInput.ts +++ b/ide/src/trace/component/trace/base/shadowRootInput.ts @@ -14,9 +14,9 @@ */ import { BaseElement } from '../../../../base-ui/BaseElement'; import { SpSystemTrace } from '../../SpSystemTrace'; -export class shadowRootInput { - public static preventBubbling(page: BaseElement | Element) { - let pageInputList = shadowRootInput.findInputListInShadowDOM(page); +export class ShadowRootInput { + public static preventBubbling(page: BaseElement | Element): void { + let pageInputList = ShadowRootInput.findInputListInShadowDOM(page); let sp = document?.querySelector('body > sp-application')?.shadowRoot?.querySelector('#sp-system-trace') as SpSystemTrace; pageInputList.forEach(input => { input.addEventListener('focus', (e) => { @@ -32,7 +32,7 @@ export class shadowRootInput { let inputList: Element[] = []; while (queue.length > 0) { let currentNode = queue.shift(); // 从队列中取出一个节点 - if (!currentNode) continue; + if (!currentNode) { continue }; if (currentNode.tagName === 'INPUT') { inputList.push(currentNode); } diff --git a/ide/src/trace/component/trace/sheet/process/TabPaneSlices.ts b/ide/src/trace/component/trace/sheet/process/TabPaneSlices.ts index 49509b0b0..8af987c6a 100644 --- a/ide/src/trace/component/trace/sheet/process/TabPaneSlices.ts +++ b/ide/src/trace/component/trace/sheet/process/TabPaneSlices.ts @@ -89,11 +89,11 @@ export class TabPaneSlices extends BaseElement { data = evt.detail.data; }); this.slicesTbl!.addEventListener('click', () => { - if(!this.isDbClick){ + if (!this.isDbClick) { this.isDbClick = true; FuncStruct.funcSelect = false; - // @ts-ignore - data && this.orgnazitionData(data); + // @ts-ignore + data && this.orgnazitionData(data); } }); this.slicesTbl!.addEventListener('contextmenu', () => { diff --git a/ide/src/webSocket/WebSocketManager.ts b/ide/src/webSocket/WebSocketManager.ts index cb9689055..3bbfbd434 100644 --- a/ide/src/webSocket/WebSocketManager.ts +++ b/ide/src/webSocket/WebSocketManager.ts @@ -134,7 +134,7 @@ export class WebSocketManager { }/application/extend/hi-smart-perf-host-extend-update.zip`; fetch(url).then(response => { if (!response.ok) { - throw new Error("No corresponding upgrade compression package found"); + throw new Error('No corresponding upgrade compression package found'); } return response.arrayBuffer(); }).then((arrayBuffer) => { @@ -154,7 +154,7 @@ export class WebSocketManager { if (!WebSocketManager.instance) { new WebSocketManager(); } - return WebSocketManager.instance + return WebSocketManager.instance; } // WebSocket是否登录成功 -- Gitee