diff --git a/src/tab/demo/index.vue b/src/tab/demo/index.vue index 9d24cac71..bcd50a70a 100644 --- a/src/tab/demo/index.vue +++ b/src/tab/demo/index.vue @@ -182,7 +182,7 @@ export default { } .van-tab__pane { - padding: 25px 20px; + padding: 24px 20px; background-color: @white; } diff --git a/src/tab/test/__snapshots__/demo.spec.js.snap b/src/tab/test/__snapshots__/demo.spec.js.snap index c18dfd672..d1077822e 100644 --- a/src/tab/test/__snapshots__/demo.spec.js.snap +++ b/src/tab/test/__snapshots__/demo.spec.js.snap @@ -53,15 +53,15 @@ exports[`renders demo correctly 1`] = `
-
- - - - - - - - +
+ + + + + + + +
@@ -276,15 +276,15 @@ exports[`renders demo correctly 1`] = `
-
- - - - - - - - +
+ + + + + + + +
diff --git a/src/tabs/Title.js b/src/tabs/Title.js index 0f3e481fc..97c57537b 100644 --- a/src/tabs/Title.js +++ b/src/tabs/Title.js @@ -11,7 +11,6 @@ export default createComponent({ color: String, title: String, isActive: Boolean, - ellipsis: Boolean, disabled: Boolean, scrollable: Boolean, activeColor: String, @@ -58,7 +57,7 @@ export default createComponent({ genText() { const Text = ( - + {this.slots() || this.title} ); @@ -85,7 +84,7 @@ export default createComponent({ bem({ active: this.isActive, disabled: this.disabled, - complete: !this.ellipsis, + complete: this.scrollable, }), ]} style={this.style} diff --git a/src/tabs/index.js b/src/tabs/index.js index 2a872d981..00f3383f5 100644 --- a/src/tabs/index.js +++ b/src/tabs/index.js @@ -364,7 +364,7 @@ export default createComponent({ }, render() { - const { type, ellipsis, animated, scrollable } = this; + const { type, animated, scrollable } = this; const Nav = this.children.map((item, index) => ( {this.slots('nav-left')}