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

chore: refs #8224 merge dev
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details

This commit is contained in:
Alex Moreno 2025-04-24 09:23:20 +02:00
parent de5c62e481
commit 807540b512
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1140,9 +1140,7 @@ const handleSelectedAll = (data) => {
</template> </template>
</FormModelPopup> </FormModelPopup>
</QDialog> </QDialog>
<<<<<<< HEAD
<VnContextMenu ref="contextMenuRef" v-model="arrayData" /> <VnContextMenu ref="contextMenuRef" v-model="arrayData" />
======= >>>>>>> 172b2d157479ccc10c9163961b89d89a6a675e42
<VnScroll <VnScroll
ref="vnScrollRef" ref="vnScrollRef"
v-if="isTableMode" v-if="isTableMode"