diff --git a/docs/markdown/v2-progress-tracking.md b/docs/markdown/v2-progress-tracking.md index cf406782f..0b208e6f6 100644 --- a/docs/markdown/v2-progress-tracking.md +++ b/docs/markdown/v2-progress-tracking.md @@ -162,6 +162,7 @@ ### Tabbar - 新增`route`属性 +- 新增`border`属性 - 新增`inactive-color`属性 ### TabbarItem diff --git a/packages/tabbar/en-US.md b/packages/tabbar/en-US.md index cd9596524..0e4de2e05 100644 --- a/packages/tabbar/en-US.md +++ b/packages/tabbar/en-US.md @@ -142,6 +142,7 @@ export default { |------|------|------|------| | v-model | Identifier of current tab | `String | Number` | `0` | | fixed | Whether to fixed bottom | `Boolean` | `true` | +| border | Whether to show border | `Boolean` | `true` | | z-index | Z-index | `Number` | `1` | | active-color | Color of active tab item | `String` | `#1989fa` | | inactive-color | Color of inactive tab item | `String` | `#7d7e80` | diff --git a/packages/tabbar/index.js b/packages/tabbar/index.js index 43cc31277..dae4f069d 100644 --- a/packages/tabbar/index.js +++ b/packages/tabbar/index.js @@ -15,6 +15,10 @@ export default sfc({ type: [String, Number], default: 0 }, + border: { + type: Boolean, + default: true + }, fixed: { type: Boolean, default: true @@ -55,7 +59,7 @@ export default sfc({
`; + exports[`route mode 1`] = `
diff --git a/packages/tabbar/test/index.spec.js b/packages/tabbar/test/index.spec.js index 634442c9e..116fe1951 100644 --- a/packages/tabbar/test/index.spec.js +++ b/packages/tabbar/test/index.spec.js @@ -112,3 +112,13 @@ test('name prop', () => { expect(onChange).toHaveBeenCalledWith('b'); }); + +test('disable border', () => { + const wrapper = mount(Tabbar, { + propsData: { + border: false + } + }); + + expect(wrapper).toMatchSnapshot(); +}); diff --git a/packages/tabbar/zh-CN.md b/packages/tabbar/zh-CN.md index 584e374a7..c3dbb2682 100644 --- a/packages/tabbar/zh-CN.md +++ b/packages/tabbar/zh-CN.md @@ -148,6 +148,7 @@ export default { |------|------|------|------|------| | v-model | 当前选中标签的名称或索引值 | `String | Number` | `0` | - | | fixed | 是否固定在底部 | `Boolean` | `true` | - | +| border | 是否显示外边框 | `Boolean` | `true` | 2.0.0 | | z-index | 元素 z-index | `Number` | `1` | 1.1.9 | | active-color | 选中标签的颜色 | `String` | `#1989fa` | 1.5.1 | | inactive-color | 未选中标签的颜色 | `String` | `#7d7e80` | 2.0.0 |