diff --git a/packages/collapse-item/index.vue b/packages/collapse-item/index.vue index 87780a748..1d71cc012 100644 --- a/packages/collapse-item/index.vue +++ b/packages/collapse-item/index.vue @@ -5,8 +5,11 @@ { 'van-hairline--top': index } ]" > - - {{ title }} + + + + +
@@ -28,7 +31,18 @@ export default create({ props: { name: [String, Number], - title: String + icon: String, + label: String, + title: [String, Number], + value: [String, Number], + border: { + type: Boolean, + default: true + }, + isLink: { + type: Boolean, + default: true + } }, data() { diff --git a/packages/collapse/demo/index.vue b/packages/collapse/demo/index.vue index 990a19393..850a1fb27 100644 --- a/packages/collapse/demo/index.vue +++ b/packages/collapse/demo/index.vue @@ -22,7 +22,9 @@
{{ $t('title1') }}
{{ $t('content1') }} - {{ $t('content2') }} + + {{ $t('content2') }} + diff --git a/packages/collapse/en-US.md b/packages/collapse/en-US.md index 635689af0..0f7411030 100644 --- a/packages/collapse/en-US.md +++ b/packages/collapse/en-US.md @@ -85,11 +85,19 @@ export default { | Attribute | Description | Type | Default | |-----------|-----------|-----------|-------------| | name | Name | `String | Number` | `index` | -| title | Title | `String` | - | +| icon | Left Icon | `String` | - | +| title | Title | `String | Number` | - | +| value | Right text | `String | Number` | - | +| label | Description below the title | `String` | - | +| border | Whether to show inner border | `Boolean` | `true` | +| is-link | Whether to show link icon | `Boolean` | `true` | ### CollapseItem Slot | name | Description | |-----------|-----------| | default | Content | -| title | Custom title | \ No newline at end of file +| value | Custom value | +| icon | Custom icon | +| title | Custom title | +| right-icon | Custom right icon | diff --git a/packages/collapse/test/__snapshots__/demo.spec.js.snap b/packages/collapse/test/__snapshots__/demo.spec.js.snap index 0c7771295..891f25655 100644 --- a/packages/collapse/test/__snapshots__/demo.spec.js.snap +++ b/packages/collapse/test/__snapshots__/demo.spec.js.snap @@ -7,8 +7,10 @@ exports[`renders demo correctly 1`] = `
- -
有赞微商城
+
有赞微商城 + +
+
@@ -20,8 +22,10 @@ exports[`renders demo correctly 1`] = `
- -
有赞零售
+
有赞零售 + +
+
@@ -31,8 +35,10 @@ exports[`renders demo correctly 1`] = `
- -
有赞美业
+
有赞美业 + +
+
@@ -46,8 +52,10 @@ exports[`renders demo correctly 1`] = `
- -
有赞微商城
+
有赞微商城 + +
+
@@ -59,8 +67,10 @@ exports[`renders demo correctly 1`] = `
- -
有赞零售
+
有赞零售 + +
+
@@ -70,8 +80,10 @@ exports[`renders demo correctly 1`] = `
- -
有赞美业
+
有赞美业 + +
+
@@ -85,14 +97,14 @@ exports[`renders demo correctly 1`] = `
- -
+
有赞微商城
+
@@ -101,9 +113,13 @@ exports[`renders demo correctly 1`] = `
- - -
有赞零售
+ + + +
有赞零售 + +
+
diff --git a/packages/collapse/zh-CN.md b/packages/collapse/zh-CN.md index 62b27e8d3..58e61cc3a 100644 --- a/packages/collapse/zh-CN.md +++ b/packages/collapse/zh-CN.md @@ -97,12 +97,19 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |-----------|-----------|-----------|-------------|-------------| | name | 面板唯一标识符,默认为索引值 | `String | Number` | `index` | -| title | 标题 | `String` | - | - +| icon | 左侧图标,可选值见 Icon 组件 | `String` | - | +| title | 左侧标题 | `String | Number` | - | +| value | 右侧内容 | `String | Number` | - | +| label | 标题下方的描述信息 | `String` | - | +| border | 是否显示内边框 | `Boolean` | `true` | +| is-link | 是否展示右侧箭头并开启点击反馈 | `Boolean` | `true` | ### CollapseItem Slot | 名称 | 说明 | |-----------|-----------| | default | 面板内容 | -| title | 自定义标题内容 | \ No newline at end of file +| value | 自定义显示内容 | +| icon | 自定义`icon` | +| title | 自定义`title` | +| right-icon | 自定义右侧按钮,默认是`arrow` |