wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' into 5938_filterGrouped

This commit is contained in:
Javier Segarra 2024-09-12 10:27:36 +00:00
parent 3892df250c 856d551503
commit 058039fd61
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/VnTable/VnTable.vue
View File

@ -369,7 +369,7 @@ function handleOnDataSaved(_) {
@on-fetch="(...args) => emit('onFetch', ...args)"
:search-url="searchUrl"
:disable-infinite-scroll="
$attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll
$attrs['disableInfiniteScroll'] ? isTableMode : !disableInfiniteScroll
"
@save-changes="reload"
:has-sub-toolbar="$props.hasSubToolbar ?? isEditable"

1
src/pages/Customer/components/CustomerSummaryTable.vue
View File

@ -151,6 +151,7 @@ const setShippedColor = (date) => {
:disable-option="{ card: true, table: true }"
limit="5"
class="full-width"
:disable-infinite-scroll="true"
>
<template #column-nickname="{ row }">
<span class="link">