0
0
Fork 0

feat: refs #7404 updates

This commit is contained in:
Javier Segarra 2024-09-30 11:53:54 +02:00
parent cb0d3c5bca
commit cf67865b0b
6 changed files with 78 additions and 14 deletions

View File

@ -130,4 +130,43 @@ const mixinRules = [
.q-field__append { .q-field__append {
padding-inline: 0; padding-inline: 0;
} }
// .q-field--standard .q-field__control:after {
// padding: 0;
// }
// .q-field__control-container.col.relative-position.row.no-wrap.q-anchor--skip {
// display: flex;
// flex-direction: row;
// align-items: flex-end;
// }
.q-field__append.q-field__marginal.row.no-wrap.items-center.row {
height: 20px;
}
.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
height: auto;
}
.q-field__control,
.q-select--with-input {
/* color: var(--q-primary); */
// margin-bottom: 10px;
height: 23px;
/* max-width: 100%; */
/* outline: none; */
}
// .q-field--labeled .q-field__native,
// .q-field--labeled .q-field__prefix,
// .q-field--labeled .q-field__suffix {
// padding-bottom: 0;
// }
.q-field__native,
.q-field__prefix,
.q-field__suffix,
.q-field__input {
padding: 0;
}
// .q-field__append.q-field__marginal.row.no-wrap.items-center.q-anchor--skip {
// display: flex;
// flex-direction: row;
// align-items: flex-end;
// }
</style> </style>

View File

@ -283,4 +283,21 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
.q-field--outlined { .q-field--outlined {
max-width: 100%; max-width: 100%;
} }
.q-field__inner {
.q-field__control {
min-height: auto !important;
.q-field__native.row {
min-height: auto !important;
}
}
}
// &.q-field__control {
// min-height: auto;
// &.q-field__controler-container {
// .q-field__native {
// min-height: revert;
// }
// }
// }
// }
</style> </style>

View File

@ -3,7 +3,6 @@ import { onMounted, ref, computed, watch } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useArrayData } from 'composables/useArrayData'; import { useArrayData } from 'composables/useArrayData';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import { date } from 'quasar';
import toDate from 'filters/toDate'; import toDate from 'filters/toDate';
import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue'; import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
@ -59,7 +58,6 @@ const $props = defineProps({
}); });
defineExpose({ search, sanitizer }); defineExpose({ search, sanitizer });
const emit = defineEmits([ const emit = defineEmits([
'update:modelValue', 'update:modelValue',
'refresh', 'refresh',
@ -114,9 +112,9 @@ watch(
); );
const isLoading = ref(false); const isLoading = ref(false);
async function search() { async function search(evt) {
try { try {
if ($props.disableSubmitEvent) return; if (evt && $props.disableSubmitEvent) return;
store.filter.where = {}; store.filter.where = {};
isLoading.value = true; isLoading.value = true;
@ -167,7 +165,7 @@ const tagsList = computed(() => {
for (const key of Object.keys(userParams.value)) { for (const key of Object.keys(userParams.value)) {
const value = userParams.value[key]; const value = userParams.value[key];
if (value == null || ($props.hiddenTags || []).includes(key)) continue; if (value == null || ($props.hiddenTags || []).includes(key)) continue;
tagList.push({ label: aliasField(key), value }); tagList.push({ label: key, value });
} }
return tagList; return tagList;
}); });
@ -187,7 +185,6 @@ async function remove(key) {
} }
function formatValue(value) { function formatValue(value) {
if (value instanceof Date) return date.formatDate(value, 'DD/MM/YYYY');
if (typeof value === 'boolean') return value ? t('Yes') : t('No'); if (typeof value === 'boolean') return value ? t('Yes') : t('No');
if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value); if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);
@ -203,11 +200,6 @@ function sanitizer(params) {
} }
return params; return params;
} }
function aliasField(field) {
const split = field.split('.');
return split[1] ?? split[0];
}
</script> </script>
<template> <template>
@ -219,7 +211,7 @@ function aliasField(field) {
icon="search" icon="search"
@click="search()" @click="search()"
></QBtn> ></QBtn>
<QForm @submit="search" id="filterPanelForm"> <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
<QList dense> <QList dense>
<QItem class="q-mt-xs"> <QItem class="q-mt-xs">
<QItemSection top> <QItemSection top>

View File

@ -288,3 +288,11 @@ input::-webkit-inner-spin-button {
color: $info; color: $info;
} }
} }
.q-field__inner {
.q-field__control {
min-height: auto !important;
.q-field__native.row {
min-height: auto !important;
}
}
}

View File

@ -27,13 +27,16 @@ const { openReport } = usePrintService();
const columns = computed(() => [ const columns = computed(() => [
{ {
align: 'left', align: 'center',
name: 'id', name: 'id',
label: t('invoiceOutList.tableVisibleColumns.id'), label: t('invoiceOutList.tableVisibleColumns.id'),
chip: { chip: {
condition: () => true, condition: () => true,
}, },
isId: true, isId: true,
columnFilter: {
name: 'search',
},
}, },
{ {
align: 'left', align: 'left',

View File

@ -514,7 +514,7 @@ function handleOnDataSave({ CrudModelRef }) {
</template> </template>
<template #column-minPrice="props"> <template #column-minPrice="props">
<QTd class="col"> <QTd class="col">
<div class="row"> <div class="row" style="align-items: center">
<QCheckbox <QCheckbox
:model-value="props.row.hasMinPrice" :model-value="props.row.hasMinPrice"
@update:model-value="updateMinPrice($event, props)" @update:model-value="updateMinPrice($event, props)"
@ -601,6 +601,11 @@ function handleOnDataSave({ CrudModelRef }) {
.q-table td { .q-table td {
padding-inline: 5px !important; padding-inline: 5px !important;
} }
.q-table tr td {
font-size: 10pt;
border-top: none;
border-collapse: collapse;
}
.q-table tbody td { .q-table tbody td {
max-width: none; max-width: none;
.q-td.col { .q-td.col {