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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7828-makeCorrectCalls

This commit is contained in:
Jorge Penadés 2024-09-12 13:11:11 +02:00
parent 1dffa8865e ea37015ec2
commit adb9cac360
4 changed files with 18 additions and 10 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)" @on-fetch="(...args) => emit('onFetch', ...args)"
:search-url="searchUrl" :search-url="searchUrl"
:disable-infinite-scroll=" :disable-infinite-scroll="
$attrs['disableInfiniteScroll'] ? isTableMode : disableInfiniteScroll $attrs['disableInfiniteScroll'] ? isTableMode : !disableInfiniteScroll
" "
@save-changes="reload" @save-changes="reload"
:has-sub-toolbar="$props.hasSubToolbar ?? isEditable" :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"

21
src/components/ui/VnPaginate.vue
View File

@ -224,20 +224,27 @@ defineExpose({ fetch, addFilter, paginate });
v-bind="$attrs" v-bind="$attrs"
> >
<slot name="body" :rows="store.data"></slot> <slot name="body" :rows="store.data"></slot>
<div v-if="isLoading" class="info-row q-pa-md text-center"> <div v-if="isLoading" class="spinner info-row q-pa-md text-center">
<QSpinner color="primary" size="md" /> <QSpinner color="primary" size="md" />
</div> </div>
</QInfiniteScroll> </QInfiniteScroll>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
.info-row { .spinner {
width: 100%; z-index: 1;
align-content: end;
h5 { position: absolute;
margin: 0; bottom: 0;
left: 0;
}
.info-row {
width: 100%;
h5 {
margin: 0;
}
} }
}
</style> </style>
<i18n> <i18n>

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

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

4
src/pages/Ticket/TicketFutureFilter.vue
View File

@ -153,7 +153,7 @@ onMounted(async () => {
:label="t('params.state')" :label="t('params.state')"
v-model="params.state" v-model="params.state"
:options="stateOptions" :options="stateOptions"
option-value="code" option-value="id"
option-label="name" option-label="name"
@update:model-value="searchFn()" @update:model-value="searchFn()"
dense dense
@ -169,7 +169,7 @@ onMounted(async () => {
:label="t('params.futureState')" :label="t('params.futureState')"
v-model="params.futureState" v-model="params.futureState"
:options="stateOptions" :options="stateOptions"
option-value="code" option-value="id"
option-label="name" option-label="name"
@update:model-value="searchFn()" @update:model-value="searchFn()"
dense dense