Browse Source

fix missing merge conflict

pull/4749/head
flisowna 2 years ago
parent
commit
53ad48fdb7
  1. 6
      packages/nc-gui/components/smartsheet/expanded-form/index.vue

6
packages/nc-gui/components/smartsheet/expanded-form/index.vue

@ -25,7 +25,7 @@ import type { Row } from '~/lib'
const props = defineProps<Props>() const props = defineProps<Props>()
const emits = defineEmits(['update:modelValue', 'cancel']) const emits = defineEmits(['update:modelValue', 'cancel', 'next', 'prev'])
interface Props { interface Props {
modelValue?: boolean modelValue?: boolean
@ -39,10 +39,6 @@ interface Props {
showNextPrevIcons?: boolean showNextPrevIcons?: boolean
} }
const props = defineProps<Props>()
const emits = defineEmits(['update:modelValue', 'cancel', 'next', 'prev'])
const row = ref(props.row) const row = ref(props.row)
const state = toRef(props, 'state') const state = toRef(props, 'state')

Loading…
Cancel
Save