From 325555ac8def0ee885291a1c6f34203b8c295b24 Mon Sep 17 00:00:00 2001 From: tianyu Date: Mon, 10 Oct 2022 11:22:35 +0800 Subject: [PATCH] update line Signed-off-by: tianyu --- .../figures/zh-cn_image1_0000001219982725.png | Bin 0 -> 5901 bytes .../figures/zh-cn_image_0000001219982725.png | Bin 8929 -> 25276 bytes .../arkui-ts/ts-drawing-components-circle.md | 14 ++--- .../arkui-ts/ts-drawing-components-ellipse.md | 14 ++--- .../arkui-ts/ts-drawing-components-line.md | 56 +++++++++++++++++- .../arkui-ts/ts-drawing-components-path.md | 2 +- .../arkui-ts/ts-drawing-components-polygon.md | 14 ++--- .../ts-drawing-components-polyline.md | 2 +- .../arkui-ts/ts-drawing-components-rect.md | 32 +++++----- .../arkui-ts/ts-drawing-components-shape.md | 16 ++--- 10 files changed, 101 insertions(+), 49 deletions(-) create mode 100644 zh-cn/application-dev/reference/arkui-ts/figures/zh-cn_image1_0000001219982725.png diff --git a/zh-cn/application-dev/reference/arkui-ts/figures/zh-cn_image1_0000001219982725.png b/zh-cn/application-dev/reference/arkui-ts/figures/zh-cn_image1_0000001219982725.png new file mode 100644 index 0000000000000000000000000000000000000000..b980148e07e0d6d9f42b0df75766da9cbfe09840 GIT binary patch literal 5901 zcmeHL{a@189;dsuR<^X*a(DTN58O&~&7}n@S(G`KSj@a$2DU|7FG*?!I!NeYW#lGf zdo5E#SLTcqOe`o+SW^dHGkZ|+D-D<(1MUy^^}7CW-rv{xo^w8* zbKalN`JD4PjI`9GcUF9`0t5oRle`DH9|T$gxJ%62Z@K?OrjMt)KTGoWC+z_79{Ig= zSC-}^?o9-NnwVbpFWz+5mmlAgnGXW3YV(vOGU81<2(-ZfM0@+)T#k^oh^yb+}y4_l2bVAm@8Qx^NdGk|AB2E=Ev;`Js#maS-2dUj9QU-*9%Z)BiXH z)OhD~nbdEHYHDp0n5qDF)Tq%(Q}ou z;V_>}aw5J_W}zu$;s9>m11_RbopDgN)EY$RT_Olo!EhmLOgEscO5bJ{JZI{P>Qh)R zb~6m-o2a=A+}AHA%X?0ZO-?cC_Q~02sKA8TYu^3=bo*3WQo=N=tq$RM*%m9E?`|{E zUA75Xladbq{P87~QNn&oeLHb%ZDgd07l#`fXXTMNFvRl`a z*k%zB7XS3#CwMpu8{*k9W4$%qly@;%oO!nCl-5$yFKRg5-`JRNNkwoe*A5z=7`>ue zj?ZZVU4<(N4h(i$hWgW3+ktBii_mSsqsOi_)SWiPm1B#LnAMUQE9RnbTrxLOA_Mw}(M?z4fqd{WgSiibAVu^W2}0^o+4Vn&EY2HgKai?&x@~YDwpL)(ikKZK@Kq(RTahs-c&!Isx!z7l zWf(u-1Fv`pW_7Otwt2w4xQmAG<=G6wRX4oy3GyC%Gm@O@hF2DVhw?KaaHt!U47W%4 zuK^-hY_J=QNb+~`RSd#q`6Ca!vTpIB+C`EVU21UyEryH5;JA1KEuOcFw~NKQ)c?iJ zQLz@l2=g4$b<%1T9%)g`(7Os2$K4ltKCTcYn#+fb88+E1mMjW#P ztspJW+rY0Ix@_yq48hc&yW88z%^P3S%f3LN>%h}c#C+#)4#Ec9z3I;NxJrbXtYQi@ zBQSw~NttD;-dfk&?4Nu!sVguSG|QH`UUk8d(J^mBw7T6%S$ z`97ab4Hwrd@KGn8d0)w-m^(k0X_|WysMGDFRd-=$1`eB+A?6-*(p~wSZ9+@@ZPpfL z+lJf98o(DNuaRaRWo+bDUFKo6Xa_kO3{+Oj zD^&jyfcL*?@;ohcf-?roB(t?j)O+w?oCRqagYvUuTUHRblDqnvK*#uSC$u^)ZehIU zNn^|qZ-!G>1#59G=w(VJ&P&k6mJivH{e)%8)K9Z)gNjmh6bAJ&TsnB~ELLIdMA4om zPcEr=)yMEwfj0L#>8o4BGlgU2IV0+5+nk0OsBu)P?Z2>>wuV!I*OQx^h+E%>mPzd| zqP$TE$4T2!d|m31z|luiVf;tV1%;H>;xt;Wu8g8Xs59WqW`AyKn)!%;w!h~PGoHK> zkG+hB-nF9laTN#kru5qg>-`>o>A+E{LlN*T!_bYwca!fJp<}%->Ki4Ll`qD6lZ_4n z^Xx`JwZo9ZMATDl2ZE``!}+lYH^omjd}E&3pKFdr)6Ml+{#At|j31$Qy!q~&TVX!!KM*AM~sb9(LF+thOSK@G+IgbhmG Lm5Su;IC%Eoq}-Q+ literal 0 HcmV?d00001 diff --git a/zh-cn/application-dev/reference/arkui-ts/figures/zh-cn_image_0000001219982725.png b/zh-cn/application-dev/reference/arkui-ts/figures/zh-cn_image_0000001219982725.png index 8e1eb1e09de7fe545f80f7a0601f63843369375a..048fdc4749a41e0675390e66e61b5d63953ed8e1 100644 GIT binary patch literal 25276 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 literal 8929 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 A9RL6T diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-circle.md b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-circle.md index 4da279cc7c..1d790cb18e 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-circle.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-circle.md @@ -30,14 +30,14 @@ Circle(options?: {width?: string | number, height?: string | number}) | -------- | -------- | -------- | -------- | | fill | [ResourceColor](ts-types.md) | 否 | 设置填充区域颜色。
默认值：Color.Black | | fillOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 否 | 设置填充区域透明度。
默认值：1 | -| stroke | [ResourceColor](ts-types.md) | 否 | 设置线条颜色。
默认值：Color.Black | -| strokeDashArray | Array<Length> | 否 | 设置线条间隙。
默认值：[] | -| strokeDashOffset | number \| string | 否 | 线条绘制起点的偏移量。
默认值：0 | -| strokeLineCap | [LineCapStyle](ts-appendix-enums.md#linecapstyle) | 否 | 设置线条端点绘制样式。
默认值：LineCapStyle.Butt | -| strokeLineJoin | [LineJoinStyle](ts-appendix-enums.md#linejoinstyle) | 否 | 设置线条拐角绘制样式。
默认值：LineJoinStyle.Miter | +| stroke | [ResourceColor](ts-types.md) | 否 | 设置边框颜色，不设置时，默认没有边框。 | +| strokeDashArray | Array<Length> | 否 | 设置边框间隙。
默认值：[] | +| strokeDashOffset | number \| string | 否 | 边框绘制起点的偏移量。
默认值：0 | +| strokeLineCap | [LineCapStyle](ts-appendix-enums.md#linecapstyle) | 否 | 设置边框端点绘制样式。
默认值：LineCapStyle.Butt | +| strokeLineJoin | [LineJoinStyle](ts-appendix-enums.md#linejoinstyle) | 否 | 设置边框拐角绘制样式。
默认值：LineJoinStyle.Miter | | strokeMiterLimit | number \| string | 否 | 设置锐角绘制成斜角的极限值。
默认值：4 | -| strokeOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 否 | 设置线条透明度。
默认值：1 | -| strokeWidth | Length | 否 | 设置线条宽度。
默认值：1 | +| strokeOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 否 | 设置边框透明度。
默认值：1 | +| strokeWidth | Length | 否 | 设置边框宽度。
默认值：1 | | antiAlias | boolean | 否 | 是否开启抗锯齿效果。
默认值：true | diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-ellipse.md b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-ellipse.md index 6825c18b27..bedfc77137 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-ellipse.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-ellipse.md @@ -31,14 +31,14 @@ ellipse(options?: {width?: string | number, height?: string | number}) | -------- | -------- | -------- | -------- | -------- | | fill | [ResourceColor](ts-types.md) | Color.Black | 否 | 设置填充区域颜色。 | | fillOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置填充区域透明度。 | -| stroke | [ResourceColor](ts-types.md) | Color.Black | 否 |设置线条颜色。 | -| strokeDashArray | Array<Length> | [] | 否 | 设置线条间隙。 | -| strokeDashOffset | number \| string | 0 | 否 | 线条绘制起点的偏移量。 | -| strokeLineCap | [LineCapStyle](ts-appendix-enums.md#linecapstyle) | LineCapStyle.Butt | 否 | 设置线条端点绘制样式。 | -| strokeLineJoin | [LineJoinStyle](ts-appendix-enums.md#linejoinstyle) | LineJoinStyle.Miter | 否 | 设置线条拐角绘制样式。 | +| stroke | [ResourceColor](ts-types.md) | - | 否 |设置边框颜色，不设置时，默认没有边框。 | +| strokeDashArray | Array<Length> | [] | 否 | 设置边框间隙。 | +| strokeDashOffset | number \| string | 0 | 否 | 边框绘制起点的偏移量。 | +| strokeLineCap | [LineCapStyle](ts-appendix-enums.md#linecapstyle) | LineCapStyle.Butt | 否 | 设置边框端点绘制样式。 | +| strokeLineJoin | [LineJoinStyle](ts-appendix-enums.md#linejoinstyle) | LineJoinStyle.Miter | 否 | 设置边框拐角绘制样式。 | | strokeMiterLimit | number \| string | 4 | 否 | 设置锐角绘制成斜角的极限值。 | -| strokeOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置线条透明度。 | -| strokeWidth | Length | 1 | 否 | 设置线条宽度。 | +| strokeOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置边框透明度。 | +| strokeWidth | Length | 1 | 否 | 设置边框宽度。 | | antiAlias | boolean | true | 否 | 是否开启抗锯齿效果。 | diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-line.md b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-line.md index b9059c4c36..616f06a599 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-line.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-line.md @@ -50,9 +50,10 @@ Line(value?: {width?: string | number, height?: string | number}) | strokeWidth | Length | 1 | 否 | 设置线条宽度。 | | antiAlias | boolean | true | 否 | 是否开启抗锯齿效果。 | - ## 示例 +### 示例1 + ```ts // xxx.ets @Entry @@ -79,7 +80,15 @@ struct LineExample { .startPoint([0, 0]) .endPoint([100, 100]) .strokeWidth(3) - .strokeDashArray([1, 3]) + .strokeDashArray([10, 3]) + .backgroundColor('#F5F5F5') + // strokeDashOffset用于定义关联虚线strokeDashArray数组渲染时的偏移 + Line({ width: 50, height: 50 }) + .startPoint([0, 0]) + .endPoint([100, 100]) + .strokeWidth(3) + .strokeDashArray([10, 3]) + .strokeDashOffset(5) .backgroundColor('#F5F5F5') } } @@ -87,3 +96,46 @@ struct LineExample { ``` ![zh-cn_image_0000001219982725](figures/zh-cn_image_0000001219982725.png) + +### 示例2 + +```ts +// xxx.ets +@Entry +@Component +struct LineExample1 { + build() { + Row({ space: 10 }) { + // 当LineCapStyle值为Butt时 + Line() + .width(100) + .height(200) + .startPoint([50, 50]) + .endPoint([50, 200]) + .strokeWidth(20) + .strokeLineCap(LineCapStyle.Butt) + .backgroundColor('#F5F5F5').margin(10) + // 当LineCapStyle值为Round时 + Line() + .width(100) + .height(200) + .startPoint([50, 50]) + .endPoint([50, 200]) + .strokeWidth(20) + .strokeLineCap(LineCapStyle.Round) + .backgroundColor('#F5F5F5') + // 当LineCapStyle值为Square时 + Line() + .width(100) + .height(200) + .startPoint([50, 50]) + .endPoint([50, 200]) + .strokeWidth(20) + .strokeLineCap(LineCapStyle.Square) + .backgroundColor('#F5F5F5') + } + } +} +``` + +![zh-cn_image1_0000001219982725](figures/zh-cn_image1_0000001219982725.png) \ No newline at end of file diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-path.md b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-path.md index 5929aa6c23..ecdc9f2e09 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-path.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-path.md @@ -32,7 +32,7 @@ Path(value?: { width?: number | string; height?: number | string; commands?: str | commands | string | '' | 否 | 路径绘制的命令字符串，单位为px。像素单位转换方法请参考[像素单位转换](../../ui/ts-pixel-units.md)。 | | fill | [ResourceColor](ts-types.md) | Color.Black | 否 | 设置填充区域颜色。 | | fillOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置填充区域透明度。 | -| stroke | [ResourceColor](ts-types.md) | Color.Black | 否 | 设置线条颜色。 | +| stroke | [ResourceColor](ts-types.md) | - | 否 | 设置线条颜色。 | | strokeDashArray | Array<Length> | [] | 否 | 设置线条间隙。 | | strokeDashOffset | number \| string | 0 | 否 | 线条绘制起点的偏移量。 | | strokeLineCap | [LineCapStyle](ts-appendix-enums.md#linecapstyle) | LineCapStyle.Butt | 否 | 设置线条端点绘制样式。 | diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-polygon.md b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-polygon.md index cb1f6803ae..eefd1d43c4 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-polygon.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-polygon.md @@ -33,14 +33,14 @@ Polygon(value?: {width?: string | number, height?: string | number}) | points | Array<Point> | [] | 否 | 多边形的顶点坐标列表。 | | fill | [ResourceColor](ts-types.md) | Color.Black | 否 | 设置填充区域颜色。 | | fillOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置填充区域透明度。 | -| stroke | [ResourceColor](ts-types.md) | Color.Black | 否 | 设置线条颜色。 | -| strokeDashArray | Array<Length> | [] | 否 | 设置线条间隙。 | -| strokeDashOffset | number \| string | 0 | 否 | 线条绘制起点的偏移量。 | -| strokeLineCap | [LineCapStyle](ts-appendix-enums.md#linecapstyle) | LineCapStyle.Butt | 否 | 设置线条端点绘制样式。 | -| strokeLineJoin | [LineJoinStyle](ts-appendix-enums.md#linejoinstyle) | LineJoinStyle.Miter | 否 | 设置线条拐角绘制样式。 | +| stroke | [ResourceColor](ts-types.md) | - | 否 | 设置边框颜色，不设置时，默认没有边框线条。 | +| strokeDashArray | Array<Length> | [] | 否 | 设置边框间隙。 | +| strokeDashOffset | number \| string | 0 | 否 | 边框绘制起点的偏移量。 | +| strokeLineCap | [LineCapStyle](ts-appendix-enums.md#linecapstyle) | LineCapStyle.Butt | 否 | 设置边框端点绘制样式。 | +| strokeLineJoin | [LineJoinStyle](ts-appendix-enums.md#linejoinstyle) | LineJoinStyle.Miter | 否 | 设置边框拐角绘制样式。 | | strokeMiterLimit | number \| string | 4 | 否 | 设置锐角绘制成斜角的极限值。 | -| strokeOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置线条透明度。 | -| strokeWidth | Length | 1 | 否 | 设置线条宽度。 | +| strokeOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置边框透明度。 | +| strokeWidth | Length | 1 | 否 | 设置边框宽度。 | | antiAlias | boolean | true | 否 | 是否开启抗锯齿效果。 | ## Point diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-polyline.md b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-polyline.md index dd862ca618..8042a99475 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-polyline.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-polyline.md @@ -33,7 +33,7 @@ Polyline(value?: {width?: string | number, height?: string | number}) | points | Array<Point> | [] | 否 | 折线经过坐标点列表。 | | fill | [ResourceColor](ts-types.md) | Color.Black | 否 | 设置填充区域颜色。 | | fillOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置填充区域透明度。 | -| stroke | [ResourceColor](ts-types.md) | Color.Black | 否 | 设置线条颜色。 | +| stroke | [ResourceColor](ts-types.md) | - | 否 | 设置线条颜色。 | | strokeDashArray | Array<Length> | [] | 否 | 设置线条间隙。 | | strokeDashOffset | number \| string | 0 | 否 | 线条绘制起点的偏移量。 | | strokeLineCap | [LineCapStyle](ts-appendix-enums.md#linecapstyle) | LineCapStyle.Butt | 否 | 设置线条端点绘制样式。 | diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-rect.md b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-rect.md index a7582c53b2..d2549d5bb3 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-rect.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-rect.md @@ -19,34 +19,34 @@ Rect(value?: {width?: string | number,height?: string | number,radius?: string | **参数：** -| 参数名 | 参数类型 | 必填 | 默认值 | 参数描述 | +| 参数名 | 参数类型 | 必填 | 默认值 | 参数描述 | | -------- | -------- | -------- | -------- | -------- | -| width | string \| number | 否 | 0 | 宽度。 | -| height | string \| number | 否 | 0 | 高度。 | -| radius | string \| number \| Array<string \| number> | 否 | 0 | 圆角半径，支持分别设置四个角的圆角度数。 | -| radiusWidth | string \| number | 否 | 0 | 圆角宽度。 | -| radiusHeight | string \| number | 否 | 0 | 圆角高度。 | +| width | string \| number | 否 | 0 | 宽度。 | +| height | string \| number | 否 | 0 | 高度。 | +| radius | string \| number \| Array<string \| number> | 否 | 0 | 圆角半径，支持分别设置四个角的圆角度数。 | +| radiusWidth | string \| number | 否 | 0 | 圆角宽度。 | +| radiusHeight | string \| number | 否 | 0 | 圆角高度。 | ## 属性 除支持[通用属性](ts-universal-attributes-size.md)外，还支持以下属性： -| 参数名称 | 参数类型 | 默认值 | 必填 | 参数描述 | +| 参数名称 | 参数类型 | 默认值 | 必填 | 参数描述 | | -------- | -------- | -------- | -------- | -------- | -| radiusWidth | string \| number | 0 | 否 | 圆角的宽度，仅设置宽时宽高一致。 | -| radiusHeight | string \| number | 0 | 否 | 圆角的高度，仅设置高时宽高一致。 | +| radiusWidth | string \| number | 0 | 否 | 圆角的宽度，仅设置宽时宽高一致。 | +| radiusHeight | string \| number | 0 | 否 | 圆角的高度，仅设置高时宽高一致。 | | radius | string \| number \| Array<string \| number> | 0 | 否 | 圆角半径大小。 | | fill | [ResourceColor](ts-types.md) | Color.Black | 否 | 设置填充区域颜色。 | | fillOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置填充区域透明度。 | -| stroke | [ResourceColor](ts-types.md) | Color.Black | 否 | 设置线条颜色。 | -| strokeDashArray | Array<Length> | [] | 否 | 设置线条间隙。 | -| strokeDashOffset | number \| string | 0 | 否 | 线条绘制起点的偏移量。 | -| strokeLineCap | [LineCapStyle](ts-appendix-enums.md#linecapstyle) | LineCapStyle.Butt | 否 | 设置线条端点绘制样式。 | -| strokeLineJoin | [LineJoinStyle](ts-appendix-enums.md#linejoinstyle) | LineJoinStyle.Miter | 否 | 设置线条拐角绘制样式。 | +| stroke | [ResourceColor](ts-types.md) | - | 否 | 设置边框颜色，不设置时，默认没有边框。 | +| strokeDashArray | Array<Length> | [] | 否 | 设置边框间隙。 | +| strokeDashOffset | number \| string | 0 | 否 | 边框绘制起点的偏移量。 | +| strokeLineCap | [LineCapStyle](ts-appendix-enums.md#linecapstyle) | LineCapStyle.Butt | 否 | 设置边框端点绘制样式。 | +| strokeLineJoin | [LineJoinStyle](ts-appendix-enums.md#linejoinstyle) | LineJoinStyle.Miter | 否 | 设置边框拐角绘制样式。 | | strokeMiterLimit | number \| string | 4 | 否 | 设置锐角绘制成斜角的极限值。 | -| strokeOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置线条透明度。 | -| strokeWidth | Length | 1 | 否 | 设置线条宽度。 | +| strokeOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置边框透明度。 | +| strokeWidth | Length | 1 | 否 | 设置边框宽度。 | | antiAlias | boolean | true | 否 | 是否开启抗锯齿效果。 | diff --git a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-shape.md b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-shape.md index ac8e3eb10f..709e897f90 100644 --- a/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-shape.md +++ b/zh-cn/application-dev/reference/arkui-ts/ts-drawing-components-shape.md @@ -14,7 +14,7 @@ ## 子组件 -可以包含子组件。 +包含[Rect](ts-drawing-components-rect.md)、[Path](ts-drawing-components-path.md)、[Circle](ts-drawing-components-circle.md)、[Ellipse](ts-drawing-components-ellipse.md)、[Polyline](ts-drawing-components-polyline.md)、[Polygon](ts-drawing-components-polygon.md)、[Image](ts-basic-components-image.md)、[Text](ts-basic-components-text.md)、[Column](ts-container-column.md)、[Row](ts-container-row.md)子组件。 ## 接口 @@ -37,14 +37,14 @@ Shape(value?: PixelMap) | viewPort | {
x?: number \| string,
y?: number \| string,
width?: number \| string,
height?: number \| string
} | { x:0, y:0, width:0, height:0 } | 否 | 形状的视口。 | | fill | [ResourceColor](ts-types.md) | Color.Black | 否 | 设置填充区域颜色。 | | fillOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置填充区域透明度。 | -| stroke | [ResourceColor](ts-types.md) | Color.Black | 否 | 设置线条颜色。 | -| strokeDashArray | Array<Length> | [] | 否 | 设置线条间隙。 | -| strokeDashOffset | number \| string | 0 | 否 | 线条绘制起点的偏移量。 | -| strokeLineCap | [LineCapStyle](ts-appendix-enums.md#linecapstyle) | LineCapStyle.Butt | 否 | 设置线条端点绘制样式。 | -| strokeLineJoin | [LineJoinStyle](ts-appendix-enums.md#linejoinstyle) | LineJoinStyle.Miter | 否 | 设置线条拐角绘制样式。 | +| stroke | [ResourceColor](ts-types.md) | - | 否 | 设置边框颜色，不设置时，默认没有边框线条。 | +| strokeDashArray | Array<Length> | [] | 否 | 设置边框间隙。 | +| strokeDashOffset | number \| string | 0 | 否 | 边框绘制起点的偏移量。 | +| strokeLineCap | [LineCapStyle](ts-appendix-enums.md#linecapstyle) | LineCapStyle.Butt | 否 | 设置边框端点绘制样式。 | +| strokeLineJoin | [LineJoinStyle](ts-appendix-enums.md#linejoinstyle) | LineJoinStyle.Miter | 否 | 设置边框拐角绘制样式。 | | strokeMiterLimit | number \| string | 4 | 否 | 设置锐角绘制成斜角的极限值。 | -| strokeOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置线条透明度。 | -| strokeWidth | number \| string | 1 | 否 | 设置线条宽度。 | +| strokeOpacity | number \| string \| [Resource](ts-types.md#resource类型) | 1 | 否 | 设置边框透明度。 | +| strokeWidth | number \| string | 1 | 否 | 设置边框宽度。 | | antiAlias | boolean | true | 否 | 是否开启抗锯齿效果。 | | mesh8+ | Array<number>,number,number | [],0,0 | 否 | 设置mesh效果。第一个参数为长度（column + 1）* （row + 1）* 2的数组，它记录了扭曲后的位图各个顶点位置，第二个参数为mesh矩阵列数column，第三个参数为mesh矩阵行数row。 | -- GitLab