diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAlign.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAlign.ets index 861d016f2d52c851ea8a6985b0a5007bf10ae3cd..cf0158cb1e94317357b0a5ccc1f961d310c5977d 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAlign.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAlign.ets @@ -48,6 +48,5 @@ struct AlignCenter_AddAlign { .align(this.DadAddAlign) } .width("100%") - .backgroundColor(0xAFEEE) } } diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAllSpace.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAllSpace.ets index c08af2f0b57e269fa5104c5527db2c8e23874878..dad73e2d08473510ba6885656c7bc50f7dfcbc94 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAllSpace.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddAllSpace.ets @@ -36,7 +36,6 @@ struct AlignCenter_AddAllSpace { build() { Column() { Flex({ justifyContent: this.justifyContent, direction: FlexDirection.Row }) { - Text('1').width(150).height(50).backgroundColor(0xF5DEB3).key("Center_AddAllSpace_011") Text('2').width(150).height(100).backgroundColor(0xD2B48C).key("Center_AddAllSpace_012") Text('3').width(150).height(150).backgroundColor(0xF5DEB3).key("Center_AddAllSpace_013") @@ -50,8 +49,6 @@ struct AlignCenter_AddAllSpace { } .key("Center_AddAllSpace_01_Box") .width("100%") - .height(200) - .backgroundColor(0xAFEEE) .alignItems(HorizontalAlign.Start) } } diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.ets index 99eddd256d2cccb09249e048efbeb9107336adf4..1b9ecbffc706f1456c9714ea9609c62437ba9519 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.ets @@ -60,21 +60,6 @@ struct AlignCenter_AddLayoutWeight { .width(500) .height(200) .backgroundColor(0xAFEEEE) - Flex({ justifyContent: this.justifyContent, direction: FlexDirection.Row }) { - Text('1') - .width(150) - .height(50) - .backgroundColor(0xF5DEB3) - .key("Center_AddLayoutWeight_021") - .layoutWeight(this.OneLayoutWeight1) - Text('2').width(150).height(100).backgroundColor(0xD2B48C).key("Center_AddLayoutWeight_022") - .layoutWeight(this.OneLayoutWeight2) - Text('3').width(150).height(150).backgroundColor(0xF5DEB3).key("Center_AddLayoutWeight_023") - } - .key("Center_AddLayoutWeight_02") - .width(500) - .height(200) - .backgroundColor(0xAFEEEE) } .width("100%") } diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddMargin.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddMargin.ets index c572c73d92ebb9836df79610a37759d610de38b3..c65dc8f8f1ba36a6313f1fb0b2652df73697aab7 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddMargin.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddMargin.ets @@ -48,8 +48,6 @@ struct AlignCenter_AddMargin { } .key("Center_AddMargin_01_Box") .width("100%") - .height(200) - .backgroundColor(0xAFEEE) .alignItems(HorizontalAlign.Start) } } diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddPadding.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddPadding.ets index e5da6d43f91dca78c8e2c6129898ffc14e04d92b..ee8470acfc6ede029468f90b8c18b81cc7ee26d8 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddPadding.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddPadding.ets @@ -35,7 +35,7 @@ struct AlignCenter_AddPadding { @State justifyContent: FlexAlign = FlexAlign.Center build() { Column() { - Text('alignContent:Center').fontSize(9).fontColor(0xCCCCCC).width('100%') + Text('justifyContent:FlexAlign.Center').fontSize(9).fontColor(0xCCCCCC).width('90%') Flex({ justifyContent: this.justifyContent, direction:FlexDirection.Row }) { Text('1').width(150).height(50).backgroundColor(0xF5DEB3).key("Center_AddPadding_011") Text('2').width(150).height(100).backgroundColor(0xD2B48C).key("Center_AddPadding_012") diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.test.ets index c74b0203c0bf1d60278a12c30dca0fa3f4947bbb..37bedd77f1ff20262494f51644fef634612ca3b8 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddLayoutWeight.test.ets @@ -90,17 +90,17 @@ export default function AlignCenter_AddLayoutWeight() { console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_CENTER_TEST_1600] START'); globalThis.value.message.notify({name:'OneLayoutWeight1', value:1}); globalThis.value.message.notify({name:'OneLayoutWeight2', value:2}); - globalThis.value.message.notify({name:'OneLayoutWeight3', value:2}); + globalThis.value.message.notify({name:'OneLayoutWeight3', value:0}); await CommonFunc.sleep(3000); let strJson = getInspectorByKey('Center_AddLayoutWeight_01'); let obj = JSON.parse(strJson); expect(obj.$type).assertEqual('Flex'); expect(obj.$attrs.constructor.direction).assertEqual('FlexDirection.Row'); expect(obj.$attrs.constructor.justifyContent).assertEqual('FlexAlign.Center'); - let Center_AddLayoutWeight_011 = CommonFunc.getComponentRect('Center_AddLayoutWeight_021'); - let Center_AddLayoutWeight_012 = CommonFunc.getComponentRect('Center_AddLayoutWeight_022'); - let Center_AddLayoutWeight_013 = CommonFunc.getComponentRect('Center_AddLayoutWeight_023'); - let Center_AddLayoutWeight_01 = CommonFunc.getComponentRect('Center_AddLayoutWeight_02'); + let Center_AddLayoutWeight_011 = CommonFunc.getComponentRect('Center_AddLayoutWeight_011'); + let Center_AddLayoutWeight_012 = CommonFunc.getComponentRect('Center_AddLayoutWeight_012'); + let Center_AddLayoutWeight_013 = CommonFunc.getComponentRect('Center_AddLayoutWeight_013'); + let Center_AddLayoutWeight_01 = CommonFunc.getComponentRect('Center_AddLayoutWeight_01'); expect(Center_AddLayoutWeight_011.top).assertEqual(Center_AddLayoutWeight_012.top); expect(Center_AddLayoutWeight_013.top).assertEqual(Center_AddLayoutWeight_012.top); expect(Center_AddLayoutWeight_011.top).assertEqual(Center_AddLayoutWeight_01.top); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOneMargin.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOneMargin.test.ets index 360b7a01904c12d21ddf974ac66ad348e857d275..30dea8f1daed519dcdb1205a2208fc1327eaecd9 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOneMargin.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Center/AlignCenter_AddOneMargin.test.ets @@ -101,16 +101,16 @@ export default function AlignCenter_AddOneMargin() { let Center_AddOneMargin_01 = CommonFunc.getComponentRect('Center_AddOneMargin_01'); expect(Center_AddOneMargin_01.top).assertEqual(Center_AddOneMargin_012.top); expect(Center_AddOneMargin_013.top).assertEqual(Center_AddOneMargin_012.top); - expect(Center_AddOneMargin_011.left - Center_AddOneMargin_01.left).assertEqual(vp2px(30)); + expect(Center_AddOneMargin_011.left - Center_AddOneMargin_01.left).assertEqual(vp2px(500/17)); expect(Center_AddOneMargin_011.top - Center_AddOneMargin_01.top).assertEqual(vp2px(30)); - expect(Center_AddOneMargin_012.left - Center_AddOneMargin_011.right).assertEqual(vp2px(30)); + expect(Center_AddOneMargin_012.left - Center_AddOneMargin_011.right).assertEqual(vp2px(500/17)); expect(Center_AddOneMargin_012.right).assertEqual(Center_AddOneMargin_013.left); expect(Center_AddOneMargin_011.bottom - Center_AddOneMargin_011.top).assertEqual(vp2px(50)); expect(Center_AddOneMargin_012.bottom - Center_AddOneMargin_012.top).assertEqual(vp2px(100)); expect(Center_AddOneMargin_013.bottom - Center_AddOneMargin_013.top).assertEqual(vp2px(150)); - expect(Center_AddOneMargin_011.right - Center_AddOneMargin_011.left).assertEqual(vp2px(440/3)); - expect(Center_AddOneMargin_012.right - Center_AddOneMargin_012.left).assertEqual(vp2px(440/3)); - expect(Center_AddOneMargin_013.right - Center_AddOneMargin_013.left).assertEqual(vp2px(440/3)); + expect(Center_AddOneMargin_011.right - Center_AddOneMargin_011.left).assertEqual(vp2px(2500/17)); + expect(Center_AddOneMargin_012.right - Center_AddOneMargin_012.left).assertEqual(vp2px(2500/17)); + expect(Center_AddOneMargin_013.right - Center_AddOneMargin_013.left).assertEqual(vp2px(2500/17)); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_CENTER_TEST_1500] END'); done(); })