diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/page1.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/page1.ets index 0a3cea52a5108a0fc35925c3a4cb32a0c945e651..804eff11e4081e94edf75bbaa0502a4dc957f186 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/page1.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/page1.ets @@ -25,7 +25,7 @@ const TAG = 'ets_apiLack_add'; struct Second { private content: string = "这是第二页" @State text: string = router.getParams()['text'] - @State data: any = router.getParams()['data'] + @State data: number[] = router.getParams()['data'] @State secondData : string = '' build() { @@ -37,7 +37,7 @@ struct Second { .fontSize(30) .key("DataText") .onClick(()=>{ - this.secondData = (this.data.array[1]).toString() + this.secondData = (this.data[1]).toString() try { var backData = { data: { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/page2.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/page2.ets index 72be9f5739354996e17186ec6e5f5c39066165c9..fd5d474520843724d499a8fd7ad37780ad1c40e9 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/page2.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/page2.ets @@ -25,7 +25,7 @@ const TAG = 'ets_apiLack_add'; struct Second { private content: string = "这是第二页" @State text: string = router.getParams()['text'] - @State data: any = router.getParams()['data'] + @State data: number[] = router.getParams()['data'] @State secondData : string = '' build() { @@ -37,7 +37,7 @@ struct Second { .fontSize(30) .key("SingleDataText") .onClick(()=>{ - this.secondData = (this.data.array[1]).toString() + this.secondData = (this.data[1]).toString() try { var backData = { data: { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets index 4c32075a7fa5d591f9a3526e5dad9d59f37fdea6..1ab380ace435823b4bd8a932486c92a5a8e7847c 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets @@ -30,9 +30,7 @@ struct RouterStandard { url: 'pages/page1', params: { text: '这是第一页的值', - data: { - array: [12, 45, 78] - } + data: [12, 45, 78] } } try { diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOffset.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOffset.ets index 9e8674511342ea82713aa0abc3aaa2475229e537..a71eee26f6639810cea493d29a537fc0b62b63be 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOffset.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Center/AlignCenter_AddOffset.ets @@ -17,7 +17,7 @@ import {MessageManager,Callback} from './../../../../common/MessageManager'; @Entry @Component struct AlignCenter_AddOffset { - @State OneOffset: any = { x: 0, y: 0 } + @State OneOffset: object = { x: 0, y: 0 } messageManager:MessageManager = new MessageManager() onPageShow() { console.info('AlignSpaceEvenly_AddOffset onPageShow'); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOffset.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOffset.ets index 19cc28bf728828e2ab601bca7b5bdfcabb432943..8d767f05a5c9e3a4fdeed13ea59c55533b744bff 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOffset.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/End/AlignEnd_AddOffset.ets @@ -17,7 +17,7 @@ import {MessageManager,Callback} from './../../../../common/MessageManager'; @Entry @Component struct AlignEnd_AddOffset { - @State OneOffset: any = { x: 0, y: 0 } + @State OneOffset: object = { x: 0, y: 0 } messageManager:MessageManager = new MessageManager() onPageShow() { console.info('AlignSpaceEvenly_AddOffset onPageShow'); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.ets index 3cc8357771e94c4f184b0d1843782ed830baea86..0d3840b40300e90d5cc9941a9f79bd34f594cbca 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/SpaceEvenly/AlignSpaceEvenly_AddOffset.ets @@ -17,7 +17,7 @@ import {MessageManager,Callback} from './../../../../common/MessageManager'; @Entry @Component struct AlignSpaceEvenly_AddOffset { - @State OneOffset: any = { x: 0, y: 0 } + @State OneOffset: object = { x: 0, y: 0 } messageManager:MessageManager = new MessageManager() onPageShow() { console.info('AlignSpaceEvenly_NoSpace onPageShow'); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOffset.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOffset.ets index 3a639e253c2d717b5f8327fe3b6623ee5bde2b3e..80190f84db189a3c42cb4533dd1496104b4dac01 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOffset.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddOffset.ets @@ -17,7 +17,7 @@ import {MessageManager,Callback} from './../../../../common/MessageManager'; @Entry @Component struct AlignStart_AddOffset { - @State OneOffset: any = { x: 0, y: 0 } + @State OneOffset: object = { x: 0, y: 0 } messageManager:MessageManager = new MessageManager() onPageShow() { console.info('AlignSpaceEvenly_AddOffset onPageShow'); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexExceedJsunit.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexExceedJsunit.test.ets index 399dd9604d1109d8f4053eb0eda4b034a530dc8e..0bf2e734ae53f8a6a4a77b7402095badddb910fb 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexExceedJsunit.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexExceedJsunit.test.ets @@ -101,9 +101,9 @@ export default function flexExceed_AutoJsunit() { expect(textExceed01.bottom - textExceed01.top).assertEqual(vp2px(50)) expect(textExceed02.bottom - textExceed02.top).assertEqual(vp2px(100)) expect(textExceed03.bottom - textExceed03.top).assertEqual(vp2px(150)) - expect(textExceed01.right - textExceed01.left).assertEqual(vp2px(440/3)) - expect(textExceed02.right - textExceed02.left).assertEqual(vp2px(440/3)) - expect(textExceed03.right - textExceed03.left).assertEqual(vp2px(440/3)) + expect(Math.round(textExceed01.right - textExceed01.left)).assertEqual(Math.round(vp2px(440/3))) + expect(Math.round(textExceed02.right - textExceed02.left)).assertEqual(Math.round(vp2px(440/3))) + expect(Math.round(textExceed03.right - textExceed03.left)).assertEqual(Math.round(vp2px(440/3))) expect(obj1.$attrs.constructor.direction).assertEqual('FlexDirection.Row') expect(obj1.$attrs.constructor.alignItems).assertEqual('ItemAlign.Auto') console.info('new SUB_ACE_FLEXALIGNITEMS_AUTO_0700 END'); diff --git a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexPaddingJsunit.test.ets b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexPaddingJsunit.test.ets index 525dc009f6ac60bc5ef25cbd22696d6eba26b818..701e633dbc5da52c1c1d62dcccf26e4cc9e9bbda 100644 --- a/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexPaddingJsunit.test.ets +++ b/arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/alignItems/ItemAlign_Auto/FlexPaddingJsunit.test.ets @@ -102,9 +102,9 @@ export default function flexPadding_AutoJsunit() { expect(textFlexPadding01.bottom - textFlexPadding01.top).assertEqual(vp2px(50)) expect(textFlexPadding02.bottom - textFlexPadding02.top).assertEqual(vp2px(100)) expect(textFlexPadding03.bottom - textFlexPadding03.top).assertEqual(vp2px(150)) - expect(textFlexPadding01.right - textFlexPadding01.left).assertEqual(vp2px(440/3)) - expect(textFlexPadding02.right - textFlexPadding02.left).assertEqual(vp2px(440/3)) - expect(textFlexPadding03.right - textFlexPadding03.left).assertEqual(vp2px(440/3)) + expect(Math.round(textFlexPadding01.right - textFlexPadding01.left)).assertEqual(Math.round(vp2px(440/3))) + expect(Math.round(textFlexPadding02.right - textFlexPadding02.left)).assertEqual(Math.round(vp2px(440/3))) + expect(Math.round(textFlexPadding03.right - textFlexPadding03.left)).assertEqual(Math.round(vp2px(440/3))) expect(obj1.$attrs.constructor.direction).assertEqual('FlexDirection.Row') expect(obj1.$attrs.constructor.alignItems).assertEqual('ItemAlign.Auto') console.info('new SUB_ACE_FLEXALIGNITEMS_AUTO_0400 END');