update
This commit is contained in:
梁灏 2017-03-03 10:35:38 +08:00
parent de517e39f6
commit e6c0b158e9
6 changed files with 15 additions and 27 deletions

View file

@ -81,10 +81,13 @@
},
mounted () {
// todo 使 while
if (this.$parent && this.$parent.$options.name === 'checkboxGroup') this.group = true;
if (this.$parent && this.$parent.$options.name === 'CheckboxGroup') this.group = true;
if (!this.group) {
this.updateModel();
if (this.$refs.slot && this.$refs.slot.innerHTML === '') {
// if (this.$refs.slot && this.$refs.slot.innerHTML === '') {
// this.showSlot = false;
// }
if (this.$slots.default === undefined) {
this.showSlot = false;
}
}

View file

@ -64,7 +64,7 @@
},
mounted () {
// todo 使 while
if (this.$parent && this.$parent.$options.name === 'radioGroup') this.group = true;
if (this.$parent && this.$parent.$options.name === 'RadioGroup') this.group = true;
if (!this.group) {
this.updateValue();
}

View file

@ -81,7 +81,7 @@
// },
currentValue: {
immediate: true,
handler (val) {
handler () {
this.setHalf(this.currentValue);
}
}

View file

@ -9,7 +9,7 @@
:value="item.checked && item.childrenCheckedStatus == 2"
:disabled="item.disabled || item.disableCheckbox"
:indeterminate="item.checked && item.childrenCheckedStatus == 1"
@click.prevent="setCheck(item.disabled||item.disableCheckbox, index)"></Checkbox>
@click.native.prevent="setCheck(item.disabled||item.disableCheckbox, index)"></Checkbox>
<a :class="titleCls(item)" @click="setSelect(item.disabled, index)">
<span :class="[prefixCls + '-title']" v-html="item.title"></span>
</a>
@ -181,7 +181,7 @@
this.dispatch('Tree', 'nodeSelected', {
ori: this,
selected: selected
})
});
}
},
setCheck (disabled, index) {

View file

@ -91,7 +91,7 @@
transition: all @transition-time @ease-in-out;
}
&.@{tree-prefix-cls}-switcher-noop {
display: none;
//display: none;
cursor: auto;
i{
display: none;

View file

@ -1,21 +1,13 @@
<template>
<div>
<Tree
v-model="treeData"
:show-checkbox="true"
:multiple="true"
@on-select-change="selectFn"
@on-check-change="checkFn"></Tree>
</div>
<Tree v-model="baseData" show-checkbox></Tree>
</template>
<script>
export default {
data: function() {
data () {
return {
treeData: [{
baseData: [{
expand: true,
title: 'parent 1',
selected: false,
children: [{
title: 'parent 1-0',
expand: true,
@ -28,21 +20,14 @@
}]
}, {
title: 'parent 1-1',
expand: true,
checked: true,
children: [{
title: '<span style="color: red">sss</span>',
title: '<span style="color: red">leaf</span>'
}]
}]
}]
}
},
methods: {
selectFn(data){
console.log(data);
},
checkFn(data){
console.log(data);
}
}
}
</script>