blackteay/vant-weapp
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant-weapp.git synced 2025-04-06 03:58:05 +08:00
Code Issues Projects Releases Wiki Activity

[bugfix] Tab: active type should be number (#665)

Browse Source
This commit is contained in:
neverland 2018-09-28 15:38:29 +08:00 committed by GitHub
parent 0e3ee3dc77
commit 7c7d69230d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/mixins/observer/index.js vendored
View File

@ -10,7 +10,7 @@ export function observe(vantOptions, options) {
if (key in props) { if (key in props) {
var prop = props[key]; var prop = props[key];
if (prop === null || !prop.type) { if (prop === null || !('type' in prop)) {
prop = { prop = {
type: prop type: prop
}; };

2
dist/mixins/observer/props.js vendored
View File

@ -6,7 +6,7 @@ export function observeProps(props) {
Object.keys(props).forEach(function (key) { Object.keys(props).forEach(function (key) {
var prop = props[key]; var prop = props[key];
if (prop === null || !prop.type) { if (prop === null || !('type' in prop)) {
prop = { prop = {
type: prop type: prop
}; };

4
dist/tabs/index.js vendored
View File

@ -25,7 +25,7 @@ VantComponent({
color: String, color: String,
lineWidth: Number, lineWidth: Number,
active: { active: {
type: null, type: Number,
value: 0 value: 0
}, },
type: { type: {
@ -139,7 +139,7 @@ VantComponent({
this.scrollIntoView(); this.scrollIntoView();
}, },
// scroll active tab into view // scroll active tab into view
scrollIntoView: function scrollIntoView(immediate) { scrollIntoView: function scrollIntoView() {
var _this3 = this; var _this3 = this;
if (!this.data.scrollable) { if (!this.data.scrollable) {

2
packages/mixins/observer/index.ts
View File

@ -9,7 +9,7 @@ export function observe(vantOptions, options) {
Object.keys(watch).forEach(key => { Object.keys(watch).forEach(key => {
if (key in props) { if (key in props) {
let prop = props[key]; let prop = props[key];
if (prop === null || !prop.type) { if (prop === null || !('type' in prop)) {
prop = { type: prop }; prop = { type: prop };
} }
prop.observer = watch[key]; prop.observer = watch[key];

2
packages/mixins/observer/props.ts
View File

@ -5,7 +5,7 @@ export function observeProps(props) {
Object.keys(props).forEach(key => { Object.keys(props).forEach(key => {
let prop = props[key]; let prop = props[key];
if (prop === null || !prop.type) { if (prop === null || !('type' in prop)) {
prop = { type: prop }; prop = { type: prop };
} }

2
packages/tab/README.md
View File

@ -115,7 +115,7 @@ Page({
| 参数 | 说明 | 类型 | 默认值 | | 参数 | 说明 | 类型 | 默认值 |
|-----------|-----------|-----------|-------------| |-----------|-----------|-----------|-------------|
| active | 当前激活标签的索引 | `String` `Number` | `0` | | active | 当前激活标签的索引 | `Number` | `0` |
| color | 标签颜色 | `String` | `#f44` | | color | 标签颜色 | `String` | `#f44` |
| type | 样式风格，可选值为`card` | `String` | `line` | | type | 样式风格，可选值为`card` | `String` | `line` |
| border | 是否展示外边框，仅在`line`风格下生效 | `Boolean` | `true` | | border | 是否展示外边框，仅在`line`风格下生效 | `Boolean` | `true` |

8
packages/tabs/index.ts
View File

@ -30,7 +30,7 @@ VantComponent({
color: String, color: String,
lineWidth: Number, lineWidth: Number,
active: { active: {
type: null, type: Number,
value: 0 value: 0
}, },
type: { type: {
@ -84,7 +84,7 @@ VantComponent({
this.setActiveTab(); this.setActiveTab();
}, },
trigger(eventName, index) { trigger(eventName: string, index: number) {
this.$emit(eventName, { this.$emit(eventName, {
index, index,
title: this.data.tabs[index].data.title title: this.data.tabs[index].data.title
@ -101,7 +101,7 @@ VantComponent({
} }
}, },
setActive(active) { setActive(active: number) {
if (active !== this.data.active) { if (active !== this.data.active) {
this.trigger('change', active); this.trigger('change', active);
this.setData({ active }); this.setData({ active });
@ -153,7 +153,7 @@ VantComponent({
}, },
// scroll active tab into view // scroll active tab into view
scrollIntoView(immediate) { scrollIntoView() {
if (!this.data.scrollable) { if (!this.data.scrollable) {
return; return;
} }