diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue index 43a792845..a49ce583f 100644 --- a/src/components/FormModel.vue +++ b/src/components/FormModel.vue @@ -287,7 +287,7 @@ function updateAndEmit(evt, { val, res, old } = { val: null, res: null, old: nul state.set(modelValue, val); if (!$props.url) arrayData.store.data = val; - emit(evt, state.get(modelValue), res, old); + emit(evt, state.get(modelValue), res, old, formData); } function trimData(data) { diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 8915500fc..3c431fa14 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -34,7 +34,7 @@ import VnTableFilter from './VnTableFilter.vue'; import { getColAlign } from 'src/composables/getColAlign'; import RightMenu from '../common/RightMenu.vue'; import VnScroll from '../common/VnScroll.vue'; -import VnMultiCheck from '../common/VnMultiCheck.vue'; +import VnCheckboxMenu from '../common/VnCheckboxMenu.vue'; const arrayData = useArrayData(useAttrs()['data-key']); const $props = defineProps({ @@ -644,21 +644,15 @@ const rowCtrlClickFunction = computed(() => { }; return () => {}; }); -const handleMultiCheck = (value) => { - if (value) { +const handleHeaderSelection = (evt, data) => { + if (evt === 'selected' && data) { selected.value = tableRef.value.rows; - } else { - selected.value = []; - } - emit('update:selected', selected.value); -}; - -const handleSelectedAll = (data) => { - if (data) { + } else if (evt === 'selectAll') { selected.value = data; } else { selected.value = []; } + emit('update:selected', selected.value); }; @@ -724,14 +718,14 @@ const handleSelectedAll = (data) => { :data-cy >