Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Xts Acts
提交
8071bbbd
X
Xts Acts
项目概览
OpenHarmony
/
Xts Acts
1 年多 前同步成功
通知
9
Star
22
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
X
Xts Acts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
8071bbbd
编写于
2月 20, 2023
作者:
E
e
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改用例
Signed-off-by:
N
e
<
qianwangdq@isoftstone.com
>
上级
605b2dbd
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
11 addition
and
30 deletion
+11
-30
arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAlign.ets
...y/pages/Flex/justifyContent/Start/AlignStart_AddAlign.ets
+0
-1
arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAllSpace.ets
...ages/Flex/justifyContent/Start/AlignStart_AddAllSpace.ets
+0
-2
arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddLayoutWeight.ets
.../Flex/justifyContent/Start/AlignStart_AddLayoutWeight.ets
+0
-15
arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddMargin.ets
.../pages/Flex/justifyContent/Start/AlignStart_AddMargin.ets
+0
-2
arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddPadding.ets
...pages/Flex/justifyContent/Start/AlignStart_AddPadding.ets
+1
-1
arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddLayoutWeight.test.ets
.../justifyContent/Start/AlignStart_AddLayoutWeight.test.ets
+5
-4
arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOneMargin.test.ets
...lex/justifyContent/Start/AlignStart_AddOneMargin.test.ets
+5
-5
未找到文件。
arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAlign.ets
浏览文件 @
8071bbbd
...
@@ -48,6 +48,5 @@ struct AlignStart_AddAlign {
...
@@ -48,6 +48,5 @@ struct AlignStart_AddAlign {
.align(this.DadAddAlign)
.align(this.DadAddAlign)
}
}
.width("100%")
.width("100%")
.backgroundColor(0xAFEEE)
}
}
}
}
arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddAllSpace.ets
浏览文件 @
8071bbbd
...
@@ -50,8 +50,6 @@ struct AlignStart_AddAllSpace {
...
@@ -50,8 +50,6 @@ struct AlignStart_AddAllSpace {
}
}
.key("Start_AddAllSpace_01_Box")
.key("Start_AddAllSpace_01_Box")
.width("100%")
.width("100%")
.height(200)
.backgroundColor(0xAFEEE)
.alignItems(HorizontalAlign.Start)
.alignItems(HorizontalAlign.Start)
}
}
}
}
\ No newline at end of file
arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddLayoutWeight.ets
浏览文件 @
8071bbbd
...
@@ -60,21 +60,6 @@ struct AlignStart_AddLayoutWeight {
...
@@ -60,21 +60,6 @@ struct AlignStart_AddLayoutWeight {
.width(500)
.width(500)
.height(200)
.height(200)
.backgroundColor(0xAFEEEE)
.backgroundColor(0xAFEEEE)
Flex({ justifyContent: this.justifyContent, direction: FlexDirection.Row }) {
Text('1')
.width(150)
.height(50)
.backgroundColor(0xF5DEB3)
.key("Start_AddLayoutWeight_021")
.layoutWeight(this.OneLayoutWeight1)
Text('2').width(150).height(100).backgroundColor(0xD2B48C).key("Start_AddLayoutWeight_022")
.layoutWeight(this.OneLayoutWeight2)
Text('3').width(150).height(150).backgroundColor(0xF5DEB3).key("Start_AddLayoutWeight_023")
}
.key("Start_AddLayoutWeight_02")
.width(500)
.height(200)
.backgroundColor(0xAFEEEE)
}
}
}
}
}
}
arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddMargin.ets
浏览文件 @
8071bbbd
...
@@ -48,8 +48,6 @@ struct AlignStart_AddMargin {
...
@@ -48,8 +48,6 @@ struct AlignStart_AddMargin {
}
}
.key("Start_AddMargin_01_Box")
.key("Start_AddMargin_01_Box")
.width("100%")
.width("100%")
.height(200)
.backgroundColor(0xAFEEE)
.alignItems(HorizontalAlign.Start)
.alignItems(HorizontalAlign.Start)
}
}
}
}
arkui/ace_ets_layout_test/entry/src/main/ets/MainAbility/pages/Flex/justifyContent/Start/AlignStart_AddPadding.ets
浏览文件 @
8071bbbd
...
@@ -35,7 +35,7 @@ struct AlignStart_AddPadding {
...
@@ -35,7 +35,7 @@ struct AlignStart_AddPadding {
@State justifyContent: FlexAlign = FlexAlign.Start
@State justifyContent: FlexAlign = FlexAlign.Start
build() {
build() {
Column() {
Column() {
Text('
alignContent:Start').fontSize(9).fontColor(0xCCCCCC).width('10
0%')
Text('
justifyContent:FlexAlign.Start').fontSize(9).fontColor(0xCCCCCC).width('9
0%')
Flex({ justifyContent: this.justifyContent, direction:FlexDirection.Row }) {
Flex({ justifyContent: this.justifyContent, direction:FlexDirection.Row }) {
Text('1').width(150).height(50).backgroundColor(0xF5DEB3).key("Start_AddPadding_011")
Text('1').width(150).height(50).backgroundColor(0xF5DEB3).key("Start_AddPadding_011")
Text('2').width(150).height(100).backgroundColor(0xD2B48C).key("Start_AddPadding_012")
Text('2').width(150).height(100).backgroundColor(0xD2B48C).key("Start_AddPadding_012")
...
...
arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddLayoutWeight.test.ets
浏览文件 @
8071bbbd
...
@@ -90,16 +90,17 @@ export default function AlignStart_AddLayoutWeight() {
...
@@ -90,16 +90,17 @@ export default function AlignStart_AddLayoutWeight() {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_START_TEST_1600] START');
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_START_TEST_1600] START');
globalThis.value.message.notify({name:'OneLayoutWeight1', value:1});
globalThis.value.message.notify({name:'OneLayoutWeight1', value:1});
globalThis.value.message.notify({name:'OneLayoutWeight2', value:2});
globalThis.value.message.notify({name:'OneLayoutWeight2', value:2});
globalThis.value.message.notify({name:'OneLayoutWeight3', value:0});
await CommonFunc.sleep(3000);
await CommonFunc.sleep(3000);
let strJson = getInspectorByKey('Start_AddLayoutWeight_01');
let strJson = getInspectorByKey('Start_AddLayoutWeight_01');
let obj = JSON.parse(strJson);
let obj = JSON.parse(strJson);
expect(obj.$type).assertEqual('Flex');
expect(obj.$type).assertEqual('Flex');
expect(obj.$attrs.constructor.direction).assertEqual('FlexDirection.Row');
expect(obj.$attrs.constructor.direction).assertEqual('FlexDirection.Row');
expect(obj.$attrs.constructor.justifyContent).assertEqual('FlexAlign.Start');
expect(obj.$attrs.constructor.justifyContent).assertEqual('FlexAlign.Start');
let Start_AddLayoutWeight_011 = CommonFunc.getComponentRect('Start_AddLayoutWeight_0
2
1');
let Start_AddLayoutWeight_011 = CommonFunc.getComponentRect('Start_AddLayoutWeight_0
1
1');
let Start_AddLayoutWeight_012 = CommonFunc.getComponentRect('Start_AddLayoutWeight_0
2
2');
let Start_AddLayoutWeight_012 = CommonFunc.getComponentRect('Start_AddLayoutWeight_0
1
2');
let Start_AddLayoutWeight_013 = CommonFunc.getComponentRect('Start_AddLayoutWeight_0
2
3');
let Start_AddLayoutWeight_013 = CommonFunc.getComponentRect('Start_AddLayoutWeight_0
1
3');
let Start_AddLayoutWeight_01 = CommonFunc.getComponentRect('Start_AddLayoutWeight_0
2
');
let Start_AddLayoutWeight_01 = CommonFunc.getComponentRect('Start_AddLayoutWeight_0
1
');
expect(Start_AddLayoutWeight_011.top).assertEqual(Start_AddLayoutWeight_012.top);
expect(Start_AddLayoutWeight_011.top).assertEqual(Start_AddLayoutWeight_012.top);
expect(Start_AddLayoutWeight_013.top).assertEqual(Start_AddLayoutWeight_012.top);
expect(Start_AddLayoutWeight_013.top).assertEqual(Start_AddLayoutWeight_012.top);
expect(Start_AddLayoutWeight_011.top).assertEqual(Start_AddLayoutWeight_01.top);
expect(Start_AddLayoutWeight_011.top).assertEqual(Start_AddLayoutWeight_01.top);
...
...
arkui/ace_ets_layout_test/entry/src/main/ets/test/Flex/justifyContent/Start/AlignStart_AddOneMargin.test.ets
浏览文件 @
8071bbbd
...
@@ -103,12 +103,12 @@ export default function AlignStart_AddOneMargin() {
...
@@ -103,12 +103,12 @@ export default function AlignStart_AddOneMargin() {
expect(Start_AddOneMargin_01.top).assertEqual(Start_AddOneMargin_012.top);
expect(Start_AddOneMargin_01.top).assertEqual(Start_AddOneMargin_012.top);
expect(Start_AddOneMargin_013.left).assertEqual(Start_AddOneMargin_012.right);
expect(Start_AddOneMargin_013.left).assertEqual(Start_AddOneMargin_012.right);
expect(Start_AddOneMargin_013.right).assertEqual(Start_AddOneMargin_01.right);
expect(Start_AddOneMargin_013.right).assertEqual(Start_AddOneMargin_01.right);
expect(Start_AddOneMargin_012.left - Start_AddOneMargin_011.right).assertEqual(vp2px(
30
));
expect(Start_AddOneMargin_012.left - Start_AddOneMargin_011.right).assertEqual(vp2px(
500/17
));
expect(Start_AddOneMargin_011.top - Start_AddOneMargin_01.top).assertEqual(vp2px(30));
expect(Start_AddOneMargin_011.top - Start_AddOneMargin_01.top).assertEqual(vp2px(30));
expect(Start_AddOneMargin_011.left - Start_AddOneMargin_01.left).assertEqual(vp2px(
30
));
expect(Start_AddOneMargin_011.left - Start_AddOneMargin_01.left).assertEqual(vp2px(
500/17
));
expect(Start_AddOneMargin_011.right - Start_AddOneMargin_011.left).assertEqual(vp2px(
440/3
));
expect(Start_AddOneMargin_011.right - Start_AddOneMargin_011.left).assertEqual(vp2px(
2500/17
));
expect(Start_AddOneMargin_012.right - Start_AddOneMargin_012.left).assertEqual(vp2px(
440/3
));
expect(Start_AddOneMargin_012.right - Start_AddOneMargin_012.left).assertEqual(vp2px(
2500/17
));
expect(Start_AddOneMargin_013.right - Start_AddOneMargin_013.left).assertEqual(vp2px(
440/3
));
expect(Start_AddOneMargin_013.right - Start_AddOneMargin_013.left).assertEqual(vp2px(
2500/17
));
expect(Start_AddOneMargin_011.bottom - Start_AddOneMargin_011.top).assertEqual(vp2px(50));
expect(Start_AddOneMargin_011.bottom - Start_AddOneMargin_011.top).assertEqual(vp2px(50));
expect(Start_AddOneMargin_012.bottom - Start_AddOneMargin_012.top).assertEqual(vp2px(100));
expect(Start_AddOneMargin_012.bottom - Start_AddOneMargin_012.top).assertEqual(vp2px(100));
expect(Start_AddOneMargin_013.bottom - Start_AddOneMargin_013.top).assertEqual(vp2px(150));
expect(Start_AddOneMargin_013.bottom - Start_AddOneMargin_013.top).assertEqual(vp2px(150));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录