diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue index c2eb894db..93a2ac96a 100644 --- a/src/components/CrudModel.vue +++ b/src/components/CrudModel.vue @@ -237,12 +237,12 @@ async function remove(data) { componentProps: { title: t('globals.confirmDeletion'), message: t('globals.confirmDeletionMessage'), - newData, + data: { deletes: ids }, ids, + promise: saveChanges, }, }) .onOk(async () => { - await saveChanges({ deletes: ids }); newData = newData.filter((form) => !ids.some((id) => id == form[pk])); fetch(newData); }); diff --git a/src/components/ui/SkeletonDescriptor.vue b/src/components/ui/SkeletonDescriptor.vue index 9679751f5..f9188221a 100644 --- a/src/components/ui/SkeletonDescriptor.vue +++ b/src/components/ui/SkeletonDescriptor.vue @@ -1,53 +1,32 @@ + - - diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue index 0d9512971..a0576ee2a 100644 --- a/src/pages/Entry/Card/EntryBuys.vue +++ b/src/pages/Entry/Card/EntryBuys.vue @@ -16,6 +16,7 @@ import ItemDescriptor from 'src/pages/Item/Card/ItemDescriptor.vue'; import axios from 'axios'; import VnSelectEnum from 'src/components/common/VnSelectEnum.vue'; import { checkEntryLock } from 'src/composables/checkEntryLock'; +import SkeletonDescriptor from 'src/components/ui/SkeletonDescriptor.vue'; const $props = defineProps({ id: { @@ -50,7 +51,9 @@ const columns = [ toolTip: t('Ignored for available'), name: 'isIgnored', component: 'checkbox', - toggleIndeterminate: false, + attrs: { + toggleIndeterminate: false, + }, create: true, width: '25px', }, @@ -348,7 +351,9 @@ const columns = [ label: t('Check min price'), toolTip: t('Check min price'), name: 'hasMinPrice', - toggleIndeterminate: false, + attrs: { + toggleIndeterminate: false, + }, component: 'checkbox', cellEvent: { 'update:modelValue': async (value, oldValue, row) => { @@ -715,7 +720,8 @@ onMounted(() => {