fix: tab's props not observable

This commit is contained in:
陈嘉涵 2017-09-27 10:48:50 +08:00
parent b6667ef0e6
commit 37a5c55ddb
3 changed files with 35 additions and 26 deletions

View File

@ -84,8 +84,7 @@ export default {
}, },
isChecked() { isChecked() {
const currentValue = this.currentValue; const { currentValue } = this;
console.log('this.currentValue:', this.currentValue);
if ({}.toString.call(currentValue) === '[object Boolean]') { if ({}.toString.call(currentValue) === '[object Boolean]') {
return currentValue; return currentValue;
} else if (currentValue !== null && currentValue !== undefined) { } else if (currentValue !== null && currentValue !== undefined) {

View File

@ -1,35 +1,51 @@
<template> <template>
<div class="van-tab__pane" :class="classNames"> <div :class="['van-tab__pane', { 'van-tab__pane--select': key === $parent.curActive }]">
<slot></slot> <slot></slot>
</div> </div>
</template> </template>
<script> <script>
import findParent from '../mixins/findParent';
export default { export default {
name: 'van-tab', name: 'van-tab',
mixins: [findParent],
props: { props: {
//
title: { title: {
type: String, type: String,
required: true required: true
}, },
disabled: Boolean disabled: Boolean
}, },
data() {
const nextIndex = this.$parent.tabs.length;
this.$parent.tabs.push({
title: this.title,
disabled: this.disabled,
index: nextIndex
});
data() {
this.findParentByComponentName('van-tabs');
const nextIndex = this.parentGroup.tabs.length;
this.updateParentData(nextIndex);
return { return {
key: nextIndex key: nextIndex
}; };
}, },
computed: {
classNames() { watch: {
return { 'van-tab__pane--select': this.key === this.$parent.curActive }; title() {
this.updateParentData();
},
disabled() {
this.updateParentData();
}
},
methods: {
updateParentData(nextIndex) {
const index = arguments.length ? nextIndex : this.key;
this.parentGroup.tabs.splice(index, 1, {
title: this.title,
disabled: this.disabled,
index
});
} }
} }
}; };

View File

@ -10,7 +10,7 @@
class="van-tab van-hairline" class="van-tab van-hairline"
:class="{ 'van-tab--active': index === curActive }" :class="{ 'van-tab--active': index === curActive }"
ref="tabkey" ref="tabkey"
@click="handleTabClick(index, tab)" @click="handleTabClick(index)"
> >
{{ tab.title }} {{ tab.title }}
</div> </div>
@ -29,7 +29,7 @@
class="van-tab van-hairline" class="van-tab van-hairline"
:class="{ 'van-tab--active': index === curActive }" :class="{ 'van-tab--active': index === curActive }"
ref="tabkey" ref="tabkey"
@click="handleTabClick(index, tab)" @click="handleTabClick(index)"
> >
{{ tab.title }} {{ tab.title }}
</div> </div>
@ -134,14 +134,8 @@
}, },
methods: { methods: {
/** handleTabClick(index) {
* tab点击事件 if (this.tabs[index].disabled) {
*
* @param {number} index tab在tabs中的索引
* @param {Object} el tab的vue实例
*/
handleTabClick(index, el) {
if (el.disabled) {
this.$emit('disabled', index); this.$emit('disabled', index);
return; return;
} }