Skip to content

Commit

Permalink
fix: checkbox modelValue and change
Browse files Browse the repository at this point in the history
  • Loading branch information
Lydanne committed Oct 1, 2020
1 parent b784802 commit 594a141
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 132 deletions.
159 changes: 31 additions & 128 deletions examples/play/index.vue
Original file line number Diff line number Diff line change
@@ -1,136 +1,39 @@
<template>
<div class="custom-tree-container">
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="用户管理" name="first">用户管理</el-tab-pane>
<el-tab-pane label="配置管理" name="second">配置管理</el-tab-pane>
<el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>
<el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>
</el-tabs> -->
<el-checkbox-group v-model="value" @change="change">
<el-checkbox label="1">1</el-checkbox>
<el-checkbox label="2">2</el-checkbox>
</el-checkbox-group>

<div class="block">
<p>使用 scoped slot</p>
<el-tree
ref="elTree"
show-checkbox
draggable
async
:expandOnClickNode="false"
:render-content="renderContent"
:async-load-fn="load"
v-model:checked="checked"
>
</el-tree>
</div>
</div>
</template>

<script>
import { h } from 'vue';
let id = 1000;
export default {
data () {
const data = [{
id: 1,
label: '一级 1',
children: [{
id: 4,
label: '二级 1-1',
children: [{
id: 9,
label: '三级 1-1-1'
}, {
id: 10,
label: '三级 1-1-2'
}]
}]
}, {
id: 2,
label: '一级 2',
children: [{
id: 5,
label: '二级 2-1'
}, {
id: 6,
label: '二级 2-2'
}]
}, {
id: 3,
label: '一级 3',
children: [{
id: 7,
label: '二级 3-1'
}, {
id: 8,
label: '二级 3-2',
isAsync: true
}]
}];
return {
data: JSON.parse(JSON.stringify(data)),
checked:[]
}
},
watch: {
data: {
deep: true,
handler: function (val, oldVal) {
console.log('val :>> ', val);
}
export default {
data() {
return {
activeName: 'second',
value: false
};
},
checked(v){
console.log('v :>> ', v);
}
},
methods: {
append (node, data) {
const newChild = { id: id++, label: 'testtest', children: [] };
if (!data.children) {
data.children = [];
watch:{
value:{
handler(v){
console.log('watch v :>> ', v);
},
deep:true
}
node.append(newChild);
// data.children.push(newChild)
},
remove (node) {
node.remove()
},
renderContent ({ node, data }) {
// return h('span', node.label)
return (
<span class="custom-tree-node">
<span>{node.label}</span>
<span>
<el-button size="mini" type="text" onClick={() => this.append(node, data)}>Append</el-button>
<el-button size="mini" type="text" onClick={() => this.remove(node, data)}>Delete</el-button>
</span>
</span>);
},
load (node, resolve) {
console.log('node :>> ', node, this);
setTimeout(() => {
resolve([{
id: 7,
label: '二级 3-1'
}])
console.log('node :>> ', node);
}, 3000)
methods: {
handleClick(tab, event) {
console.log(tab, event);
},
change(v){
console.log('change v :>> ', v);
}
}
},
async mounted () {
// setTimeout(() => {
// this.checked.push(7)
// }, 1000);
},
};
</script>

<style>
.custom-tree-node {
flex: 1;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
padding-right: 8px;
}
</style>
};
</script>
20 changes: 16 additions & 4 deletions packages/checkbox/uses.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import {
onMounted,
getCurrentInstance,
inject,
nextTick
nextTick,
reactive,
watchEffect
} from 'vue'
import { useEmitter } from 'element-ui/src/use/emitter'
import { usePropUtils } from 'element-ui/src/use/prop-utils'
Expand All @@ -15,11 +17,18 @@ export function useModel() {
const { emit, props } = getCurrentInstance()
const elCheckboxGroup = inject('elCheckboxGroup', { props: {} })
const { dispatch } = useEmitter()
const state = reactive({
modelValue: null
// If the parent element is ChceckboxGroup use its modelValue
})

watchEffect(() => {
state.modelValue = elCheckboxGroup.props.modelValue || props.modelValue
})

const model = computed({
get() {
const modelValue = elCheckboxGroup.props.modelValue || props.modelValue // If the parent element is ChceckboxGroup use its modelValue
return modelValue
return state.modelValue
// BUG: if the Checkbox list and modelValue are an object, this causes the object element to be deleted.
// Resolve: `isArray(modelValue) ? [...modelValue] : modelValue`, but doing so will invalidate the `checked` prop.
},
Expand All @@ -32,10 +41,13 @@ export function useModel() {
labelIndex !== -1 &&
checked === false &&
modelValue.splice(labelIndex, 1)
state.modelValue = modelValue
emit('update:modelValue', modelValue)
dispatch('update:modelValue', modelValue)
} else {
emit('update:modelValue', checked ? props.trueLabel : props.falseLabel)
const modelValue = checked ? props.trueLabel : props.falseLabel
state.modelValue = modelValue
emit('update:modelValue', modelValue)
}
}
})
Expand Down

0 comments on commit 594a141

Please sign in to comment.