合并代码冲突

This commit is contained in:
余菲 2022-05-26 15:47:43 +08:00
commit 28fa7e4b1e
1 changed files with 2 additions and 4 deletions

View File

@ -4,11 +4,9 @@
<script>
import { defineComponent, ref, unref, computed } from 'vue'
import { NSwitch } from 'naive-ui'
export default defineComponent({
name: 'TableSwitch',
props: {
...NSwitch.props,
data: {
type: [Object, String, Number, Boolean],
required: true
@ -18,7 +16,7 @@ export default defineComponent({
default: ''
}
},
emits: ['getRow'],
emits: ['change'],
setup(props, { emit }) {
const switchVlue = ref()
const { data, rowKey } = unref(props)
@ -34,7 +32,7 @@ export default defineComponent({
data,
value
}
emit('getRow', params)
emit('change', params)
}
return {
switchVlue,