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 +37 -27
2 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c4441eed1f - Show all commits

20
src/components/VnTable/VnFilter.vue
View File

@ -111,17 +111,19 @@ function alignRow() {
</div> </div>
<div <div
v-if="columnFilter !== false && column.field != 'tableActions'" v-if="columnFilter !== false && column.field != 'tableActions'"
class="row no-wrap full-width" class="row no-wrap"
:class="alignRow()" :class="alignRow()"
> >
<VnTableColumn <span :class="$props.column.component != 'checkbox' ? 'full-width' : alignRow()">
:column="$props.column" <VnTableColumn
:row="{}" :column="$props.column"
default="input" :row="{}"
v-model="model" default="input"
:components="components" v-model="model"
component-prop="columnFilter" :components="components"
/> component-prop="columnFilter"
/>
</span>
</div> </div>
<div v-else-if="showTitle" style="height: 45px"><!-- fixme! --></div> <div v-else-if="showTitle" style="height: 45px"><!-- fixme! --></div>
</template> </template>

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

@ -240,7 +240,10 @@ defineExpose({
</template> </template>
<template #body-cell="{ col, row }"> <template #body-cell="{ col, row }">
<!-- Columns --> <!-- Columns -->
<QTd class="no-padding" :class="`text-${col.align ?? 'left'}`"> <QTd
class="no-padding no-margin"
:class="`text-${col.align ?? 'left'}`"
>
<VnTableColumn <VnTableColumn
:column="col" :column="col"
:row="row" :row="row"
@ -366,6 +369,13 @@ defineExpose({
</FormModelPopup> </FormModelPopup>
</QDialog> </QDialog>
</template> </template>
<i18n>
en:
status: Status
es:
status: Estados
</i18n>
<style lang="scss"> <style lang="scss">
.bg-chip-secondary { .bg-chip-secondary {
background-color: var(--vn-page-color); background-color: var(--vn-page-color);
@ -438,23 +448,6 @@ defineExpose({
} }
} }
// WIP TRANSITIONS
// .grid-item {
// background-color: red;
// transition: all 500ms ease;
// }
// .grid-move {
// background-color: #6b7280 !important;
// transform: scale(0.9);
// }
.divisor-line {
height: 1px;
background-color: var(--vn-section-color);
border: none;
}
.q-table th { .q-table th {
padding: 0; padding: 0;
} }
@ -470,6 +463,21 @@ defineExpose({
.q-table__top { .q-table__top {
top: 0; top: 0;
} }
tbody {
.q-checkbox {
display: flex;
margin-bottom: 9px;
& .q-checkbox__label {
margin-left: 31px;
color: var(--vn-text-color);
}
& .q-checkbox__inner {
position: absolute;
left: 0;
color: var(--vn-label-color);
}
}
}
} }
.vn-label-value { .vn-label-value {