diff --git a/resources/scripts/components/base/base-table/BaseTable.vue b/resources/scripts/components/base/base-table/BaseTable.vue index 52ed09e49..67320d127 100644 --- a/resources/scripts/components/base/base-table/BaseTable.vue +++ b/resources/scripts/components/base/base-table/BaseTable.vue @@ -309,6 +309,8 @@ function changeSorting(column) { } if (!usesLocalData.value) { + if (pagination.value) + pagination.value.currentPage = 1 mapDataToRows() } } @@ -326,7 +328,10 @@ async function pageChange(page) { await mapDataToRows() } -async function refresh() { +async function refresh(isPreservePage = false) { + if (pagination.value && !isPreservePage) + pagination.value.currentPage = 1 + await mapDataToRows() }