diff --git a/packages/collapse/en-US.md b/packages/collapse/en-US.md
index e29fcc288..43b74aed1 100644
--- a/packages/collapse/en-US.md
+++ b/packages/collapse/en-US.md
@@ -77,6 +77,7 @@ export default {
|------|------|------|------|
| v-model | names of current active panels | `Array | String | Number` | - |
| accordion | Whether to be accordion mode | `Boolean` | `false` |
+| border | Whether to show outer border | `Boolean` | `true` |
### Collapse Event
diff --git a/packages/collapse/index.js b/packages/collapse/index.js
index 518312f36..38dadf554 100644
--- a/packages/collapse/index.js
+++ b/packages/collapse/index.js
@@ -5,7 +5,11 @@ const [sfc, bem] = use('collapse');
export default sfc({
props: {
accordion: Boolean,
- value: [String, Number, Array]
+ value: [String, Number, Array],
+ border: {
+ type: Boolean,
+ default: true
+ }
},
data() {
@@ -27,6 +31,10 @@ export default sfc({
},
render(h) {
- return
{this.slots()}
;
+ return (
+
+ {this.slots()}
+
+ );
}
});
diff --git a/packages/collapse/test/__snapshots__/index.spec.js.snap b/packages/collapse/test/__snapshots__/index.spec.js.snap
index 6c08939c5..ba6f0fc48 100644
--- a/packages/collapse/test/__snapshots__/index.spec.js.snap
+++ b/packages/collapse/test/__snapshots__/index.spec.js.snap
@@ -1,5 +1,28 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
+exports[`disable border 1`] = `
+
+`;
+
exports[`render collapse-item slot 1`] = `
diff --git a/packages/collapse/test/index.spec.js b/packages/collapse/test/index.spec.js
index 1f4a12a10..6741f3dba 100644
--- a/packages/collapse/test/index.spec.js
+++ b/packages/collapse/test/index.spec.js
@@ -4,7 +4,7 @@ import { later, mount } from '../../../test/utils';
const component = {
template: `
-
+
content
content
content
@@ -15,7 +15,11 @@ const component = {
CollapseItem
},
props: {
- accordion: Boolean
+ accordion: Boolean,
+ border: {
+ type: Boolean,
+ default: true
+ }
},
data() {
return {
@@ -89,3 +93,13 @@ it('render collapse-item slot', () => {
expect(wrapper).toMatchSnapshot();
});
+
+it('disable border', () => {
+ const wrapper = mount(component, {
+ propsData: {
+ border: false
+ }
+ });
+
+ expect(wrapper).toMatchSnapshot();
+});
diff --git a/packages/collapse/zh-CN.md b/packages/collapse/zh-CN.md
index 00ce3bf74..3455e920d 100644
--- a/packages/collapse/zh-CN.md
+++ b/packages/collapse/zh-CN.md
@@ -87,8 +87,9 @@ export default {
| 参数 | 说明 | 类型 | 默认值 | 版本 |
|------|------|------|------|------|
-| v-model | 当前展开面板的 name | `Array | String | Number` | - |
-| accordion | 是否开启手风琴模式 | `Boolean` | `false` |
+| v-model | 当前展开面板的 name | `Array | String | Number` | - | - |
+| accordion | 是否开启手风琴模式 | `Boolean` | `false` | - |
+| border | 是否显示外边框 | `Boolean` | `true` | 1.6.9 |
### Collapse Event