From 820cea03e3a5013244b080f9726e1c368295d449 Mon Sep 17 00:00:00 2001 From: anlyyao Date: Thu, 5 Sep 2024 19:36:01 +0800 Subject: [PATCH 1/2] feat(Fab): add y-edge props --- db/TDesign.db | Bin 1003520 -> 1003520 bytes .../src/fab/README.en-US.md | 3 +- .../tdesign-miniprogram/src/fab/README.md | 3 +- .../tdesign-miniprogram/src/fab/props.ts | 6 ++- .../tdesign-miniprogram/src/fab/type.ts | 13 +++++- packages/scripts/api.json | 41 +++++++++++++++++- 6 files changed, 59 insertions(+), 7 deletions(-) diff --git a/db/TDesign.db b/db/TDesign.db index 046efe74b7698a892d6683e3e5441a4ddc634512..2507e65a577159b5ff1554cfe77326f472c918d9 100644 GIT binary patch delta 522 zcmZozVB4_3c7imc;Y1l{Rzn88vaZII))dCp6sFb`=GGLJ))dy(6t>nB_SO`R))dax z6t313?$#8Zttq^7=X)|RFeoyVGH`h_lyW}d%;sXT^JzH-_gUPaDTWjxweN zOqz_#Ir!KYvm3J=WbXQu>w8fkBX2?pjFbZ?Z zGm7&z2{Lf-8XGe-nogg#l2=~n*^Kp1CoFr~zy4YGv}fIWA2&2j-@1}_T1ZlUeoks) zoo@-uduEOJn2_=;Usc53M3hIeDIqE>w>Sd`#C7H>I5KcyZQD#+s zUI~!xq(EL1XXNE= z6oq)rl7W+hmxGsq1EkZzEitLmH6=Y&;KjOq&-bo-I@Clx?R+|6;){JdpHJ<1 zIdj6(j&1Mv^gLg(>&d?E_j_hVn^@>5m{`OrJnNXI5Up-$R#Z@-uA^XK5Nl*$WTInB_SO`R))dax z6t313?$#8Zttq^7=f^NFWKd*?W#IDWY~YmSSis-RFU7Z%&x-dbZw${zo;D6K_SKAG z4EGsg*`3*Luw}4*V{K&RVVTULz-+{HlqrZul6xb!Dc4TMyNq`k(82cQ3wd3bIf26U zER52es?!;Lc!agnxRy+G2+mANbxJHsNli;E%_#{>%qdM}F3kgSGxJhYUN&^TT)6XT z!=CA9t@xy64HXQHtboYC(8$2ZMAra_5JKBuFX2sK6>D^#AuGkgD9kC(D9+oM%fP{F zY|Owgy=MWh{PevGc&BamUd6k8E88JPC#D??)8&$QJ+}uY@L4lWpOnNWG<`u5AItPb zNqh=iOs^QY(nJ}~^M2cYCW+5NmxGbNl7YXH*J(S?1ipiO)7J;{t=V2VpRaub0A3nw A_5c6? diff --git a/packages/products/tdesign-miniprogram/src/fab/README.en-US.md b/packages/products/tdesign-miniprogram/src/fab/README.en-US.md index 00cce57dc..2cd7095de 100644 --- a/packages/products/tdesign-miniprogram/src/fab/README.en-US.md +++ b/packages/products/tdesign-miniprogram/src/fab/README.en-US.md @@ -9,10 +9,11 @@ name | type | default | description | required style | Object | - | CSS(Cascading Style Sheets) | N custom-style | Object | - | CSS(Cascading Style Sheets)，used to set style on virtual component | N button-props | Object | - | Typescript：`ButtonProps`，[Button API Documents](./button?tab=api)。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/fab/type.ts) | N -draggable | String / Boolean | false | \- | N +draggable | String / Boolean | false | Typescript：`boolean \| DirectionEnum ` `type DirectionEnum = 'all' \| 'vertical' \| 'horizontal'`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/fab/type.ts) | N icon | String | - | \- | N text | String | - | \- | N using-custom-navbar | Boolean | false | \- | N +y-edge | Array | - | Typescript：`Array` | N ### Fab Events diff --git a/packages/products/tdesign-miniprogram/src/fab/README.md b/packages/products/tdesign-miniprogram/src/fab/README.md index fba5316a9..6528f75f5 100644 --- a/packages/products/tdesign-miniprogram/src/fab/README.md +++ b/packages/products/tdesign-miniprogram/src/fab/README.md @@ -9,10 +9,11 @@ style | Object | - | 样式 | N custom-style | Object | - | 样式，一般用于开启虚拟化组件节点场景 | N button-props | Object | - | 透传至 Button 组件。TS 类型：`ButtonProps`，[Button API Documents](./button?tab=api)。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/fab/type.ts) | N -draggable | String / Boolean | false | `true` / `'all'`可拖动
`'vertical'`可垂直拖动
`'horizontal'`可水平拖动
`false`禁止拖动 | N +draggable | String / Boolean | false | 是否可拖拽。`true` / `'all'`可拖动
`'vertical'`可垂直拖动
`'horizontal'`可水平拖动
`false`禁止拖动。TS 类型：`boolean \| DirectionEnum ` `type DirectionEnum = 'all' \| 'vertical' \| 'horizontal'`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/fab/type.ts) | N icon | String | - | 图标 | N text | String | - | 文本内容 | N using-custom-navbar | Boolean | false | 是否使用了自定义导航栏 | N +y-edge | Array | - | 设置垂直方向边界限制，示例：[48, 48] 或 ['96rpx', 80]。TS 类型：`Array` | N ### Fab Events diff --git a/packages/products/tdesign-miniprogram/src/fab/props.ts b/packages/products/tdesign-miniprogram/src/fab/props.ts index 94a71f664..576891f2d 100644 --- a/packages/products/tdesign-miniprogram/src/fab/props.ts +++ b/packages/products/tdesign-miniprogram/src/fab/props.ts @@ -10,7 +10,7 @@ const props: TdFabProps = { buttonProps: { type: Object, }, - /** `true` / `'all'`可拖动
`'vertical'`可垂直拖动
`'horizontal'`可水平拖动
`false`禁止拖动 */ + /** 是否可拖拽。`true` / `'all'`可拖动
`'vertical'`可垂直拖动
`'horizontal'`可水平拖动
`false`禁止拖动 */ draggable: { type: null, value: false, @@ -35,6 +35,10 @@ const props: TdFabProps = { type: Boolean, value: false, }, + /** 设置垂直方向边界限制，示例：[48, 48] 或 ['96rpx', 80] */ + yEdge: { + type: Array, + }, }; export default props; diff --git a/packages/products/tdesign-miniprogram/src/fab/type.ts b/packages/products/tdesign-miniprogram/src/fab/type.ts index d99a4ad6b..6dcff50bb 100644 --- a/packages/products/tdesign-miniprogram/src/fab/type.ts +++ b/packages/products/tdesign-miniprogram/src/fab/type.ts @@ -15,12 +15,12 @@ export interface TdFabProps { value?: ButtonProps; }; /** - * `true` / `'all'`可拖动
`'vertical'`可垂直拖动
`'horizontal'`可水平拖动
`false`禁止拖动 + * 是否可拖拽。`true` / `'all'`可拖动
`'vertical'`可垂直拖动
`'horizontal'`可水平拖动
`false`禁止拖动 * @default false */ draggable?: { type: null; - value?: string | boolean; + value?: boolean | DirectionEnum; }; /** * 图标 @@ -54,4 +54,13 @@ export interface TdFabProps { type: BooleanConstructor; value?: boolean; }; + /** + * 设置垂直方向边界限制，示例：[48, 48] 或 ['96rpx', 80] + */ + yEdge?: { + type: ArrayConstructor; + value?: Array; + }; } + +export type DirectionEnum = 'all' | 'vertical' | 'horizontal'; diff --git a/packages/scripts/api.json b/packages/scripts/api.json index aaff725e3..761c92dc7 100644 --- a/packages/scripts/api.json +++ b/packages/scripts/api.json @@ -47359,14 +47359,14 @@ ], "field_default_value": "false", "field_enum": "", - "field_desc_zh": "`true` / `'all'`可拖动
`'vertical'`可垂直拖动
`'horizontal'`可水平拖动
`false`禁止拖动", + "field_desc_zh": "是否可拖拽。`true` / `'all'`可拖动
`'vertical'`可垂直拖动
`'horizontal'`可水平拖动
`false`禁止拖动", "field_desc_en": null, "field_required": 0, "event_input": "", "create_time": "2024-04-01 10:59:27", "update_time": "2024-04-01 10:59:27", "event_output": null, - "custom_field_type": null, + "custom_field_type": "boolean | DirectionEnum 【type DirectionEnum = 'all' | 'vertical' | 'horizontal'】", "syntactic_sugar": null, "readonly": 1, "html_attribute": 0, @@ -47618,6 +47618,43 @@ "Boolean" ] }, + { + "id": 1725534756, + "platform_framework": [ + "64" + ], + "component": "Fab", + "field_category": 1, + "field_name": "yEdge", + "field_type": [ + "16" + ], + "field_default_value": "", + "field_enum": "", + "field_desc_zh": "设置垂直方向边界限制，示例：[48, 48] 或 ['96rpx', 80]", + "field_desc_en": null, + "field_required": 0, + "event_input": "", + "create_time": "2024-09-05 11:12:36", + "update_time": "2024-09-05 11:12:36", + "event_output": null, + "custom_field_type": "Array", + "syntactic_sugar": null, + "readonly": 1, + "html_attribute": 0, + "trigger_elements": "", + "deprecated": 0, + "version": "", + "test_description": null, + "support_default_value": 0, + "field_category_text": "Props", + "platform_framework_text": [ + "Miniprogram" + ], + "field_type_text": [ + "Array" + ] + }, { "id": 2505, "platform_framework": [ From 782c10bba3521abeea4b93a7f0123003aa61997f Mon Sep 17 00:00:00 2001 From: anlyyao Date: Tue, 10 Sep 2024 15:09:28 +0800 Subject: [PATCH 2/2] fix(Fab): fix cr --- db/TDesign.db | Bin 1003520 -> 1003520 bytes .../src/fab/README.en-US.md | 4 ++-- .../tdesign-miniprogram/src/fab/README.md | 4 ++-- .../tdesign-miniprogram/src/fab/props.ts | 2 +- .../tdesign-miniprogram/src/fab/type.ts | 6 +++--- packages/scripts/api.json | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/db/TDesign.db b/db/TDesign.db index dd3543007465f58df20d23f92cc0cdd77b8fbaeb..88765c979ee704ba2d180467f109bc0e8be1a830 100644 GIT binary patch delta 190 zcmZozVB4_3c7imc^F$eER%ZsivaZII))dCp6sFb`=GGLJ))dy(6t>nB_SO`R))dax z6t313?$#8Zttq^V=CkE9aCtN2Pv=>{n=IaBGDB9Hg;AJOo>82)Nsxhq*Vve$(Q$gu z0^W-6c; qot(F~i%sA=%E{HJHK$q%WUTb`=QH_a*_`rA^HPepbIjuVu@wL}Zatg; delta 196 zcmV;#06YJHpgn+~J&+p#L6ICo1wjBVc8Gywg=7JRWCDd`1BGM+g=7VVWCn#~2Zdw^ zg=7hZWD1333x#A1wPX#Vp9XaR3QGWWmkgi{W06n>0)j4=ai9$p0X3I~pbgO$L}_wm zV{~b6Zbfc&Z6M=-kaT%)Wgxe6p$(Jn5ZwR|c?-D?KMkM@APR{I-M1Ey4#f#A4FG{C yoO>Ds0TT%q0Syg-6#xhgGcy1=00{^U2n_%TX4#S?Kt^F=c|~MrWw!{L4*0c&jXjY7 diff --git a/packages/products/tdesign-miniprogram/src/fab/README.en-US.md b/packages/products/tdesign-miniprogram/src/fab/README.en-US.md index 2cd7095de..a49fb14f6 100644 --- a/packages/products/tdesign-miniprogram/src/fab/README.en-US.md +++ b/packages/products/tdesign-miniprogram/src/fab/README.en-US.md @@ -9,11 +9,11 @@ name | type | default | description | required style | Object | - | CSS(Cascading Style Sheets) | N custom-style | Object | - | CSS(Cascading Style Sheets)，used to set style on virtual component | N button-props | Object | - | Typescript：`ButtonProps`，[Button API Documents](./button?tab=api)。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/fab/type.ts) | N -draggable | String / Boolean | false | Typescript：`boolean \| DirectionEnum ` `type DirectionEnum = 'all' \| 'vertical' \| 'horizontal'`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/fab/type.ts) | N +draggable | String / Boolean | false | Typescript：`boolean \| FabDirectionEnum ` `type FabDirectionEnum = 'all' \| 'vertical' \| 'horizontal'`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/fab/type.ts) | N icon | String | - | \- | N text | String | - | \- | N using-custom-navbar | Boolean | false | \- | N -y-edge | Array | - | Typescript：`Array` | N +y-bounds | Array | - | Typescript：`Array` | N ### Fab Events diff --git a/packages/products/tdesign-miniprogram/src/fab/README.md b/packages/products/tdesign-miniprogram/src/fab/README.md index 6528f75f5..02ced92f9 100644 --- a/packages/products/tdesign-miniprogram/src/fab/README.md +++ b/packages/products/tdesign-miniprogram/src/fab/README.md @@ -9,11 +9,11 @@ style | Object | - | 样式 | N custom-style | Object | - | 样式，一般用于开启虚拟化组件节点场景 | N button-props | Object | - | 透传至 Button 组件。TS 类型：`ButtonProps`，[Button API Documents](./button?tab=api)。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/fab/type.ts) | N -draggable | String / Boolean | false | 是否可拖拽。`true` / `'all'`可拖动
`'vertical'`可垂直拖动
`'horizontal'`可水平拖动
`false`禁止拖动。TS 类型：`boolean \| DirectionEnum ` `type DirectionEnum = 'all' \| 'vertical' \| 'horizontal'`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/fab/type.ts) | N +draggable | String / Boolean | false | 是否可拖拽。`true` / `'all'`可拖动
`'vertical'`可垂直拖动
`'horizontal'`可水平拖动
`false`禁止拖动。TS 类型：`boolean \| FabDirectionEnum ` `type FabDirectionEnum = 'all' \| 'vertical' \| 'horizontal'`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/fab/type.ts) | N icon | String | - | 图标 | N text | String | - | 文本内容 | N using-custom-navbar | Boolean | false | 是否使用了自定义导航栏 | N -y-edge | Array | - | 设置垂直方向边界限制，示例：[48, 48] 或 ['96rpx', 80]。TS 类型：`Array` | N +y-bounds | Array | - | 设置垂直方向边界限制，示例：[48, 48] 或 ['96rpx', 80]。TS 类型：`Array` | N ### Fab Events diff --git a/packages/products/tdesign-miniprogram/src/fab/props.ts b/packages/products/tdesign-miniprogram/src/fab/props.ts index 576891f2d..b206fc958 100644 --- a/packages/products/tdesign-miniprogram/src/fab/props.ts +++ b/packages/products/tdesign-miniprogram/src/fab/props.ts @@ -36,7 +36,7 @@ const props: TdFabProps = { value: false, }, /** 设置垂直方向边界限制，示例：[48, 48] 或 ['96rpx', 80] */ - yEdge: { + yBounds: { type: Array, }, }; diff --git a/packages/products/tdesign-miniprogram/src/fab/type.ts b/packages/products/tdesign-miniprogram/src/fab/type.ts index 6dcff50bb..a70a45de4 100644 --- a/packages/products/tdesign-miniprogram/src/fab/type.ts +++ b/packages/products/tdesign-miniprogram/src/fab/type.ts @@ -20,7 +20,7 @@ export interface TdFabProps { */ draggable?: { type: null; - value?: boolean | DirectionEnum; + value?: boolean | FabDirectionEnum; }; /** * 图标 @@ -57,10 +57,10 @@ export interface TdFabProps { /** * 设置垂直方向边界限制，示例：[48, 48] 或 ['96rpx', 80] */ - yEdge?: { + yBounds?: { type: ArrayConstructor; value?: Array; }; } -export type DirectionEnum = 'all' | 'vertical' | 'horizontal'; +export type FabDirectionEnum = 'all' | 'vertical' | 'horizontal'; diff --git a/packages/scripts/api.json b/packages/scripts/api.json index b19e13526..0b234204b 100644 --- a/packages/scripts/api.json +++ b/packages/scripts/api.json @@ -47425,7 +47425,7 @@ "create_time": "2024-04-01 10:59:27", "update_time": "2024-04-01 10:59:27", "event_output": null, - "custom_field_type": "boolean | DirectionEnum 【type DirectionEnum = 'all' | 'vertical' | 'horizontal'】", + "custom_field_type": "boolean | FabDirectionEnum 【type FabDirectionEnum = 'all' | 'vertical' | 'horizontal'】", "syntactic_sugar": null, "readonly": 1, "html_attribute": 0, @@ -47684,7 +47684,7 @@ ], "component": "Fab", "field_category": 1, - "field_name": "yEdge", + "field_name": "yBounds", "field_type": [ "16" ],