diff --git a/packages/checkbox/index.wxml b/packages/checkbox/index.wxml index d320d0f3a..dcc47d560 100644 --- a/packages/checkbox/index.wxml +++ b/packages/checkbox/index.wxml @@ -1,7 +1,13 @@ - + diff --git a/packages/icon/README.md b/packages/icon/README.md index 722ddeade..c8dd9b9a1 100644 --- a/packages/icon/README.md +++ b/packages/icon/README.md @@ -27,6 +27,7 @@ | info | 图标右上角文字提示 | `String | Number` | - | | color | 图标颜色 | `String` | `inherit` | | size | 图标大小,如 `20px`,`2em` | `String` | `inherit` | +| custom-style | 自定义样式 | `String` | - | | class-prefix | 类名前缀 | `String` | `van-icon` | ### Event diff --git a/packages/icon/index.ts b/packages/icon/index.ts index e239c4b7b..c73f6e737 100644 --- a/packages/icon/index.ts +++ b/packages/icon/index.ts @@ -6,6 +6,7 @@ VantComponent({ name: String, size: String, color: String, + customStyle: String, classPrefix: { type: String, value: 'van-icon' diff --git a/packages/icon/index.wxml b/packages/icon/index.wxml index 2ea3e9fba..87553baeb 100644 --- a/packages/icon/index.wxml +++ b/packages/icon/index.wxml @@ -1,6 +1,6 @@ {{ info }} diff --git a/types/index.d.ts b/types/index.d.ts index bf9e9927d..5dc3f95f6 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -31,7 +31,7 @@ export type CombinedComponentInstance< Weapp.Component & Weapp.FormField & ComponentInstance & { - data: Data & RecordToAny & RecordToReturn; + data: Data & LooseObject & RecordToAny & RecordToReturn; }; export type VantComponentOptions<