diff --git a/src/components/common/VnCheckboxMenu.vue b/src/components/common/VnCheckboxMenu.vue index bfb5b4441..c83e07084 100644 --- a/src/components/common/VnCheckboxMenu.vue +++ b/src/components/common/VnCheckboxMenu.vue @@ -27,6 +27,8 @@ const menuRef = ref(null); const errorMessage = ref(null); const rows = ref(0); const onClick = async () => { + errorMessage.value = null; + if (value.value) { const { filter } = JSON.parse(route.query[props.searchUrl]); filter.limit = 0; diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index 9f95d639c..a071b9928 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -19,7 +19,7 @@ export function useArrayData(key, userOptions) { let canceller = null; onMounted(() => { - setOptions(); + setOptions(userOptions ?? {}); reset(['skip']); const query = route.query; @@ -39,9 +39,10 @@ export function useArrayData(key, userOptions) { setCurrentFilter(); }); - if (key && userOptions) setOptions(); + if (userOptions) setOptions(userOptions); - function setOptions(params = userOptions) { + function setOptions(params) { + if (!params) return; const allowedOptions = [ 'url', 'filter', diff --git a/src/pages/Customer/components/CustomerFileManagementActions.vue b/src/pages/Customer/components/CustomerFileManagementActions.vue index 683f062ff..1fcafdccd 100644 --- a/src/pages/Customer/components/CustomerFileManagementActions.vue +++ b/src/pages/Customer/components/CustomerFileManagementActions.vue @@ -1,9 +1,9 @@