diff --git a/src/checkbox/index.js b/src/checkbox/index.js index fc3080ac4..f7cefc3b7 100644 --- a/src/checkbox/index.js +++ b/src/checkbox/index.js @@ -46,24 +46,19 @@ export default createComponent({ } }; - const checked = computed({ - get() { - if (parent) { - return parent.props.modelValue.indexOf(props.name) !== -1; - } - return props.modelValue; - }, - set(value) { - if (parent) { - setParentValue(value); - } else { - emit('update:modelValue', value); - } - }, + const checked = computed(() => { + if (parent) { + return parent.props.modelValue.indexOf(props.name) !== -1; + } + return props.modelValue; }); const toggle = (newValue = !checked.value) => { - checked.value = newValue; + if (parent) { + setParentValue(newValue); + } else { + emit('update:modelValue', newValue); + } }; watch( diff --git a/src/circle/index.js b/src/circle/index.js index 0f218eb58..a6dd41438 100644 --- a/src/circle/index.js +++ b/src/circle/index.js @@ -157,7 +157,6 @@ export default createComponent({ if (slots.default) { return slots.default(); } - if (props.text) { return