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

7691-testToMaster #537

Merged
alexm merged 395 commits from 7691-testToMaster into master 2024-07-09 05:39:56 +00:00
Conversation 0 Commits 395 Files Changed 132 +5 -3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2ec4e3540f - Show all commits

7
src/components/VnTable/VnChip.vue
View File

@ -25,11 +25,12 @@ function stopEventPropagation(event) {
<QChip <QChip
v-if="col.chip.condition(row[col.name], row)" v-if="col.chip.condition(row[col.name], row)"
:title="col.label" :title="col.label"
:class=" :class="[
col.chip.color col.chip.color
? col.chip.color(row) ? col.chip.color(row)
: !col.chip.icon && 'bg-chip-secondary' : !col.chip.icon && 'bg-chip-secondary',
" col.chip.icon && 'q-px-none',
]"
dense dense
square square
> >

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

@ -260,6 +260,7 @@ defineExpose({
auto-width auto-width
:class="`text-${col.align ?? 'left'}`" :class="`text-${col.align ?? 'left'}`"
class="sticky no-padding" class="sticky no-padding"
@click="stopEventPropagation($event)"
> >
<QBtn <QBtn
v-for="(btn, index) of col.actions" v-for="(btn, index) of col.actions"