!6266 【OpenHarmony 3.2.8.3】【master】【ACE子系统】【TOD】【rk3568】【必现】修改本地用例错误

Merge pull request !6266 from splaneguo/master

arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/common.ets

@@ -92,7 +92,7 @@ export default struct CommonColorMode {
         .bindPopup(true,{
              message:"23",
              showInSubWindow:true
-        }).
+        })
 
       Text("common-OnFinish")
         .width(320)

arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/loadingProgress.ets

@@ -37,6 +37,7 @@ struct LoadingProgressCircular {
       Text("loadingProgress-Circular")
         .width(100)
         .height(70)
+        .margin(5)
         .fontSize(20)
         .opacity(1)
         .align(Alignment.TopStart)
@@ -51,6 +52,7 @@ struct LoadingProgressCircular {
       Text("loadingProgress-Orbital")
         .width(100)
         .height(70)
+        .margin(5)
         .fontSize(20)
         .opacity(1)
         .align(Alignment.TopStart)
@@ -62,7 +64,7 @@ struct LoadingProgressCircular {
         .textOverflow({ overflow: TextOverflow.None })
         .key("OrbitalText")
 
-      Text('Orbital LoadingProgress ').fontSize(9).fontColor(0xCCCCCC).width('100%')
+      Text('Orbital LoadingProgress ').fontSize(9).fontColor(0xCCCCCC).width('100%').margin(5)
       LoadingProgress()
         .color(Color.Blue)
 

arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets

@@ -14,7 +14,7 @@
  */
 
 import router from '@ohos.router'
-import uiAppearance from '@ohos.uiAppearance';
+// import uiAppearance from '@ohos.uiAppearance';
 
 import Log from '../common/Log.ets';
 
@@ -37,7 +37,7 @@ struct RouterStandard {
       }
     }
     try {
-      await router.push(options,router.RouterMode.Standard)
+      await router.push(options)
     } catch (err) {
       console.info(`Standard Page fail callback, code: ${err.code}, msg: ${err.msg}`)
     }
@@ -54,7 +54,7 @@ struct RouterStandard {
       }
     }
     try {
-      await router.push(options,router.RouterMode.Single)
+      await router.push(options)
     } catch (err) {
       console.info(`Single Page fail callback, code: ${err.code}, msg: ${err.msg}`)
     }

arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/web.ets

@@ -38,7 +38,7 @@ struct WebEditText {
         .height(500)
         .padding(20)
         .blur(2)
-        .fileFromUrlAccess(true)
+        // .fileFromUrlAccess(true)
         .initialScale(2)
         .webDebuggingAccess(true)
         .onRenderExited((event) => {

arkui/ace_ets_component_attrlack/entry/src/main/ets/test/color.test.ets

@@ -58,7 +58,7 @@ export default function colorEnumJsunit() {
       let obj = JSON.parse(strJson);
       expect(obj.$type).assertEqual('Text');
       console.info("[testcolorTransparent0001] fontColor value :" + obj.$attrs.fontColor);
-      expect(obj.$attrs.fontColor).assertEqual("#FF000000");
+      expect(obj.$attrs.fontColor).assertEqual("#00000000");
       done();
     });
   })

arkui/ace_ets_component_attrlack/entry/src/main/ets/test/loadingProgress.test.ets

@@ -59,7 +59,7 @@ export default function loadingProgressCircularJsunit() {
       expect(obj.$type).assertEqual('Text');
       expect(obj.$attrs.color).assertEqual(undefined);
       expect(obj.$attrs.width).assertEqual('100.00vp');
-      expect(obj.$attrs.margin).assertEqual('0.00px');
+      expect(obj.$attrs.margin).assertEqual('5.00vp');
       console.info("[testloadingProgressCircular0011] color value :" + obj.$attrs.color);
       console.info("[testloadingProgressCircular0011] width value :" + obj.$attrs.width);
       console.info("[testloadingProgressCircular0011] margin value :" + obj.$attrs.margin);
@@ -80,7 +80,7 @@ export default function loadingProgressCircularJsunit() {
       expect(obj.$type).assertEqual('Text');
       expect(obj.$attrs.color).assertEqual(undefined);
       expect(obj.$attrs.width).assertEqual('100.00vp');
-      expect(obj.$attrs.margin).assertEqual('0.00px');
+      expect(obj.$attrs.margin).assertEqual('5.00vp');
       console.info("[testloadingProgressOrbital0001] color value :" + obj.$attrs.color);
       console.info("[testloadingProgressOrbital0001] width value :" + obj.$attrs.width);
       console.info("[testloadingProgressOrbital0001] margin value :" + obj.$attrs.margin);