Merge branch 'develop' of https://codeberg.org/thatonecalculator/calckey into develop
This commit is contained in:
commit
349fad7f8a
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<MkPagination ref="pagingComponent" :pagination="pagination">
|
||||
<MkPagination ref="pagingComponent" :pagination="pagination" disableReload="true">
|
||||
<template #empty>
|
||||
<div class="_fullinfo">
|
||||
<img src="/static-assets/badges/info.png" class="_ghost" alt="Info"/>
|
||||
|
|
|
@ -69,6 +69,7 @@ const props = withDefaults(defineProps<{
|
|||
disableAutoLoad?: boolean;
|
||||
displayLimit?: number;
|
||||
externalItemArray?: Ref<Array<any>>;
|
||||
disableReload?: boolean;
|
||||
}>(), {
|
||||
displayLimit: 30,
|
||||
});
|
||||
|
@ -345,7 +346,7 @@ init();
|
|||
|
||||
onActivated(() => {
|
||||
isBackTop.value = false;
|
||||
if(alreadyInitedOnce.value) {
|
||||
if(alreadyInitedOnce.value && (!props.disableReload || !props.disableReload.value)) {
|
||||
reload();
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue