diff --git a/src/components/common/search-form.vue b/src/components/common/search-form.vue index 615347b..16ef179 100644 --- a/src/components/common/search-form.vue +++ b/src/components/common/search-form.vue @@ -12,7 +12,7 @@ interface Props { model: Record; } -defineProps(); +const props = defineProps(); interface Emits { (e: 'reset'): void; @@ -29,11 +29,13 @@ const { formRef, validate, restoreValidation } = useNaiveForm(); async function reset() { await restoreValidation(); + Object.assign(props.model, { ...props.model, page: 1 }); emit('reset'); } async function search() { await validate(); + Object.assign(props.model, { ...props.model, page: 1 }); emit('search'); } diff --git a/src/hooks/common/table.ts b/src/hooks/common/table.ts index 74a11f2..962deaf 100644 --- a/src/hooks/common/table.ts +++ b/src/hooks/common/table.ts @@ -32,7 +32,7 @@ export function useTable(config: NaiveUI.NaiveTabl getData, searchParams, updateSearchParams, - resetSearchParams + resetSearchParams: resetSearchParams0 } = useHookTable, TableColumn>>>({ apiFn, apiParams, @@ -172,6 +172,11 @@ export function useTable(config: NaiveUI.NaiveTabl scope.stop(); }); + const resetSearchParams = () => { + resetSearchParams0(); + getData(); + }; + return { loading, empty,