From 081cbb18ed6c90ee44eb541c12e969ec94e9bd5f Mon Sep 17 00:00:00 2001 From: "OWNEROR-41FNVD0\\lenovo" Date: Thu, 15 May 2025 19:41:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E4=BB=A3=E7=A0=81=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ets/pages/AdaptiveTabCenteringIndex.ets | 18 +++++++++++++++--- .../pages/DoubleTabAdaptiveCenteringIndex.ets | 17 +++++++++++++++-- .../ets/pages/TableAdaptiveExtensionIndex.ets | 12 ++++++++++++ 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/entry/src/main/ets/pages/AdaptiveTabCenteringIndex.ets b/entry/src/main/ets/pages/AdaptiveTabCenteringIndex.ets index d3ed4fd..3dc379b 100644 --- a/entry/src/main/ets/pages/AdaptiveTabCenteringIndex.ets +++ b/entry/src/main/ets/pages/AdaptiveTabCenteringIndex.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +// [Start adaptive_tab_centering_index] import { ListDataConstants } from '../constants/ListDataConstants'; import { CommonConstants } from '../constants/CommonConstants'; import { BreakpointType } from '../utils/BreakpointType'; @@ -26,6 +26,7 @@ export struct AdaptiveTabCenteringIndex { build() { NavDestination() { Column() { + // [StartExclude adaptive_tab_centering_index_1] Row() { Image($r('app.media.icon_back')) .width($r('app.float.image_width')) @@ -40,7 +41,7 @@ export struct AdaptiveTabCenteringIndex { top: $r('app.float.back_margin_top') }) .justifyContent(FlexAlign.Start) - + // [EndExclude adaptive_tab_centering_index_1] Column() { Row() { Column() { @@ -52,14 +53,17 @@ export struct AdaptiveTabCenteringIndex { ListItem() { Column() { Text(item) + // [StartExclude adaptive_tab_centering_index_2] .fontSize($r('app.float.font_size_16')) .fontWeight(CommonConstants.FONT_WEIGHT_500) .fontColor(this.tabIndexSelected === index ? $r('app.color.red') : $r('app.color.black')) .height($r('app.float.text_height')) .focusable(true) .groupDefaultFocus(index === 0 ? true : false) + // [EndExclude adaptive_tab_centering_index_2] } } + // [StartExclude adaptive_tab_centering_index_3] .margin({ top: $r('app.float.recommendation_margin_top'), bottom: $r('app.float.recommendation_margin_bottom') @@ -79,25 +83,33 @@ export struct AdaptiveTabCenteringIndex { .onClick(() => { this.tabIndexSelected = index; }) + // [EndExclude adaptive_tab_centering_index_3] }, (item: string, index: number) => index + JSON.stringify(item)) } .scrollBar(BarState.Off) .listDirection(Axis.Horizontal) } + // [StartExclude adaptive_tab_centering_index_4] .width($r('app.float.width_296')) .height($r('app.float.height_56')) .backgroundColor($r('app.color.adaptive_tab_background')) .justifyContent(FlexAlign.Center) .alignItems(HorizontalAlign.Center) + // [EndExclude adaptive_tab_centering_index_4] .layoutWeight(CommonConstants.COMMON_FAL_1) } + // [StartExclude adaptive_tab_centering_index_5] .height($r('app.float.height_56')) .width(CommonConstants.FULL_WIDTH_PERCENT) + // [EndExclude adaptive_tab_centering_index_5] } + // [StartExclude adaptive_tab_centering_index_6] .height(CommonConstants.NINETY_PERCENT) .justifyContent(FlexAlign.Center) + // [EndExclude adaptive_tab_centering_index_6] } } .hideTitleBar(true) } -} \ No newline at end of file +} +// [End adaptive_tab_centering_index] \ No newline at end of file diff --git a/entry/src/main/ets/pages/DoubleTabAdaptiveCenteringIndex.ets b/entry/src/main/ets/pages/DoubleTabAdaptiveCenteringIndex.ets index 6a66e8a..5c10051 100644 --- a/entry/src/main/ets/pages/DoubleTabAdaptiveCenteringIndex.ets +++ b/entry/src/main/ets/pages/DoubleTabAdaptiveCenteringIndex.ets @@ -43,6 +43,7 @@ export struct DoubleTabAdaptiveCenteringIndex { .justifyContent(FlexAlign.Start) Column() { + // [Start double_tab_adaptive_centering_index] Row() { Column() { List({ @@ -53,14 +54,17 @@ export struct DoubleTabAdaptiveCenteringIndex { ListItem() { Column() { Text(item) + // [StartExclude double_tab_adaptive_centering_index_1] .fontSize($r('app.float.font_size_16')) .fontWeight(CommonConstants.FONT_WEIGHT_500) .fontColor(this.tabIndexSelected === index ? $r('app.color.red') : $r('app.color.black')) .height($r('app.float.text_height')) .focusable(true) .groupDefaultFocus(index === 0 ? true : false) + // [EndExclude double_tab_adaptive_centering_index_1] } } + // [StartExclude double_tab_adaptive_centering_index_2] .margin({ top: $r('app.float.stock_options_margin') }) .border({ width: { @@ -77,20 +81,26 @@ export struct DoubleTabAdaptiveCenteringIndex { .onClick(() => { this.tabIndexSelected = index; }) + // [EndExclude double_tab_adaptive_centering_index_2] }, (item: string, index: number) => index + JSON.stringify(item)) ListItem() { Image($r('app.media.ic_public_more')) + // [StartExclude double_tab_adaptive_centering_index_3] .width($r('app.float.image_width')) .height($r('app.float.image_height')) + // [EndExclude double_tab_adaptive_centering_index_3] } + // [StartExclude double_tab_adaptive_centering_index_4] .margin({ top: $r('app.float.more_margin_top') }) .visibility(this.breakPoint === CommonConstants.BREAK_POINT_LG ? Visibility.Visible : Visibility.Hidden) + // [EndExclude double_tab_adaptive_centering_index_4] } .scrollBar(BarState.Off) .listDirection(Axis.Horizontal) } .width($r('app.float.width_296')) + // [StartExclude double_tab_adaptive_centering_index_5] .height($r('app.float.height_56')) .margin({ left: $r('app.float.stock_column_margin') }) .justifyContent(FlexAlign.Center) @@ -105,10 +115,13 @@ export struct DoubleTabAdaptiveCenteringIndex { right: $r('app.float.more_margin_right') }) .visibility(this.breakPoint === CommonConstants.BREAK_POINT_LG ? Visibility.Hidden : Visibility.Visible) + // [EndExclude double_tab_adaptive_centering_index_5] } - .height($r('app.float.height_56')) .width(CommonConstants.FULL_WIDTH_PERCENT) - + // [StartExclude double_tab_adaptive_centering_index_6] + .height($r('app.float.height_56')) + // [EndExclude double_tab_adaptive_centering_index_6] + // [End double_tab_adaptive_centering_index] Row() { Column() { List({ diff --git a/entry/src/main/ets/pages/TableAdaptiveExtensionIndex.ets b/entry/src/main/ets/pages/TableAdaptiveExtensionIndex.ets index d9f463a..cca4c90 100644 --- a/entry/src/main/ets/pages/TableAdaptiveExtensionIndex.ets +++ b/entry/src/main/ets/pages/TableAdaptiveExtensionIndex.ets @@ -69,10 +69,12 @@ export struct TableAdaptiveExtensionIndex { }) } Column() { + // [Start table_adaptive_extension_index] Row() { Column() { Row() { ForEach(ListDataConstants.INDICATOR_NAME_LIST, (item: string, index: number) => { + // [StartExclude table_adaptive_extension_index_1] Column() { Row() { Text(item) @@ -114,6 +116,7 @@ export struct TableAdaptiveExtensionIndex { Column() { ForEach(ListDataConstants.INDICATOR_NAME_COLUMN, (item: string, index: number) => { this.Item(item, index, CommonConstants.GRAY_FONT_FLAG) + // [EndExclude table_adaptive_extension_index_1] }, (item: string, index: number) => index + JSON.stringify(item)) } .alignItems(HorizontalAlign.Start) @@ -122,7 +125,9 @@ export struct TableAdaptiveExtensionIndex { Column() { ForEach(ListDataConstants.STOCK_INDEX_DATA1, (item: string, index: number) => { + // [StartExclude table_adaptive_extension_index_2] this.Item(item, index, CommonConstants.RED_FONT_FLAG) + // [EndExclude table_adaptive_extension_index_2] }, (item: string, index: number) => index + JSON.stringify(item)) } .width($r('app.float.stock_data_width')) @@ -132,7 +137,9 @@ export struct TableAdaptiveExtensionIndex { Column() { ForEach(ListDataConstants.STOCK_INDEX_DATA2, (item: string, index: number) => { + // [StartExclude table_adaptive_extension_index_3] this.Item(item, index, CommonConstants.RED_FONT_FLAG) + // [EndExclude table_adaptive_extension_index_3] }, (item: string, index: number) => index + JSON.stringify(item)) } .width($r('app.float.stock_data_width')) @@ -142,16 +149,21 @@ export struct TableAdaptiveExtensionIndex { Column() { ForEach(ListDataConstants.STOCK_INDEX_DATA3, (item: string, index: number) => { + // [StartExclude table_adaptive_extension_index_4] this.Item(item, index, CommonConstants.RED_FONT_FLAG) + // [EndExclude table_adaptive_extension_index_4] }, (item: string, index: number) => index + JSON.stringify(item)) } .width($r('app.float.stock_data_width')) .alignItems(HorizontalAlign.End) } .width(CommonConstants.FULL_WIDTH_PERCENT) + // [StartExclude table_adaptive_extension_index_5] .margin({ top: $r('app.float.indicator_name_margin') }) + // [EndExclude table_adaptive_extension_index_5] } } + // [End table_adaptive_extension_index] } .height(CommonConstants.EIGHTY_PERCENT) .width(this.breakPoint === CommonConstants.BREAK_POINT_LG ? -- Gitee From 9ff11448a32938dceabb5a516bb1a76cc51b24cc Mon Sep 17 00:00:00 2001 From: "OWNEROR-41FNVD0\\lenovo" Date: Sat, 17 May 2025 15:40:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E4=BB=A3=E7=A0=81=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ets/pages/AdaptiveTabCenteringIndex.ets | 24 +++++++++---------- .../pages/DoubleTabAdaptiveCenteringIndex.ets | 24 +++++++++---------- .../ets/pages/TableAdaptiveExtensionIndex.ets | 20 ++++++++-------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/entry/src/main/ets/pages/AdaptiveTabCenteringIndex.ets b/entry/src/main/ets/pages/AdaptiveTabCenteringIndex.ets index 3dc379b..2d5023d 100644 --- a/entry/src/main/ets/pages/AdaptiveTabCenteringIndex.ets +++ b/entry/src/main/ets/pages/AdaptiveTabCenteringIndex.ets @@ -26,7 +26,7 @@ export struct AdaptiveTabCenteringIndex { build() { NavDestination() { Column() { - // [StartExclude adaptive_tab_centering_index_1] + // [StartExclude adaptive_tab_centering_index] Row() { Image($r('app.media.icon_back')) .width($r('app.float.image_width')) @@ -41,7 +41,7 @@ export struct AdaptiveTabCenteringIndex { top: $r('app.float.back_margin_top') }) .justifyContent(FlexAlign.Start) - // [EndExclude adaptive_tab_centering_index_1] + // [EndExclude adaptive_tab_centering_index] Column() { Row() { Column() { @@ -53,17 +53,17 @@ export struct AdaptiveTabCenteringIndex { ListItem() { Column() { Text(item) - // [StartExclude adaptive_tab_centering_index_2] + // [StartExclude adaptive_tab_centering_index] .fontSize($r('app.float.font_size_16')) .fontWeight(CommonConstants.FONT_WEIGHT_500) .fontColor(this.tabIndexSelected === index ? $r('app.color.red') : $r('app.color.black')) .height($r('app.float.text_height')) .focusable(true) .groupDefaultFocus(index === 0 ? true : false) - // [EndExclude adaptive_tab_centering_index_2] + // [EndExclude adaptive_tab_centering_index] } } - // [StartExclude adaptive_tab_centering_index_3] + // [StartExclude adaptive_tab_centering_index] .margin({ top: $r('app.float.recommendation_margin_top'), bottom: $r('app.float.recommendation_margin_bottom') @@ -83,30 +83,30 @@ export struct AdaptiveTabCenteringIndex { .onClick(() => { this.tabIndexSelected = index; }) - // [EndExclude adaptive_tab_centering_index_3] + // [EndExclude adaptive_tab_centering_index] }, (item: string, index: number) => index + JSON.stringify(item)) } .scrollBar(BarState.Off) .listDirection(Axis.Horizontal) } - // [StartExclude adaptive_tab_centering_index_4] + // [StartExclude adaptive_tab_centering_index] .width($r('app.float.width_296')) .height($r('app.float.height_56')) .backgroundColor($r('app.color.adaptive_tab_background')) .justifyContent(FlexAlign.Center) .alignItems(HorizontalAlign.Center) - // [EndExclude adaptive_tab_centering_index_4] + // [EndExclude adaptive_tab_centering_index] .layoutWeight(CommonConstants.COMMON_FAL_1) } - // [StartExclude adaptive_tab_centering_index_5] + // [StartExclude adaptive_tab_centering_index] .height($r('app.float.height_56')) .width(CommonConstants.FULL_WIDTH_PERCENT) - // [EndExclude adaptive_tab_centering_index_5] + // [EndExclude adaptive_tab_centering_index] } - // [StartExclude adaptive_tab_centering_index_6] + // [StartExclude adaptive_tab_centering_index] .height(CommonConstants.NINETY_PERCENT) .justifyContent(FlexAlign.Center) - // [EndExclude adaptive_tab_centering_index_6] + // [EndExclude adaptive_tab_centering_index] } } .hideTitleBar(true) diff --git a/entry/src/main/ets/pages/DoubleTabAdaptiveCenteringIndex.ets b/entry/src/main/ets/pages/DoubleTabAdaptiveCenteringIndex.ets index 5c10051..e2aa7f2 100644 --- a/entry/src/main/ets/pages/DoubleTabAdaptiveCenteringIndex.ets +++ b/entry/src/main/ets/pages/DoubleTabAdaptiveCenteringIndex.ets @@ -54,17 +54,17 @@ export struct DoubleTabAdaptiveCenteringIndex { ListItem() { Column() { Text(item) - // [StartExclude double_tab_adaptive_centering_index_1] + // [StartExclude double_tab_adaptive_centering_index] .fontSize($r('app.float.font_size_16')) .fontWeight(CommonConstants.FONT_WEIGHT_500) .fontColor(this.tabIndexSelected === index ? $r('app.color.red') : $r('app.color.black')) .height($r('app.float.text_height')) .focusable(true) .groupDefaultFocus(index === 0 ? true : false) - // [EndExclude double_tab_adaptive_centering_index_1] + // [EndExclude double_tab_adaptive_centering_index] } } - // [StartExclude double_tab_adaptive_centering_index_2] + // [StartExclude double_tab_adaptive_centering_index] .margin({ top: $r('app.float.stock_options_margin') }) .border({ width: { @@ -81,26 +81,26 @@ export struct DoubleTabAdaptiveCenteringIndex { .onClick(() => { this.tabIndexSelected = index; }) - // [EndExclude double_tab_adaptive_centering_index_2] + // [EndExclude double_tab_adaptive_centering_index] }, (item: string, index: number) => index + JSON.stringify(item)) ListItem() { Image($r('app.media.ic_public_more')) - // [StartExclude double_tab_adaptive_centering_index_3] + // [StartExclude double_tab_adaptive_centering_index] .width($r('app.float.image_width')) .height($r('app.float.image_height')) - // [EndExclude double_tab_adaptive_centering_index_3] + // [EndExclude double_tab_adaptive_centering_index] } - // [StartExclude double_tab_adaptive_centering_index_4] + // [StartExclude double_tab_adaptive_centering_index] .margin({ top: $r('app.float.more_margin_top') }) .visibility(this.breakPoint === CommonConstants.BREAK_POINT_LG ? Visibility.Visible : Visibility.Hidden) - // [EndExclude double_tab_adaptive_centering_index_4] + // [EndExclude double_tab_adaptive_centering_index] } .scrollBar(BarState.Off) .listDirection(Axis.Horizontal) } .width($r('app.float.width_296')) - // [StartExclude double_tab_adaptive_centering_index_5] + // [StartExclude double_tab_adaptive_centering_index] .height($r('app.float.height_56')) .margin({ left: $r('app.float.stock_column_margin') }) .justifyContent(FlexAlign.Center) @@ -115,12 +115,12 @@ export struct DoubleTabAdaptiveCenteringIndex { right: $r('app.float.more_margin_right') }) .visibility(this.breakPoint === CommonConstants.BREAK_POINT_LG ? Visibility.Hidden : Visibility.Visible) - // [EndExclude double_tab_adaptive_centering_index_5] + // [EndExclude double_tab_adaptive_centering_index] } .width(CommonConstants.FULL_WIDTH_PERCENT) - // [StartExclude double_tab_adaptive_centering_index_6] + // [StartExclude double_tab_adaptive_centering_index] .height($r('app.float.height_56')) - // [EndExclude double_tab_adaptive_centering_index_6] + // [EndExclude double_tab_adaptive_centering_index] // [End double_tab_adaptive_centering_index] Row() { Column() { diff --git a/entry/src/main/ets/pages/TableAdaptiveExtensionIndex.ets b/entry/src/main/ets/pages/TableAdaptiveExtensionIndex.ets index cca4c90..80242e5 100644 --- a/entry/src/main/ets/pages/TableAdaptiveExtensionIndex.ets +++ b/entry/src/main/ets/pages/TableAdaptiveExtensionIndex.ets @@ -74,7 +74,7 @@ export struct TableAdaptiveExtensionIndex { Column() { Row() { ForEach(ListDataConstants.INDICATOR_NAME_LIST, (item: string, index: number) => { - // [StartExclude table_adaptive_extension_index_1] + // [StartExclude table_adaptive_extension_index] Column() { Row() { Text(item) @@ -116,7 +116,7 @@ export struct TableAdaptiveExtensionIndex { Column() { ForEach(ListDataConstants.INDICATOR_NAME_COLUMN, (item: string, index: number) => { this.Item(item, index, CommonConstants.GRAY_FONT_FLAG) - // [EndExclude table_adaptive_extension_index_1] + // [EndExclude table_adaptive_extension_index] }, (item: string, index: number) => index + JSON.stringify(item)) } .alignItems(HorizontalAlign.Start) @@ -125,9 +125,9 @@ export struct TableAdaptiveExtensionIndex { Column() { ForEach(ListDataConstants.STOCK_INDEX_DATA1, (item: string, index: number) => { - // [StartExclude table_adaptive_extension_index_2] + // [StartExclude table_adaptive_extension_index] this.Item(item, index, CommonConstants.RED_FONT_FLAG) - // [EndExclude table_adaptive_extension_index_2] + // [EndExclude table_adaptive_extension_index] }, (item: string, index: number) => index + JSON.stringify(item)) } .width($r('app.float.stock_data_width')) @@ -137,9 +137,9 @@ export struct TableAdaptiveExtensionIndex { Column() { ForEach(ListDataConstants.STOCK_INDEX_DATA2, (item: string, index: number) => { - // [StartExclude table_adaptive_extension_index_3] + // [StartExclude table_adaptive_extension_index] this.Item(item, index, CommonConstants.RED_FONT_FLAG) - // [EndExclude table_adaptive_extension_index_3] + // [EndExclude table_adaptive_extension_index] }, (item: string, index: number) => index + JSON.stringify(item)) } .width($r('app.float.stock_data_width')) @@ -149,18 +149,18 @@ export struct TableAdaptiveExtensionIndex { Column() { ForEach(ListDataConstants.STOCK_INDEX_DATA3, (item: string, index: number) => { - // [StartExclude table_adaptive_extension_index_4] + // [StartExclude table_adaptive_extension_index] this.Item(item, index, CommonConstants.RED_FONT_FLAG) - // [EndExclude table_adaptive_extension_index_4] + // [EndExclude table_adaptive_extension_index] }, (item: string, index: number) => index + JSON.stringify(item)) } .width($r('app.float.stock_data_width')) .alignItems(HorizontalAlign.End) } .width(CommonConstants.FULL_WIDTH_PERCENT) - // [StartExclude table_adaptive_extension_index_5] + // [StartExclude table_adaptive_extension_index] .margin({ top: $r('app.float.indicator_name_margin') }) - // [EndExclude table_adaptive_extension_index_5] + // [EndExclude table_adaptive_extension_index] } } // [End table_adaptive_extension_index] -- Gitee