From 75ba4d4fd9d775439eb23e22bece1ffee11292e9 Mon Sep 17 00:00:00 2001 From: robert Date: Mon, 27 Jan 2025 08:57:24 +0100 Subject: [PATCH] feat: refs #8387 changes request --- src/components/CrudModel.vue | 8 ++++---- src/pages/Item/Card/ItemTags.vue | 22 +++------------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue index 98cd94adc..62e4ed9df 100644 --- a/src/components/CrudModel.vue +++ b/src/components/CrudModel.vue @@ -84,7 +84,7 @@ const saveButtonRef = ref(null); const watchChanges = ref(); const formUrl = computed(() => $props.url); -const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges', 'dataError']); +const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']); defineExpose({ reload, @@ -149,7 +149,7 @@ function filter(value, update, filterOptions) { (ref) => { ref.setOptionIndex(-1); ref.moveOptionSelection(1, true); - } + }, ); } @@ -164,7 +164,7 @@ async function onSubmit() { isLoading.value = true; await saveChanges($props.saveFn ? formData.value : null); } catch (e) { - emit('dataError', e); + throw e; } } @@ -219,7 +219,7 @@ async function remove(data) { if (preRemove.length) { newData = newData.filter( - (form) => !preRemove.some((index) => index == form.$index) + (form) => !preRemove.some((index) => index == form.$index), ); const changes = getChanges(); if (!changes.creates?.length && !changes.updates?.length) diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue index d64929f78..5876cf8dc 100644 --- a/src/pages/Item/Card/ItemTags.vue +++ b/src/pages/Item/Card/ItemTags.vue @@ -9,15 +9,13 @@ import VnInput from 'src/components/common/VnInput.vue'; import FetchData from 'components/FetchData.vue'; import VnSelect from 'src/components/common/VnSelect.vue'; import axios from 'axios'; -import { useQuasar } from 'quasar'; const route = useRoute(); const { t } = useI18n(); -const itemTagsRef = ref(null); +const itemTagsRef = ref(); const tagOptions = ref([]); const valueOptionsMap = ref(new Map()); -const quasar = useQuasar(); const getSelectedTagValues = async (tag) => { if (!tag.tagFk && tag.tag.isFree) return; const filter = { @@ -60,19 +58,6 @@ const insertTag = (rows) => { itemTagsRef.value.formData[itemTagsRef.value.formData.length - 1].priority = getHighestPriority(rows); }; - -const submitTags = async (data) => { - itemTagsRef.value.onSubmit(data); -}; - -const errMessage = ref(); -function showError(error) { - errMessage.value = error?.response?.data?.error?.message; - quasar.notify({ - type: 'negative', - message: t(`${errMessage.value}`), - }); -}