!9722 修复layout grid_row xts用例

Merge pull request !9722 from zhouyan/fix0810

arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_Row.ets

@@ -32,6 +32,6 @@ struct Grid_Row_Direction_Row {
           }.borderColor(color).borderWidth(2).key('DirectionRow_' + index)
         })
       }.key('DirectionRow_001')
-    }.width('80pv').height(200)
+    }.width('80vp').height(200)
   }
 }
\ No newline at end of file

arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Direction/Grid_Row_Direction_RowReverse.ets

@@ -32,6 +32,6 @@ struct Grid_Row_Direction_RowReverse {
           }.borderColor(color).borderWidth(2).key('DirectionRowReverse_' + index)
         })
       }.key('DirectionRowReverse_001')
-    }.width('80pv').height(200)
+    }.width('80vp').height(200)
   }
 }
\ No newline at end of file

arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_Gutter/Grid_Row_Resource.ets

@@ -32,6 +32,6 @@ struct Gutter_Length_Resource {
           }.borderColor(color).borderWidth(2).key('Length_Resource_' + index)
         })
       }.key('Length_Resource001')
-    }.width('80pv').height(200)
+    }.width('80vp').height(200)
   }
 }
\ No newline at end of file

arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Default.ets

@@ -54,6 +54,6 @@ struct Grid_Row_GutterOption_Default {
           }.borderColor(color).borderWidth(2).key('GutterOptionChange_' + index)
         })
       }.key('GutterOptionChange_001')
-    }.width('80pv').height(200)
+    }.width('80vp').height(200)
   }
 }
\ No newline at end of file

arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_Number.ets

@@ -52,6 +52,6 @@ struct Grid_Row_GutterOption_Number {
         })
       }
       .key('Length_Number001')
-    }.width('80pv').height(200)
+    }.width('80vp').height(200)
   }
 }
\ No newline at end of file

arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Grid/Grid_Row/Grid_Row_GutterOption/Grid_Row_GutterOption_String.ets

@@ -51,6 +51,6 @@ struct Grid_Row_GutterOption_String {
           }.borderColor(color).borderWidth(2).key('Grid_Row_GutterOption_String' + index)
         })
       }
-    }.width('80pv').height(200)
+    }.width('80vp').height(200)
   }
 }
\ No newline at end of file

arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/flexBasis/flexBasis_Type.test.ets

@@ -283,9 +283,14 @@ export default function flexBasis_Type() {
       let Column_flexBasis_02 = CommonFunc.getComponentRect('Column_flexBasis_02');
       console.log('assert position')
       expect(Math.round(Column_flexBasis_021.left - Column_flexBasis_02.left)).assertEqual(Math.round(Column_flexBasis_02.right - Column_flexBasis_021.right));
+      console.log('Column_flexBasis_021.left - Column_flexBasis_02.left', + Column_flexBasis_021.left - Column_flexBasis_02.left)
       expect(Math.round(Column_flexBasis_022.left - Column_flexBasis_02.left)).assertEqual(Math.round(Column_flexBasis_02.right - Column_flexBasis_022.right));
+      console.log('Column_flexBasis_022.left - Column_flexBasis_02.left', + Column_flexBasis_022.left - Column_flexBasis_02.left)
       expect(Math.round(Column_flexBasis_023.left - Column_flexBasis_02.left)).assertEqual(Math.round(Column_flexBasis_02.right - Column_flexBasis_023.right));
-      expect(Math.round(Column_flexBasis_022.top - Column_flexBasis_021.bottom)).assertEqual(Math.round(Column_flexBasis_023.top - Column_flexBasis_022.bottom))
+      console.log('Column_flexBasis_023.left - Column_flexBasis_02.left', + Column_flexBasis_023.left - Column_flexBasis_02.left)
+      expect(Math.round(Column_flexBasis_022.top - Column_flexBasis_021.bottom)).assertEqual(Math.round(Column_flexBasis_023.top - Column_flexBasis_022.bottom));
+      console.log('Column_flexBasis_022.top - Column_flexBasis_021.bottom', + Column_flexBasis_022.top - Column_flexBasis_021.bottom)
+
       console.log('assert space')
       expect(Math.round(Column_flexBasis_022.top - Column_flexBasis_021.bottom)).assertEqual(vp2px(10));
       expect(Math.round(Column_flexBasis_023.top - Column_flexBasis_022.bottom)).assertEqual(vp2px(10));

arkui/ace_ets_layout_test/entry/src/main/ets/test/Column/spaceChanged/Column_Space_String.test.ets

@@ -174,6 +174,9 @@ export default function Column_Space_String() {
       expect(Math.round(Column_Space_String_012.left - Column_Space_String_01.left)).assertEqual(Math.round(Column_Space_String_01.right - Column_Space_String_012.right));
       expect(Math.round(Column_Space_String_013.left - Column_Space_String_01.left)).assertEqual(Math.round(Column_Space_String_01.right - Column_Space_String_013.right));
       expect(Math.round(Column_Space_String_012.top - Column_Space_String_011.bottom)).assertEqual(Math.round(Column_Space_String_013.top - Column_Space_String_012.bottom))
+      console.log('Column_Space_String_011.left - Column_Space_String_01.left', + Column_Space_String_011.left - Column_Space_String_01.left)
+      console.log('Column_Space_String_012.left - Column_Space_String_01.left', + Column_Space_String_012.left - Column_Space_String_01.left)
+      console.log('Column_Space_String_013.left - Column_Space_String_01.left', + Column_Space_String_013.left - Column_Space_String_01.left)
       console.log('assert space')
       expect(Math.round(Column_Space_String_012.top - Column_Space_String_011.bottom)).assertEqual(Math.round(lpx2px(50)));
       expect(Math.round(Column_Space_String_013.top - Column_Space_String_012.bottom)).assertEqual(Math.round(lpx2px(50)));
@@ -390,6 +393,9 @@ export default function Column_Space_String() {
       expect(Math.round(Column_Space_String_012.left - Column_Space_String_01.left)).assertEqual(Math.round(Column_Space_String_01.right - Column_Space_String_012.right));
       expect(Math.round(Column_Space_String_013.left - Column_Space_String_01.left)).assertEqual(Math.round(Column_Space_String_01.right - Column_Space_String_013.right));
       expect(Math.round(Column_Space_String_012.top - Column_Space_String_011.bottom)).assertEqual(Math.round(Column_Space_String_013.top - Column_Space_String_012.bottom))
+      console.log('Column_Space_String_011.left - Column_Space_String_01.left', + Column_Space_String_011.left - Column_Space_String_01.left)
+      console.log('Column_Space_String_012.left - Column_Space_String_01.left', + Column_Space_String_012.left - Column_Space_String_01.left)
+      console.log('Column_Space_String_013.left - Column_Space_String_01.left', + Column_Space_String_013.left - Column_Space_String_01.left)
       console.log('assert space')
       expect(Math.round(Column_Space_String_012.top - Column_Space_String_011.bottom)).assertEqual(10);
       expect(Math.round(Column_Space_String_013.top - Column_Space_String_012.bottom)).assertEqual(10);

arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/flexBasis/Row_flexBasis_Type.test.ets

@@ -305,7 +305,10 @@ export default function Row_flexBasis_Type() {
       expect(Math.round(Row_flexBasis_Type_021.top - Row_flexBasis_Type_02.top)).assertEqual(Math.round(Row_flexBasis_Type_02.bottom - Row_flexBasis_Type_021.bottom));
       expect(Math.round(Row_flexBasis_Type_022.top - Row_flexBasis_Type_02.top)).assertEqual(Math.round(Row_flexBasis_Type_02.bottom - Row_flexBasis_Type_022.bottom));
       expect(Math.round(Row_flexBasis_Type_023.top - Row_flexBasis_Type_02.top)).assertEqual(Math.round(Row_flexBasis_Type_02.bottom - Row_flexBasis_Type_023.bottom));
-
+      console.log('Row_flexBasis_Type_021.top - Row_flexBasis_Type_02.top', + Row_flexBasis_Type_021.top - Row_flexBasis_Type_02.top)
+      console.log('Row_flexBasis_Type_022.top - Row_flexBasis_Type_02.top', + Row_flexBasis_Type_022.top - Row_flexBasis_Type_02.top)
+      console.log('Row_flexBasis_Type_023.top - Row_flexBasis_Type_02.top', + Row_flexBasis_Type_023.top - Row_flexBasis_Type_02.top)
+      
       console.log('assert space')
       expect(Math.round(Row_flexBasis_Type_022.left - Row_flexBasis_Type_021.right)).assertEqual(vp2px(10));
       expect(Math.round(Row_flexBasis_Type_023.left - Row_flexBasis_Type_022.right)).assertEqual(vp2px(10));

arkui/ace_ets_layout_test/entry/src/main/ets/test/Row/spaceChanged/Row_Space_String.test.ets

@@ -220,6 +220,9 @@ export default function Row_Space_String() {
       expect(Math.round(Row_Space_String_011.top - Row_Space_String_01.top)).assertEqual(Math.round(Row_Space_String_01.bottom - Row_Space_String_011.bottom));
       expect(Math.round(Row_Space_String_012.top - Row_Space_String_01.top)).assertEqual(Math.round(Row_Space_String_01.bottom - Row_Space_String_012.bottom));
       expect(Math.round(Row_Space_String_013.top - Row_Space_String_01.top)).assertEqual(Math.round(Row_Space_String_01.bottom - Row_Space_String_013.bottom));
+      console.log('Row_Space_String_011.top - Row_Space_String_01.top', + Row_Space_String_011.top - Row_Space_String_01.top)
+      console.log('Row_Space_String_012.top - Row_Space_String_01.top', + Row_Space_String_012.top - Row_Space_String_01.top)
+      console.log('Row_Space_String_013.top - Row_Space_String_01.top', + Row_Space_String_013.top - Row_Space_String_01.top)
 
       console.log('assert space')
       expect(Math.round(Row_Space_String_012.left - Row_Space_String_011.right)).assertEqual(Math.round(lpx2px(70)));
@@ -459,6 +462,9 @@ export default function Row_Space_String() {
       expect(Math.round(Row_Space_String_011.top - Row_Space_String_01.top)).assertEqual(Math.round(Row_Space_String_01.bottom - Row_Space_String_011.bottom));
       expect(Math.round(Row_Space_String_012.top - Row_Space_String_01.top)).assertEqual(Math.round(Row_Space_String_01.bottom - Row_Space_String_012.bottom));
       expect(Math.round(Row_Space_String_013.top - Row_Space_String_01.top)).assertEqual(Math.round(Row_Space_String_01.bottom - Row_Space_String_013.bottom));
+      console.log('Row_Space_String_011.top - Row_Space_String_01.top', + Row_Space_String_011.top - Row_Space_String_01.top)
+      console.log('Row_Space_String_012.top - Row_Space_String_01.top', + Row_Space_String_012.top - Row_Space_String_01.top)
+      console.log('Row_Space_String_013.top - Row_Space_String_01.top', + Row_Space_String_013.top - Row_Space_String_01.top)
 
       console.log('assert space')
       expect(Math.round(Row_Space_String_012.left - Row_Space_String_011.right)).assertEqual(10);