diff --git a/db/TDesign.db b/db/TDesign.db index 4a8e3134..b468ad42 100644 Binary files a/db/TDesign.db and b/db/TDesign.db differ diff --git a/packages/products/tdesign-miniprogram/src/button/README.en-US.md b/packages/products/tdesign-miniprogram/src/button/README.en-US.md index 9ed8cfe8..84769f31 100644 --- a/packages/products/tdesign-miniprogram/src/button/README.en-US.md +++ b/packages/products/tdesign-miniprogram/src/button/README.en-US.md @@ -11,7 +11,7 @@ custom-style | Object | - | CSS(Cascading Style Sheets)，used to set style on v app-parameter | String | - | \- | N block | Boolean | false | make button to be a block-level element | N content | String / Slot | - | button's children elements。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/src/common/common.ts) | N -custom-dataset | Object | - | Typescript：`any` | N +custom-dataset | any | - | \- | N disabled | Boolean | undefined | disable the button, make it can not be clicked | N ghost | Boolean | false | make background-color to be transparent | N hover-class | String | - | \- | N diff --git a/packages/products/tdesign-miniprogram/src/button/README.md b/packages/products/tdesign-miniprogram/src/button/README.md index e4374dda..fc5c733b 100644 --- a/packages/products/tdesign-miniprogram/src/button/README.md +++ b/packages/products/tdesign-miniprogram/src/button/README.md @@ -11,7 +11,7 @@ custom-style | Object | - | 样式，一般用于开启虚拟化组件节点场 app-parameter | String | - | 打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效 | N block | Boolean | false | 是否为块级元素 | N content | String / Slot | - | 按钮内容。[通用类型定义](https://github.com/Tencent/tdesign-miniprogram/blob/develop/src/common/common.ts) | N -custom-dataset | Object | - | 自定义 dataset，可通过 event.currentTarget.dataset.custom 获取。。TS 类型：`any` | N +custom-dataset | any | - | 自定义 dataset，可通过 event.currentTarget.dataset.custom 获取 | N disabled | Boolean | undefined | 禁用状态。优先级：Button.disabled > Form.disabled | N ghost | Boolean | false | 是否为幽灵按钮（镂空按钮） | N hover-class | String | - | 指定按钮按下去的样式类，按钮不为加载或禁用状态时有效。当 `hover-class="none"` 时，没有点击态效果 | N diff --git a/packages/products/tdesign-miniprogram/src/button/props.ts b/packages/products/tdesign-miniprogram/src/button/props.ts index 053849d6..8f9a101e 100644 --- a/packages/products/tdesign-miniprogram/src/button/props.ts +++ b/packages/products/tdesign-miniprogram/src/button/props.ts @@ -20,9 +20,9 @@ const props: TdButtonProps = { content: { type: String, }, - /** 自定义 dataset，可通过 event.currentTarget.dataset.custom 获取。 */ + /** 自定义 dataset，可通过 event.currentTarget.dataset.custom 获取 */ customDataset: { - type: Object, + type: null, }, /** 禁用状态。优先级：Button.disabled > Form.disabled */ disabled: { diff --git a/packages/products/tdesign-miniprogram/src/button/type.ts b/packages/products/tdesign-miniprogram/src/button/type.ts index e6c8cef4..6d0ca0c2 100644 --- a/packages/products/tdesign-miniprogram/src/button/type.ts +++ b/packages/products/tdesign-miniprogram/src/button/type.ts @@ -31,11 +31,11 @@ export interface TdButtonProps { value?: string; }; /** - * 自定义 dataset，可通过 event.currentTarget.dataset.custom 获取。 + * 自定义 dataset，可通过 event.currentTarget.dataset.custom 获取 */ customDataset?: { - type: ObjectConstructor; - value?: any; + type: null; + value?: null; }; /** * 禁用状态。优先级：Button.disabled > Form.disabled diff --git a/packages/scripts/api.json b/packages/scripts/api.json index f6a6035e..8dd775f0 100644 --- a/packages/scripts/api.json +++ b/packages/scripts/api.json @@ -13886,18 +13886,18 @@ "field_category": 1, "field_name": "customDataset", "field_type": [ - "8" + "512" ], "field_default_value": "", "field_enum": "", - "field_desc_zh": "自定义 dataset，可通过 event.currentTarget.dataset.custom 获取。", + "field_desc_zh": "自定义 dataset，可通过 event.currentTarget.dataset.custom 获取", "field_desc_en": null, "field_required": 0, "event_input": "", "create_time": "2022-03-14 07:32:55", "update_time": "2022-03-14 07:40:54", "event_output": null, - "custom_field_type": "any", + "custom_field_type": "", "syntactic_sugar": null, "readonly": 1, "html_attribute": 0, @@ -13911,7 +13911,7 @@ "Miniprogram" ], "field_type_text": [ - "Object" + "any" ] }, { diff --git a/packages/scripts/map.json b/packages/scripts/map.json index 12222add..6a485602 100644 --- a/packages/scripts/map.json +++ b/packages/scripts/map.json @@ -129,6 +129,10 @@ { "label": "File", "value": "256" + }, + { + "label": "any", + "value": "512" } ], "components": [ diff --git a/packages/scripts/types/miniprogram.js b/packages/scripts/types/miniprogram.js index e5d7301d..4066dc6c 100644 --- a/packages/scripts/types/miniprogram.js +++ b/packages/scripts/types/miniprogram.js @@ -9,15 +9,16 @@ function getMiniprogramType(type, tsType, required) { boolean: 'BooleanConstructor', Array: 'ArrayConstructor', Object: 'ObjectConstructor', + any: 'null', }; const types = []; - ['string', 'number', 'boolean', 'Object', 'Array'].forEach((val) => { + ['string', 'number', 'boolean', 'Object', 'Array', 'any'].forEach((val) => { const reg = new RegExp(val, 'i'); if (reg.test(type)) { types.push(MP_PROP_TYPES[val]); } }); - const valueStr = ['function', 'Function'].includes(tsType) ? 'null' : tsType; + const valueStr = ['function', 'Function', 'any'].includes(tsType) ? 'null' : tsType; const isRequired = required ? `required?: boolean;` : ''; diff --git a/packages/scripts/types/vue-props.js b/packages/scripts/types/vue-props.js index 35b16821..c816ef89 100644 --- a/packages/scripts/types/vue-props.js +++ b/packages/scripts/types/vue-props.js @@ -170,10 +170,11 @@ function formatNormalProps(api, cmp, extraParams = {}) { // && content.push(`optionalTypes: [${optionalTypes.join()}]`); content.push(`${indent}type: null`); } else { - let tType = types + let tType = types - if (isMiniprogram){ - if ('Function' === types ){ + if (isMiniprogram) { + const SPECIAL_TYPE = ['Function', 'any']; + if (SPECIAL_TYPE.includes(types)) { tType = 'null' } if ('Boolean' === types && api.field_default_value === 'undefined'){ diff --git a/packages/server/controllers/ComponentApi/const.ts b/packages/server/controllers/ComponentApi/const.ts index 62ac3fb5..4f865d14 100644 --- a/packages/server/controllers/ComponentApi/const.ts +++ b/packages/server/controllers/ComponentApi/const.ts @@ -16,6 +16,7 @@ const FUNCTION = 32; const TNODE = 64; const Date = 128; const FILE = 256; +const ANY = 512; const P_VUE_PC = 1; const P_REACT_PC = 2; @@ -69,6 +70,7 @@ export const FIELD_TYPE_MAP: MapOptions = { [TNODE]: 'TNode', [Date]: 'Date', [FILE]: 'File', + [ANY]: 'any', }; export const PLATFORM_FRAMEWORK: MapOptions = {