zhangtao
/
restructure
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

合并代码冲突

This commit is contained in:
余菲 2022-05-26 15:47:43 +08:00
parent 3108937e32 8dc6937c30
commit 28fa7e4b1e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/DataTable/tools/Switch.vue
View File

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