7691-testToMaster #537

Merged
alexm merged 395 commits from 7691-testToMaster into master 2024-07-09 05:39:56 +00:00
2 changed files with 7 additions and 2 deletions
Showing only changes of commit 9169b793a9 - Show all commits

View File

@ -77,6 +77,7 @@ async function insert() {
auto-load auto-load
ref="vnPaginateRef" ref="vnPaginateRef"
class="show" class="show"
:update-router="false"
v-bind="$attrs" v-bind="$attrs"
> >
<template #body="{ rows }"> <template #body="{ rows }">

View File

@ -66,6 +66,10 @@ const props = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
updateRouter: {
type: Boolean,
default: true,
},
}); });
const emit = defineEmits(['onFetch', 'onPaginate', 'onChange']); const emit = defineEmits(['onFetch', 'onPaginate', 'onChange']);
@ -120,7 +124,7 @@ async function fetch(params) {
useArrayData(props.dataKey, params); useArrayData(props.dataKey, params);
store.filter.skip = 0; store.filter.skip = 0;
store.skip = 0; store.skip = 0;
await arrayData.fetch({ append: false }); await arrayData.fetch({ append: false, updateRouter: props.updateRouter });
if (!store.hasMoreData) { if (!store.hasMoreData) {
isLoading.value = false; isLoading.value = false;
} }