From cbf02e46eb1393624b1a892c4e1a7d38e7070b61 Mon Sep 17 00:00:00 2001 From: LiAn Date: Fri, 11 Mar 2022 03:38:10 +0000 Subject: [PATCH 1/8] update zh-cn/application-dev/reference/arkui-js/js-components-common-transition.md. Signed-off-by: LiAn --- .../reference/arkui-js/js-components-common-transition.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zh-cn/application-dev/reference/arkui-js/js-components-common-transition.md b/zh-cn/application-dev/reference/arkui-js/js-components-common-transition.md index 15900d8ce4f..bbf7ca807f6 100644 --- a/zh-cn/application-dev/reference/arkui-js/js-components-common-transition.md +++ b/zh-cn/application-dev/reference/arkui-js/js-components-common-transition.md @@ -48,8 +48,10 @@ PageA跳转到PageB,跳转的共享元素为image, shareid为“shareImage
- - Click on picture to Jump to ths details +
+ + Click on picture to Jump to ths details +
-- Gitee From f57cc7cc98118e12e8fd547f72d692b1922950f3 Mon Sep 17 00:00:00 2001 From: LiAn Date: Fri, 11 Mar 2022 03:39:39 +0000 Subject: [PATCH 2/8] update zh-cn/application-dev/reference/arkui-ts/ts-basic-components-checkbox.md. Signed-off-by: LiAn --- .../reference/arkui-ts/ts-basic-components-checkbox.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-checkbox.md b/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-checkbox.md index 9f6fce6df8d..b11da741ede 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-checkbox.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-checkbox.md @@ -42,7 +42,7 @@ Checkbox( name?: string, group?: string ) ## 示例 ``` -@Entry‘ +@Entry @Component struct CheckboxExample { -- Gitee From 5cf7687dbf619540dcfc121fe3bfe80ea44ed8a7 Mon Sep 17 00:00:00 2001 From: LiAn Date: Fri, 11 Mar 2022 04:01:05 +0000 Subject: [PATCH 3/8] update zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-image-effect.md. Signed-off-by: LiAn --- .../reference/arkui-ts/ts-universal-attributes-image-effect.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-image-effect.md b/zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-image-effect.md index 49015456c8d..0d065df39fc 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-image-effect.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-image-effect.md @@ -34,7 +34,7 @@ @Component struct ImageEffectsExample { build() { - Column({space:10}) { + Column({space: 10}) { // 对字体进行模糊 Text('font blur').fontSize(15).fontColor(0xCCCCCC).width('90%') Text('text').blur(3).width('90%').height(40) -- Gitee From 19aa273f8183ce9e0cdcc55f4a64d8caadd5f525 Mon Sep 17 00:00:00 2001 From: LiAn Date: Fri, 11 Mar 2022 06:18:52 +0000 Subject: [PATCH 4/8] update zh-cn/application-dev/reference/arkui-ts/ts-basic-components-richtext.md. Signed-off-by: LiAn --- .../arkui-ts/ts-basic-components-richtext.md | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-richtext.md b/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-richtext.md index c56463a8002..da2780cc42b 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-richtext.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-basic-components-richtext.md @@ -53,17 +53,16 @@ RichText\(content:string\) @Entry @Component struct RichTextExample { - @State data: string = '

h1标题

-

h1斜体

-

h1下划线

-

h2标题

-

h3标题

-

p常规


-
-

字体大小35px,行高45px

-

- 这是一段文字这是一段文字这是一段文字这是一段文字这是一段文字这是一段文字这是一段文字这是一段文字 - 这是一段文字

' + @State data: string = "

h1标题

" + + "

h1斜体

" + + "

h1下划线

" + + "

h2标题

" + + "

h3标题

" + + "

p常规


" + + "
" + + "

字体大小35px,行高45px

" + + "

" + + "

这是一段文字这是一段文字这是一段文字这是一段文字这是一段文字这是一段文字这是一段文字这是一段文字这是一段文字

" build() { Flex({direction: FlexDirection.Column,alignItems: ItemAlign.Center, -- Gitee From 4786693e9b0a944756bbbfbadce9f946a7636b95 Mon Sep 17 00:00:00 2001 From: LiAn Date: Fri, 11 Mar 2022 06:50:11 +0000 Subject: [PATCH 5/8] update zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-size.md. Signed-off-by: LiAn --- .../reference/arkui-ts/ts-universal-attributes-size.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-size.md b/zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-size.md index 0e09e523c0a..73f16917730 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-size.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-size.md @@ -29,7 +29,6 @@ @Entry @Component struct SizeExample { - @StateitemWidth : number = 0 @StateitemHeight : number = 0 build() { Column({ space: 10 }) { Text('margin and padding:').fontSize(12).fontColor(0xCCCCCC).width('90%') @@ -55,10 +54,8 @@ struct SizeExample { Text('no layoutWeight') .size({ width: '30%', height: 110 }).backgroundColor(0xD2B48C).textAlign(TextAlign.Center) }.size({ width: '90%', height: 140 }).backgroundColor(0xAFEEEE) - List() { ListItem() { Image('/resources/rawfile/seaman.png') .alt('/resources/rawfile/seaman2.png') .objectFit(ImageFit.Fill) .padding('100vp') .margin('40vp') .opacity(0.5) .measure('image_1') // 获取id=image_1的Image组件尺寸信息 } .onMeasure((Array ruler) => { // 在布局之前回调,返回已测量的子组件尺寸信息 console.log(ruler[0].id, ruler[0].screenX, ruler[0].screenY, ruler[0].offsetX, ruler[0].offsetY, ruler[0].width, ruler[0].height) this.itemWidth = ruler[0].width this.itemHeight = ruler[0].height }) .width(this.itemWidth) .height(this.itemHeight) } }.width('100%').margin({ top: 5 }) - } -} + }} ``` ![zh-cn_image_0000001174264384](figures/zh-cn_image_0000001174264384.gif) -- Gitee From 5558e975022c2e745b6682035f7940e3b6f1f64c Mon Sep 17 00:00:00 2001 From: LiAn Date: Fri, 11 Mar 2022 06:50:42 +0000 Subject: [PATCH 6/8] update zh-cn/application-dev/reference/arkui-ts/Readme-CN.md. Signed-off-by: LiAn --- zh-cn/application-dev/reference/arkui-ts/Readme-CN.md | 1 - 1 file changed, 1 deletion(-) diff --git a/zh-cn/application-dev/reference/arkui-ts/Readme-CN.md b/zh-cn/application-dev/reference/arkui-ts/Readme-CN.md index 3155278159c..40ec43688ce 100644 --- a/zh-cn/application-dev/reference/arkui-ts/Readme-CN.md +++ b/zh-cn/application-dev/reference/arkui-ts/Readme-CN.md @@ -97,7 +97,6 @@ - [Swiper](ts-container-swiper.md) - [Tabs](ts-container-tabs.md) - [TabContent](ts-container-tabcontent.md) - - [SideBarContainer](ts-container-sidebarcontainer.md) - [Refresh](ts-container-refresh.md) - 媒体组件 - [Video](ts-media-components-video.md) -- Gitee From 996570180d181468b29807710b043f3973de0c67 Mon Sep 17 00:00:00 2001 From: LiAn Date: Fri, 11 Mar 2022 06:51:23 +0000 Subject: [PATCH 7/8] update zh-cn/application-dev/reference/arkui-ts/ts-universal-events-click.md. Signed-off-by: LiAn --- .../reference/arkui-ts/ts-universal-events-click.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-universal-events-click.md b/zh-cn/application-dev/reference/arkui-ts/ts-universal-events-click.md index ea96a956ce8..c6a3fc890b0 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-universal-events-click.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-universal-events-click.md @@ -25,12 +25,12 @@ | target8+ | EventTarget | 被点击元素对象。 | | timestamp | number | 事件时间戳。 | -- EventTarget对象说明8+ +- EventTarget8+对象说明 | 名称 | 参数类型 | 描述 | | -------- | -------- | -------- | | area | Area | 目标元素的区域信息。 | -- Area对象说明8+ +- Area8+对象说明 | 属性名称 | 类型 | 描述 | | -------- | -------- | -------- | | width | number | 目标元素的宽度,单位为vp。 | @@ -38,7 +38,7 @@ | pos | Position | 目标元素左上角相对父元素左上角的位置。 | | globalPos | Position | 目标元素左上角相对页面左上角的位置。 | -- Position对象说明8+ +- Position8+对象说明 | 属性名称 | 参数类型 | 描述 | | -------- | -------- | -------- | | x | number | x轴坐标,单位为vp。 | -- Gitee From d362cbc57c3bc07ff559fa101da906bda8c623b9 Mon Sep 17 00:00:00 2001 From: LiAn Date: Fri, 11 Mar 2022 06:52:48 +0000 Subject: [PATCH 8/8] update zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-size.md. Signed-off-by: LiAn --- .../reference/arkui-ts/ts-universal-attributes-size.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-size.md b/zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-size.md index 73f16917730..cb6e258fb77 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-size.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-size.md @@ -19,7 +19,7 @@ | size | {
width?: Length,
height?: Length
} | - | 设置高宽尺寸。 | | padding | {
top?: Length,
right?: Length,
bottom?: Length,
left?: Length
} \| Length | 0 | 设置内边距属性。
参数为Length类型时,四个方向内边距同时生效。 | | margin | {
top?: Length,
right?: Length,
bottom?: Length,
left?: Length
}
\| Length | 0 | 设置外边距属性。
参数为Length类型时,四个方向外边距同时生效。 | -| constraintSize | {
minWidth?: Length,
maxWidth?: Length,
minHeight?: Length,
maxHeight?: Lenght
} | {
minWidth: 0,
maxWidth: Infinity,
minHeight: 0,
maxHeight: Infinity
} | 设置约束尺寸,组件布局时,进行尺寸范围限制。 | +| constraintSize | {
minWidth?: Length,
maxWidth?: Length,
minHeight?: Length,
maxHeight?: Length
} | {
minWidth: 0,
maxWidth: Infinity,
minHeight: 0,
maxHeight: Infinity
} | 设置约束尺寸,组件布局时,进行尺寸范围限制。 | | layoutWeight | number | 0 | 容器尺寸确定时,元素与兄弟节点主轴布局尺寸按照权重进行分配,忽略本身尺寸设置。
> ![icon-note.gif](public_sys-resources/icon-note.gif) **说明:**
> 仅在Row/Column/Flex布局中生效。 | -- Gitee