diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/loadingProgress.ets b/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/loadingProgress.ets index 37a01446203a15c24edc44f0a527ce8462e180e4..9c7cc1a5be5ecb29a81d8b71a88b6d6465682481 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/loadingProgress.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/loadingProgress.ets @@ -48,6 +48,7 @@ struct LoadingProgressExample { .width('90%') .key('LP') LoadingProgress() + .height(50) .color(Color.Black) }.width('100%').margin({ top: 6 }) } diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/search.ets b/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/search.ets index d227a1c3e7688e6d3613ab495b8df1473ef7f463..507493907d5e18b038a3ba8ef7408936ed3634c4 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/search.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/search.ets @@ -20,9 +20,14 @@ import events_emitter from '@ohos.events.emitter' struct SearchExample { @State changevalue: string= '' @State submitvalue: string= '' - @State controller: SearchController= new SearchController() - @State textFont:Font=10 - @State searchButton:number=10 + @State textFont:Font = { + size: 10, + weight: 10, + family: 'serif', + style: FontStyle.Normal + } + @State searchButton:string = "10" + controller: SearchController= new SearchController() private stateChangCallBack = (eventData) => { console.info("search page state change called:" + JSON.stringify(eventData)); @@ -58,7 +63,7 @@ struct SearchExample { .placeholderFont({ size: 10, weight: 10, - family: 'serif', + family: 'serif', style: FontStyle.Normal }) .onSubmit((value: string) => { diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/sourceType.ets b/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/sourceType.ets index 770c4f50cc47f475d4c81c758c91bb698f82aff3..51cb733b1c1be2cbcdba01bcd3ab0ea2085db7c2 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/sourceType.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/sourceType.ets @@ -33,13 +33,13 @@ struct ClickExample { if (event.type === TouchType.Move) { this.eventType = 'Move' } - if (event.source === Unknown) { + if (event.source === SourceType.Unknown) { this.SourceType = 'Unknown' } - if (event.source === Mouse) { + if (event.source === SourceType.Mouse) { this.SourceType = 'Mouse' } - if (event.type === TouchScreen) { + if (event.type === SourceType.TouchScreen) { this.SourceType = 'TouchScreen' } console.info(this.text = 'sourceļ¼š' + event.source); diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/test/LoadingProgressJsunit.test.ets b/arkui/ace_ets_component_two/entry/src/main/ets/test/LoadingProgressJsunit.test.ets index 517b2a47374a4c589acbacf18ed45796c79f4205..1d4767ff04bf19299e205dea2dc89e106c1e9823 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/test/LoadingProgressJsunit.test.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/test/LoadingProgressJsunit.test.ets @@ -72,7 +72,7 @@ export default function loadingProgressJsunit() { let strJson = getInspectorByKey('LP'); let obj = JSON.parse(strJson); console.info("testLoadingProgress_300 component obj is: " + JSON.stringify(obj)); - expect(obj.$attrs.height).assertEqual("50.00px"); + expect(obj.$attrs.height).assertEqual("50.00vp"); console.info('testLoadingProgress_300 END'); done(); });