From 8597bce3091a4d47d29dfff9da4847906061f643 Mon Sep 17 00:00:00 2001 From: "OWNEROR-41FNVD0\\lenovo" Date: Thu, 15 May 2025 16:00:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/view/Home.ets | 6 ++++++ entry/src/main/ets/view/SideBarView.ets | 14 ++++++++++++-- entry/src/main/ets/view/TopTabView.ets | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/entry/src/main/ets/view/Home.ets b/entry/src/main/ets/view/Home.ets index 2184c05..8b12335 100644 --- a/entry/src/main/ets/view/Home.ets +++ b/entry/src/main/ets/view/Home.ets @@ -46,6 +46,7 @@ export struct Home { } build() { + // [Start diff_device_container] if (this.currentWidthBreakpoint === 'xl') { // Use SideBarContainer at XL breakpoint. SideBarContainer(SideBarContainerType.Embed) { @@ -80,7 +81,9 @@ export struct Home { .minSideBarWidth(240) .maxSideBarWidth(240) } else { + // [StartExclude diff_device_container] // Use Tabs and List at other breakpoints. + // [Start tab_to_page] Tabs({ barPosition: this.currentWidthBreakpoint === 'lg' ? BarPosition.Start : BarPosition.End }) { @@ -111,9 +114,12 @@ export struct Home { .onChange((index: number) => { this.firstLevelIndex = index; }) + // [End tab_to_page] .scrollable(false) .height('100%') .width('100%') + // [EndExclude diff_device_container] } + // [End diff_device_container] } } \ No newline at end of file diff --git a/entry/src/main/ets/view/SideBarView.ets b/entry/src/main/ets/view/SideBarView.ets index 5437e30..23fd2c2 100644 --- a/entry/src/main/ets/view/SideBarView.ets +++ b/entry/src/main/ets/view/SideBarView.ets @@ -25,7 +25,9 @@ export struct SideBarView { @State isShow: boolean = true; build() { + // [Start side_bar_view] Column() { + // [StartExclude side_bar_view_1] Row({ space: 8 }) { Image($r('app.media.startIcon')) .height(24) @@ -35,7 +37,7 @@ export struct SideBarView { } .padding({ left: 8 }) .height(56) - + // [EndExclude side_bar_view_1] Column({ space: 2 }) { ForEach(this.tabData.getFirstList(), (item: string, index: number) => { Column() { @@ -56,25 +58,30 @@ export struct SideBarView { .height(20) } } + // [StartExclude side_bar_view_2] .justifyContent(FlexAlign.SpaceBetween) .width('100%') .height(40) .padding({ left: 8 }) - + // [EndExclude side_bar_view_2] Column({ space: 2 }) { ForEach(this.tabData.getSecondList(item), (item: string, index: number) => { Row() { Text(item) + // [StartExclude side_bar_view_3] .fontSize('16fp') .fontWeight(index === this.secondLevelIndex ? FontWeight.Bold : FontWeight.Medium) .margin({ left: 40 }) + // [EndExclude side_bar_view_3] } + // [StartExclude side_bar_view_4] .width('100%') .height(40) .borderRadius(8) .backgroundColor(index === this.secondLevelIndex ? '#1A0A59F7' : '#00FFFFFF') + // [EndExclude side_bar_view_4] .onClick(() => { this.secondLevelIndex = index; }) @@ -93,6 +100,7 @@ export struct SideBarView { } .alignItems(HorizontalAlign.Start) } + // [StartExclude side_bar_view_5] .alignItems(HorizontalAlign.Start) .backgroundColor('#0D000000') .padding({ @@ -101,5 +109,7 @@ export struct SideBarView { }) .height('100%') .width('100%') + // [EndExclude side_bar_view_5] + // [End side_bar_view] } } \ No newline at end of file diff --git a/entry/src/main/ets/view/TopTabView.ets b/entry/src/main/ets/view/TopTabView.ets index c1b2558..ba5f4af 100644 --- a/entry/src/main/ets/view/TopTabView.ets +++ b/entry/src/main/ets/view/TopTabView.ets @@ -26,6 +26,7 @@ export struct TopTabView { private firstLevel: string = getContext(this).resourceManager.getStringSync($r('app.string.tab_home').id); build() { + // [Start top_tab_view] Column() { List() { ForEach(this.tabData.getSecondList(this.firstLevel), (item: string, index: number) => { @@ -71,5 +72,6 @@ export struct TopTabView { .padding({ top: 30 }) + // [End top_tab_view] } } \ No newline at end of file -- Gitee From 27c27809fccd0f767b0c353f23c0a6c07c7d8f82 Mon Sep 17 00:00:00 2001 From: "OWNEROR-41FNVD0\\lenovo" Date: Sat, 17 May 2025 15:33:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/view/SideBarView.ets | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/entry/src/main/ets/view/SideBarView.ets b/entry/src/main/ets/view/SideBarView.ets index 23fd2c2..09438bc 100644 --- a/entry/src/main/ets/view/SideBarView.ets +++ b/entry/src/main/ets/view/SideBarView.ets @@ -27,7 +27,7 @@ export struct SideBarView { build() { // [Start side_bar_view] Column() { - // [StartExclude side_bar_view_1] + // [StartExclude side_bar_view] Row({ space: 8 }) { Image($r('app.media.startIcon')) .height(24) @@ -37,7 +37,7 @@ export struct SideBarView { } .padding({ left: 8 }) .height(56) - // [EndExclude side_bar_view_1] + // [EndExclude side_bar_view] Column({ space: 2 }) { ForEach(this.tabData.getFirstList(), (item: string, index: number) => { Column() { @@ -58,30 +58,30 @@ export struct SideBarView { .height(20) } } - // [StartExclude side_bar_view_2] + // [StartExclude side_bar_view] .justifyContent(FlexAlign.SpaceBetween) .width('100%') .height(40) .padding({ left: 8 }) - // [EndExclude side_bar_view_2] + // [EndExclude side_bar_view] Column({ space: 2 }) { ForEach(this.tabData.getSecondList(item), (item: string, index: number) => { Row() { Text(item) - // [StartExclude side_bar_view_3] + // [StartExclude side_bar_view] .fontSize('16fp') .fontWeight(index === this.secondLevelIndex ? FontWeight.Bold : FontWeight.Medium) .margin({ left: 40 }) - // [EndExclude side_bar_view_3] + // [EndExclude side_bar_view] } - // [StartExclude side_bar_view_4] + // [StartExclude side_bar_view] .width('100%') .height(40) .borderRadius(8) .backgroundColor(index === this.secondLevelIndex ? '#1A0A59F7' : '#00FFFFFF') - // [EndExclude side_bar_view_4] + // [EndExclude side_bar_view] .onClick(() => { this.secondLevelIndex = index; }) @@ -100,7 +100,7 @@ export struct SideBarView { } .alignItems(HorizontalAlign.Start) } - // [StartExclude side_bar_view_5] + // [StartExclude side_bar_view] .alignItems(HorizontalAlign.Start) .backgroundColor('#0D000000') .padding({ @@ -109,7 +109,7 @@ export struct SideBarView { }) .height('100%') .width('100%') - // [EndExclude side_bar_view_5] + // [EndExclude side_bar_view] // [End side_bar_view] } } \ No newline at end of file -- Gitee