[new feature] Collapse: add border prop (#2933)

This commit is contained in:
neverland 2019-03-10 16:21:40 +08:00 committed by GitHub
parent 4d0e3d6644
commit 144fa2d711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 53 additions and 6 deletions

View File

@ -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

View File

@ -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 <div class={[bem(), 'van-hairline--top-bottom']}>{this.slots()}</div>;
return (
<div class={[bem(), { 'van-hairline--top-bottom': this.border }]}>
{this.slots()}
</div>
);
}
});

View File

@ -1,5 +1,28 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`disable border 1`] = `
<div class="van-collapse">
<div class="van-collapse-item">
<div class="van-cell van-cell--clickable van-collapse-item__title">
<div class="van-cell__title"><span>a</span></div><i class="van-icon van-icon-arrow van-cell__right-icon">
<!----></i>
</div>
</div>
<div class="van-collapse-item van-hairline--top">
<div class="van-cell van-cell--clickable van-collapse-item__title">
<div class="van-cell__title"><span>b</span></div><i class="van-icon van-icon-arrow van-cell__right-icon">
<!----></i>
</div>
</div>
<div class="van-collapse-item van-hairline--top">
<div class="van-cell van-cell--clickable van-collapse-item__title">
<div class="van-cell__title"><span>c</span></div><i class="van-icon van-icon-arrow van-cell__right-icon">
<!----></i>
</div>
</div>
</div>
`;
exports[`render collapse-item slot 1`] = `
<div class="van-collapse van-hairline--top-bottom">
<div class="van-collapse-item">

View File

@ -4,7 +4,7 @@ import { later, mount } from '../../../test/utils';
const component = {
template: `
<collapse v-model="active" :accordion="accordion">
<collapse v-model="active" :accordion="accordion" :border="border">
<collapse-item title="a" name="first">content</collapse-item>
<collapse-item title="b">content</collapse-item>
<collapse-item title="c">content</collapse-item>
@ -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();
});

View File

@ -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