From 03247f5fd90b8a342dfdd61579ca0e6ee657af8e Mon Sep 17 00:00:00 2001
From: chenzhuo <chenzhuo59@huawei.com>
Date: Thu, 7 Jul 2022 20:05:53 +0800
Subject: [PATCH] modify

Signed-off-by: chenzhuo <chenzhuo59@huawei.com>
---
 .../main/ets/MainAbility/pages/loadingProgress.ets  |  1 +
 .../entry/src/main/ets/MainAbility/pages/search.ets | 13 +++++++++----
 .../src/main/ets/MainAbility/pages/sourceType.ets   |  6 +++---
 .../main/ets/test/LoadingProgressJsunit.test.ets    |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

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 37a014462..9c7cc1a5b 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 d227a1c3e..507493907 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 770c4f50c..51cb733b1 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 517b2a473..1d4767ff0 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();
     });
-- 
GitLab