From 109a3e9c27573f5a08d6ef078a9cd356b18a9f26 Mon Sep 17 00:00:00 2001 From: luyuxuan418 Date: Thu, 16 Nov 2023 14:34:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=8F=E6=84=9F=E8=AF=8D=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=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 --- ide/src/base-ui/slider/LitSlider.ts | 2 +- ide/src/base-ui/tabs/lit-tabs.ts | 16 ++++++++-------- ide/src/trace/SpApplication.ts | 8 ++++---- ide/src/trace/component/SpFlags.ts | 4 ++-- ide/src/trace/component/SpHelp.ts | 4 ++-- ide/src/trace/component/SpKeyboard.ts | 4 ++-- ide/src/trace/component/SpRecordTrace.ts | 4 ++-- ide/src/trace/component/SpSystemTrace.ts | 6 +++--- ide/src/trace/component/StackBar.ts | 10 +++++----- .../schedulingAnalysis/Top20FrequencyThread.ts | 4 ++-- .../component/trace/base/CustomThemeColor.ts | 2 +- ide/src/trace/component/trace/base/TraceRow.ts | 18 +++++++++--------- .../trace/base/TraceRowRecyclerView.ts | 16 ++++++++-------- .../trace/component/trace/base/TraceSheet.ts | 6 +++--- ide/src/trace/component/trace/search/Search.ts | 10 +++++----- .../trace/sheet/ark-ts/TabPaneSummary.ts | 6 +++--- ide/src/trace/grpc/ProfilerController.ts | 2 +- .../trace/base/TraceRowRecyclerView.test.ts | 2 +- .../trace/sheet/hilog/TabPaneHilogs.test.ts | 6 +++--- ide/test/trace/grpc/ProfilerController.test.ts | 4 ++-- trace_streamer/.clang-format | 2 +- .../test/unittest/animation_filter_test.cpp | 1 - 22 files changed, 68 insertions(+), 69 deletions(-) diff --git a/ide/src/base-ui/slider/LitSlider.ts b/ide/src/base-ui/slider/LitSlider.ts index eeb8b428..c608bec9 100644 --- a/ide/src/base-ui/slider/LitSlider.ts +++ b/ide/src/base-ui/slider/LitSlider.ts @@ -178,7 +178,7 @@ export class LitSlider extends BaseElement { pointer-events:none; } /* - * Currently the entire sliding container is controlled + * Currently the entire sliding vessel is controlled */ #slider-con{ cursor:pointer; diff --git a/ide/src/base-ui/tabs/lit-tabs.ts b/ide/src/base-ui/tabs/lit-tabs.ts index e4ff18d9..34ba64b3 100644 --- a/ide/src/base-ui/tabs/lit-tabs.ts +++ b/ide/src/base-ui/tabs/lit-tabs.ts @@ -95,8 +95,8 @@ export class LitTabs extends HTMLElement { position:absolute; } - :host(:not([position])) .tab-nav-container, - :host([position^='top']) .tab-nav-container{ + :host(:not([position])) .tab-nav-vessel, + :host([position^='top']) .tab-nav-vessel{ display: flex; /*position: relative;*/ /*flex-direction: column;*/ @@ -185,7 +185,7 @@ export class LitTabs extends HTMLElement { transform: translateY(-100%); transition: all 0.3s; } - :host([position^='bottom']) .tab-nav-container{ + :host([position^='bottom']) .tab-nav-vessel{ display: flex; position: relative; flex-direction: column; @@ -252,7 +252,7 @@ export class LitTabs extends HTMLElement { transform: translateX(100%); transition: all 0.3s; } - :host([position^='left']) .tab-nav-container{ + :host([position^='left']) .tab-nav-vessel{ display: flex; position: relative; flex-direction: row; @@ -325,7 +325,7 @@ export class LitTabs extends HTMLElement { transform: translateX(-100%); transition: all 0.3s; } - :host([position^='right']) .tab-nav-container{ + :host([position^='right']) .tab-nav-vessel{ display: flex; position: relative; flex-direction: row-reverse; @@ -384,7 +384,7 @@ export class LitTabs extends HTMLElement { } - .tab-nav-container::-webkit-scrollbar { + .tab-nav-vessel::-webkit-scrollbar { display: none; } @@ -411,7 +411,7 @@ export class LitTabs extends HTMLElement {
-
+
@@ -649,7 +649,7 @@ export class LitTabs extends HTMLElement { new ResizeObserver((entries) => { let filling = this.shadowRoot!.querySelector('#tab-filling'); - this.shadowRoot!.querySelector('.tab-nav-container')!.style.height = filling!.offsetWidth + 'px'; + this.shadowRoot!.querySelector('.tab-nav-vessel')!.style.height = filling!.offsetWidth + 'px'; }).observe(this.shadowRoot!.querySelector('#tab-filling')!); } diff --git a/ide/src/trace/SpApplication.ts b/ide/src/trace/SpApplication.ts index 8ad2fe85..3c4e3cae 100644 --- a/ide/src/trace/SpApplication.ts +++ b/ide/src/trace/SpApplication.ts @@ -260,7 +260,7 @@ export class SpApplication extends BaseElement { box-shadow: 4px 0px 20px rgba(0,0,0,0.05); z-index: 2000; } - .search-container{ + .search-vessel{ z-index: 10; position: relative; cursor: default; @@ -272,10 +272,10 @@ export class SpApplication extends BaseElement { left: 0; right: 0; } - :host(:not([search])) .search-container { + :host(:not([search])) .search-vessel { display: none; } - :host(:not([search])) .search-container .search { + :host(:not([search])) .search-vessel .search { background-color: var(--dark-background5,#F6F6F6); } .search{ @@ -507,7 +507,7 @@ export class SpApplication extends BaseElement { -
+
+

Feature flags

@@ -40,7 +40,7 @@ export class SpFlags extends BaseElement { private initHtmlStyle(): string { return ` -
+
diff --git a/ide/src/trace/component/SpKeyboard.ts b/ide/src/trace/component/SpKeyboard.ts index 40c05d1c..45a30f51 100644 --- a/ide/src/trace/component/SpKeyboard.ts +++ b/ide/src/trace/component/SpKeyboard.ts @@ -39,7 +39,7 @@ export class SpKeyboard extends BaseElement { initHtml(): string { return ` ${this.initHtmlStyle()} -
+
@@ -156,7 +156,7 @@ export class SpKeyboard extends BaseElement { height : 100%; background-color: rgba(0, 0, 0, 0.8); } - .sp-keyboard-container { + .sp-keyboard-vessel { width: 100%; height: 100%; display: flex; diff --git a/ide/src/trace/component/SpRecordTrace.ts b/ide/src/trace/component/SpRecordTrace.ts index 053f5b47..3d16f200 100644 --- a/ide/src/trace/component/SpRecordTrace.ts +++ b/ide/src/trace/component/SpRecordTrace.ts @@ -1835,7 +1835,7 @@ export class SpRecordTrace extends BaseElement { width: 100%; background-color: var(--dark-background5,#F6F6F6); } - .container { + .vessel { background-color: var(--dark-background5,#F6F6F6); height:100%; } @@ -1975,7 +1975,7 @@ export class SpRecordTrace extends BaseElement { opacity: 0.6; } -
+
Target Platform: diff --git a/ide/src/trace/component/SpSystemTrace.ts b/ide/src/trace/component/SpSystemTrace.ts index f909b021..58f20d8e 100644 --- a/ide/src/trace/component/SpSystemTrace.ts +++ b/ide/src/trace/component/SpSystemTrace.ts @@ -4576,10 +4576,10 @@ export class SpSystemTrace extends BaseElement { background: var(--dark-background4,#ffffff); /*scroll-behavior: smooth;*/ } - :host([disable]) .container{ + :host([disable]) .vessel{ pointer-events: none; } - .container{ + .vessel{ width: 100%; box-sizing: border-box; height: 100%; @@ -4637,7 +4637,7 @@ export class SpSystemTrace extends BaseElement { } -
+
diff --git a/ide/src/trace/component/StackBar.ts b/ide/src/trace/component/StackBar.ts index 02a74e56..ed7f1c97 100644 --- a/ide/src/trace/component/StackBar.ts +++ b/ide/src/trace/component/StackBar.ts @@ -19,7 +19,7 @@ import { Utils } from './trace/base/Utils.js'; @element('stack-bar') export class StackBar extends BaseElement { - private container: HTMLDivElement | undefined | null; + private vessel: HTMLDivElement | undefined | null; static get observedAttributes() { return ['mode']; // max min hidden show 三种状态 @@ -50,14 +50,14 @@ export class StackBar extends BaseElement { } } arr.sort((a, b) => a.value - b.value); - this.container!.innerHTML = ''; + this.vessel!.innerHTML = ''; for (let stackValue of arr) { - this.container!.appendChild(this.createBarElement(stackValue, totalDuration)); + this.vessel!.appendChild(this.createBarElement(stackValue, totalDuration)); } } initElements(): void { - this.container = this.shadowRoot?.querySelector('#container'); + this.vessel = this.shadowRoot?.querySelector('#vessel'); } initHtml(): string { @@ -74,7 +74,7 @@ export class StackBar extends BaseElement { width: 10%;display: inline-block;overflow: hidden;white-space: nowrap;padding: 5px; margin-right: 2px;font-size: 9pt; } -
+
`; } diff --git a/ide/src/trace/component/schedulingAnalysis/Top20FrequencyThread.ts b/ide/src/trace/component/schedulingAnalysis/Top20FrequencyThread.ts index 355a2ac6..a04d1762 100644 --- a/ide/src/trace/component/schedulingAnalysis/Top20FrequencyThread.ts +++ b/ide/src/trace/component/schedulingAnalysis/Top20FrequencyThread.ts @@ -196,7 +196,7 @@ export class Top20FrequencyThread extends BaseElement { ], }; this.frequencyThreadProgress!.loading = false; - this.shadowRoot!.querySelector('#tb_container')!.scrollTop = 0; + this.shadowRoot!.querySelector('#tb_vessel')!.scrollTop = 0; }); } @@ -284,7 +284,7 @@ export class Top20FrequencyThread extends BaseElement {
-
+
diff --git a/ide/src/trace/component/trace/base/CustomThemeColor.ts b/ide/src/trace/component/trace/base/CustomThemeColor.ts index ffad6070..f743e957 100644 --- a/ide/src/trace/component/trace/base/CustomThemeColor.ts +++ b/ide/src/trace/component/trace/base/CustomThemeColor.ts @@ -335,7 +335,7 @@ export class CustomThemeColor extends BaseElement { color: white; } -
+
Color Setting diff --git a/ide/src/trace/component/trace/base/TraceRow.ts b/ide/src/trace/component/trace/base/TraceRow.ts index 17e22066..cf26e3d9 100644 --- a/ide/src/trace/component/trace/base/TraceRow.ts +++ b/ide/src/trace/component/trace/base/TraceRow.ts @@ -136,7 +136,7 @@ export class TraceRow extends HTMLElement { public sliceCache: number[] = [-1, -1]; public describeEl: HTMLElement | null | undefined; public canvas: Array = []; - public canvasContainer: HTMLDivElement | null | undefined; + public canvasVessel: HTMLDivElement | null | undefined; public tipEL: HTMLDivElement | null | undefined; public checkBoxEL: LitCheckBox | null | undefined; public collectEL: LitIcon | null | undefined; @@ -641,7 +641,7 @@ export class TraceRow extends HTMLElement { this.describeEl = this.shadowRoot?.querySelector('.describe'); this.folderIconEL = this.shadowRoot?.querySelector('.icon'); this.nameEL = this.shadowRoot?.querySelector('.name'); - this.canvasContainer = this.shadowRoot?.querySelector('.panel-container'); + this.canvasVessel = this.shadowRoot?.querySelector('.panel-vessel'); this.rowSettingTree = this.shadowRoot?.querySelector('#rowSettingTree'); this.rowSettingPop = this.shadowRoot?.querySelector('#rowSetting'); this.tipEL = this.shadowRoot?.querySelector('.tip'); @@ -651,8 +651,8 @@ export class TraceRow extends HTMLElement { let canvas = document.createElement('canvas'); canvas.className = 'panel'; this.canvas.push(canvas); - if (this.canvasContainer) { - this.canvasContainer.appendChild(canvas); + if (this.canvasVessel) { + this.canvasVessel.appendChild(canvas); } } } @@ -930,7 +930,7 @@ export class TraceRow extends HTMLElement { } if (this.tipEL) { this.tipEL.style.display = 'flex'; - if (x + this.tipEL.clientWidth > (this.canvasContainer!.clientWidth || 0)) { + if (x + this.tipEL.clientWidth > (this.canvasVessel!.clientWidth || 0)) { this.tipEL.style.transform = `translateX(${x - this.tipEL.clientWidth - 1}px)`; } else { this.tipEL.style.transform = `translateX(${x}px)`; @@ -1206,7 +1206,7 @@ export class TraceRow extends HTMLElement { background-color: transparent; display: block; } - .panel-container{ + .panel-vessel{ width: 100%; position: relative; pointer-events: none; @@ -1269,7 +1269,7 @@ export class TraceRow extends HTMLElement { border-right: 0px; background-color: var(--bark-expansion,#0C65D1); } - :host([expansion]:not(sleeping)) .panel-container{ + :host([expansion]:not(sleeping)) .panel-vessel{ display: none; } :host([expansion]) .children{ @@ -1290,7 +1290,7 @@ export class TraceRow extends HTMLElement { :host([sleeping]) .describe{ display: none; } - :host([sleeping]) .panel-container{ + :host([sleeping]) .panel-vessel{ display: none; } :host([sleeping]) .children{ @@ -1299,7 +1299,7 @@ export class TraceRow extends HTMLElement { :host(:not([sleeping])) .describe{ display: flex;; } - :host(:not([sleeping])) .panel-container{ + :host(:not([sleeping])) .panel-vessel{ display: block; } :host(:not([sleeping])) .children{ diff --git a/ide/src/trace/component/trace/base/TraceRowRecyclerView.ts b/ide/src/trace/component/trace/base/TraceRowRecyclerView.ts index d5817dfa..6b242748 100644 --- a/ide/src/trace/component/trace/base/TraceRowRecyclerView.ts +++ b/ide/src/trace/component/trace/base/TraceRowRecyclerView.ts @@ -21,7 +21,7 @@ import { log } from '../../../../log/Log.js'; export class TraceRowRecyclerView extends BaseElement { private recycler: boolean = true; private gasketEL: HTMLDivElement | null | undefined; - private container: HTMLDivElement | null | undefined; + private vessel: HTMLDivElement | null | undefined; private visibleRowsCount: number = 0; private visibleObjects: TraceRowObject[] = []; private totalHeight: number = 0; @@ -76,11 +76,11 @@ export class TraceRowRecyclerView extends BaseElement { } initElements(): void { - this.container = this.shadowRoot?.querySelector('.container'); + this.vessel = this.shadowRoot?.querySelector('.vessel'); this.gasketEL = this.shadowRoot?.querySelector('.gasket'); let els: Array> | undefined | null; - this.container!.onscroll = (ev) => { - let top = this.container!.scrollTop; + this.vessel!.onscroll = (ev) => { + let top = this.vessel!.scrollTop; let skip = 0; for (let index = 0; index < this.visibleObjects.length; index++) { if (this.visibleObjects[index].top >= top) { @@ -125,7 +125,7 @@ export class TraceRowRecyclerView extends BaseElement { isOffScreen: true, }); el.className = 'recycler-cell'; - this.container?.appendChild(el); + this.vessel?.appendChild(el); el.addEventListener('expansion-change', (ev: any) => { el.obj!.expansion = ev.detail.expansion; for (let j = 0; j < this.dataSource.length; j++) { @@ -135,7 +135,7 @@ export class TraceRowRecyclerView extends BaseElement { } this.measureHeight(); let els = [...this.shadowRoot!.querySelectorAll>('.recycler-cell')]; - let top = this.container!.scrollTop; + let top = this.vessel!.scrollTop; let skip = 0; for (let i = 0; i < this.visibleObjects.length; i++) { if (this.visibleObjects[i].top >= top) { @@ -161,7 +161,7 @@ export class TraceRowRecyclerView extends BaseElement { display: block; position:relative; } - .container{ + .vessel{ width:100%; height:100%; overflow: auto; @@ -185,7 +185,7 @@ export class TraceRowRecyclerView extends BaseElement { left: 0; } -
+
diff --git a/ide/src/trace/component/trace/base/TraceSheet.ts b/ide/src/trace/component/trace/base/TraceSheet.ts index 8f615893..d1ff74b5 100644 --- a/ide/src/trace/component/trace/base/TraceSheet.ts +++ b/ide/src/trace/component/trace/base/TraceSheet.ts @@ -256,14 +256,14 @@ export class TraceSheet extends BaseElement { } connectedCallback(): void { - this.nav = this.shadowRoot?.querySelector('#tabs')?.shadowRoot?.querySelector('.tab-nav-container'); + this.nav = this.shadowRoot?.querySelector('#tabs')?.shadowRoot?.querySelector('.tab-nav-vessel'); let tabs: HTMLDivElement | undefined | null = this.shadowRoot?.querySelector('#tabs'); let navRoot: HTMLDivElement | null | undefined = this.shadowRoot ?.querySelector('#tabs') ?.shadowRoot?.querySelector('.nav-root'); let search: HTMLDivElement | undefined | null = document .querySelector('body > sp-application') - ?.shadowRoot?.querySelector('div > div.search-container'); + ?.shadowRoot?.querySelector('div > div.search-vessel'); let timerShaft: HTMLDivElement | undefined | null = this.parentElement?.querySelector('.timer-shaft'); let spacer: HTMLDivElement | undefined | null = this.parentElement?.querySelector('.spacer'); let rowsPaneEL: HTMLDivElement | undefined | null = this.parentElement?.querySelector('.rows-pane'); @@ -452,7 +452,7 @@ export class TraceSheet extends BaseElement { z-index: 2; } -
+
diff --git a/ide/src/trace/component/trace/search/Search.ts b/ide/src/trace/component/trace/search/Search.ts index ca4a4517..e8ec4332 100644 --- a/ide/src/trace/component/trace/search/Search.ts +++ b/ide/src/trace/component/trace/search/Search.ts @@ -438,8 +438,8 @@ export class LitSearch extends BaseElement { let historyInfos = this.getSearchHistory(); let fragment = document.createElement('div'); historyInfos.forEach((historyInfo) => { - let searchContainer = document.createElement('div'); - searchContainer.className = 'search-list'; + let searchVessel = document.createElement('div'); + searchVessel.className = 'search-list'; let searchInfoOption = document.createElement('li'); let closeOption = document.createElement('lit-icon'); closeOption.setAttribute('name', 'close'); @@ -458,11 +458,11 @@ export class LitSearch extends BaseElement { } } }); - searchContainer.append(searchInfoOption); - searchContainer.append(closeOption); + searchVessel.append(searchInfoOption); + searchVessel.append(closeOption); this.searchELList.push(searchInfoOption); this.searchELList.push(closeOption); - fragment.append(searchContainer); + fragment.append(searchVessel); }); this.searchHistoryListEL?.append(fragment); if (this.searchList.length > 0) { diff --git a/ide/src/trace/component/trace/sheet/ark-ts/TabPaneSummary.ts b/ide/src/trace/component/trace/sheet/ark-ts/TabPaneSummary.ts index dfc02f4c..473b7ed4 100644 --- a/ide/src/trace/component/trace/sheet/ark-ts/TabPaneSummary.ts +++ b/ide/src/trace/component/trace/sheet/ark-ts/TabPaneSummary.ts @@ -633,18 +633,18 @@ export class TabPaneSummary extends BaseElement { padding: 10px 1px 0 0px; height: calc(100% - 25px); } - .container { + .vessel { /* overflow: hidden; */ width: 100%; height: 100%; } - .container-left { + .vessel-left { height: 79.5vh; position: relative; float: left; max-width: 70% } - .container-right { + .vessel-right { height: 70vh; box-sizing: border-box; overflow: hidden; diff --git a/ide/src/trace/grpc/ProfilerController.ts b/ide/src/trace/grpc/ProfilerController.ts index ab8a568b..cac95cc1 100644 --- a/ide/src/trace/grpc/ProfilerController.ts +++ b/ide/src/trace/grpc/ProfilerController.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -export class ClientContainer { +export class ClientVessel { private _port: string | number | undefined; private _host: string | undefined; diff --git a/ide/test/trace/component/trace/base/TraceRowRecyclerView.test.ts b/ide/test/trace/component/trace/base/TraceRowRecyclerView.test.ts index 3b4aba29..62a178e2 100644 --- a/ide/test/trace/component/trace/base/TraceRowRecyclerView.test.ts +++ b/ide/test/trace/component/trace/base/TraceRowRecyclerView.test.ts @@ -93,7 +93,7 @@ describe('TraceRow Test', () => { it('Test10', function () { let traceRow = new TraceRowRecyclerView(); let mouseScrollEvent: MouseEvent = new MouseEvent('scroll', { clientX: 1, clientY: 2 }); - traceRow.container.dispatchEvent(mouseScrollEvent); + traceRow.vessel.dispatchEvent(mouseScrollEvent); }); }); diff --git a/ide/test/trace/component/trace/sheet/hilog/TabPaneHilogs.test.ts b/ide/test/trace/component/trace/sheet/hilog/TabPaneHilogs.test.ts index 63cda0b5..2c9ed3af 100644 --- a/ide/test/trace/component/trace/sheet/hilog/TabPaneHilogs.test.ts +++ b/ide/test/trace/component/trace/sheet/hilog/TabPaneHilogs.test.ts @@ -59,9 +59,9 @@ describe('TabPaneHilogs Test', (): void => { TraceRow.range!.endNS = jest.fn(() => 27763331331); TraceRow.range!.totalNS = jest.fn(() => 27763331331); let hiLogsTab = new TabPaneHiLogs(); - document.body.innerHTML = '
'; - let container = document.querySelector('#container'); - container!.append(hiLogsTab); + document.body.innerHTML = '
'; + let vessel = document.querySelector('#vessel'); + vessel!.append(hiLogsTab); let logsData = { leftNs: 0, rightNs: 33892044011, diff --git a/ide/test/trace/grpc/ProfilerController.test.ts b/ide/test/trace/grpc/ProfilerController.test.ts index 5de05630..516ebaa7 100644 --- a/ide/test/trace/grpc/ProfilerController.test.ts +++ b/ide/test/trace/grpc/ProfilerController.test.ts @@ -14,10 +14,10 @@ */ // @ts-ignore -import { ClientContainer, SettingRegistry } from '../../../dist/trace/grpc/ProfilerController.js'; +import { ClientVessel, SettingRegistry } from '../../../dist/trace/grpc/ProfilerController.js'; describe('HiProfilerClient Test', () => { - let profilerController = new ClientContainer(); + let profilerController = new ClientVessel(); it('ProfilerClientTest01', function () { expect(profilerController.port).toBeUndefined(); diff --git a/trace_streamer/.clang-format b/trace_streamer/.clang-format index ad9f68d7..b85d85b9 100644 --- a/trace_streamer/.clang-format +++ b/trace_streamer/.clang-format @@ -145,7 +145,7 @@ SpacesBeforeTrailingComments: 1 # 在尖括号的<后和>前添加空格 SpacesInAngles: false # 在容器(ObjC和JavaScript的数组和字典等)字面量中添加空格 -SpacesInContainerLiterals: true +SpacesInVesselLiterals: true # 在C风格类型转换的括号中添加空格 SpacesInCStyleCastParentheses: false # 在圆括号的(后和)前添加空格 diff --git a/trace_streamer/test/unittest/animation_filter_test.cpp b/trace_streamer/test/unittest/animation_filter_test.cpp index 64a283df..f4ce1f8a 100644 --- a/trace_streamer/test/unittest/animation_filter_test.cpp +++ b/trace_streamer/test/unittest/animation_filter_test.cpp @@ -57,7 +57,6 @@ HWTEST_F(AnimationFilterTest, NonRsUniProcessEvent, TestSize.Level1) "H:ProcessDisplayRenderNode[0](0,", "H:RSBaseRenderEngine::RequestFrame(RSSurface)", "H:DisplayNode:4", - "H:AddContainerDirtyToGlobalDirty", }; for (size_t i = 0; i < nonRsUniProcessEvents.size(); i++) { point.funcPrefix_ = nonRsUniProcessEvents[i]; -- Gitee