diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue index 7af226bff..8f2c9f05e 100644 --- a/src/components/ui/VnFilterPanel.vue +++ b/src/components/ui/VnFilterPanel.vue @@ -61,9 +61,12 @@ const $props = defineProps({ type: Object, default: null, }, - useSearchbar: { - type: [Boolean, Function], - default: false, + searchbarOptions: { + type: Object, + default: () => ({ + use: false, + validateFn: null, + }), }, }); @@ -99,17 +102,17 @@ defineExpose({ search, params: userParams, remove }); async function search(evt) { try { - if ($props.useSearchbar) { + if ($props.searchbarOptions.use) { if (!searchbar.value) { return; } - if (typeof $props.useSearchbar === 'function') { - $props.useSearchbar(userParams.value); + if (typeof $props.searchbarOptions.validateFn === 'function') { + $props.searchbarOptions.validateFn(userParams.value); + } - if (!Object.keys(userParams.value).length) { - searchbar.value(); - return; - } + if (!Object.keys(userParams.value).length) { + searchbar.value(); + return; } } if (evt && $props.disableSubmitEvent) return; diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue index 722db879d..a7205b6a6 100644 --- a/src/pages/Ticket/TicketFilter.vue +++ b/src/pages/Ticket/TicketFilter.vue @@ -76,7 +76,7 @@ function validateDateRange(params) {