MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #611 from Budibase/fix-pagination 

fix pagination
This commit is contained in:
Martin McKeaveney 2020-09-14 16:25:23 +01:00 committed by GitHub
parent 44fcec5cc2 fb47ef6c2f
commit f744e6bf22
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/builder/src/components/database/DataTable/ModelDataTable.svelte
View File

@ -36,14 +36,14 @@
}
}
$: paginatedData = data
? data.slice(
$: sort = $backendUiStore.sort
$: sorted = sort ? fsort(data)[sort.direction](sort.column) : data
$: paginatedData = sorted
? sorted.slice(
currentPage * ITEMS_PER_PAGE,
currentPage * ITEMS_PER_PAGE + ITEMS_PER_PAGE
)
: []
$: sort = $backendUiStore.sort
$: sorted = sort ? fsort(data)[sort.direction](sort.column) : data
$: headers = Object.keys($backendUiStore.selectedModel.schema)
.sort()
@ -78,10 +78,10 @@
</tr>
</thead>
<tbody>
{#if sorted.length === 0}
{#if paginatedData.length === 0}
<div class="no-data">No Data.</div>
{/if}
{#each sorted as row}
{#each paginatedData as row}
<tr>
<td>
<EditRowPopover {row} />
@ -100,7 +100,7 @@
<TablePagination
{data}
bind:currentPage
pageItemCount={data.length}
pageItemCount={paginatedData.length}
{ITEMS_PER_PAGE} />
</section>

10
packages/builder/src/components/database/DataTable/Table.svelte
View File

@ -26,15 +26,15 @@
$: columns = schema ? Object.keys(schema) : []
$: sort = $backendUiStore.sort
$: sorted = sort ? fsort(data)[sort.direction](sort.column) : data
$: paginatedData =
data && data.length
? data.slice(
sorted && sorted.length
? sorted.slice(
currentPage * ITEMS_PER_PAGE,
currentPage * ITEMS_PER_PAGE + ITEMS_PER_PAGE
)
: []
$: sort = $backendUiStore.sort
$: sorted = sort ? fsort(data)[sort.direction](sort.column) : data
</script>
<section>
@ -68,7 +68,7 @@
<TablePagination
{data}
bind:currentPage
pageItemCount={data.length}
pageItemCount={paginatedData.length}
{ITEMS_PER_PAGE} />
</section>