verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 68 Releases Wiki Activity

8355-testToMaster #1177

Merged
alexm merged 326 commits from 8355-testToMaster into master 2025-01-07 06:46:55 +00:00
Conversation 0 Commits 326 Files Changed 213 +2 -3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1a8368c4ce - Show all commits

3
src/components/common/VnDmsList.vue
View File

@ -297,7 +297,8 @@ defineExpose({
ref="dmsRef" ref="dmsRef"
:data-key="$props.model" :data-key="$props.model"
:url="$props.model" :url="$props.model"
:filter="dmsFilter" map-key="dmsFk"
:user-filter="dmsFilter"
:order="['dmsFk DESC']" :order="['dmsFk DESC']"
:auto-load="true" :auto-load="true"
@on-fetch="setData" @on-fetch="setData"

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

@ -2,7 +2,6 @@
import { onBeforeUnmount, onMounted, ref, watch } from 'vue'; import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';
import { onBeforeRouteUpdate } from 'vue-router';
const { t } = useI18n(); const { t } = useI18n();
@ -112,7 +111,6 @@ onMounted(async () => {
}); });
onBeforeUnmount(() => { onBeforeUnmount(() => {
console.log('store.keepData: ', store.keepData);
if (!store.keepData) arrayData.reset(['data']); if (!store.keepData) arrayData.reset(['data']);
arrayData.resetPagination(); arrayData.resetPagination();
}); });