Merge branch 'dev' into 8197-vnCardBeta_toStable
gitea/salix-front/pipeline/pr-dev This commit is unstable Details

This commit is contained in:
Alex Moreno 2025-03-10 10:07:25 +00:00
commit 47f6d59d79
6 changed files with 9 additions and 6 deletions

2
Jenkinsfile vendored
View File

@ -123,7 +123,7 @@ pipeline {
sh "docker-compose ${env.COMPOSE_PARAMS} up -d" sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") { image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
sh 'sh test/cypress/cypressParallel.sh 3' sh 'sh test/cypress/cypressParallel.sh 2'
} }
} }
} }

View File

@ -1136,9 +1136,13 @@ es:
.grid-create { .grid-create {
display: grid; display: grid;
grid-template-columns: repeat(auto-fit, minmax(150px, max-content)); grid-template-columns: 1fr 1fr;
max-width: 100%;
grid-gap: 20px; grid-gap: 20px;
margin: 0 auto; margin: 0 auto;
.col-span-2 {
grid-column: span 2;
}
} }
.flex-one { .flex-one {

View File

@ -149,14 +149,12 @@ const columns = computed(() => [
:right-search="false" :right-search="false"
> >
<template #more-create-dialog="{ data }"> <template #more-create-dialog="{ data }">
<QCardSection>
<VnInputPassword <VnInputPassword
:label="t('Password')" :label="t('Password')"
v-model="data.password" v-model="data.password"
:required="true" :required="true"
autocomplete="new-password" autocomplete="new-password"
/> />
</QCardSection>
</template> </template>
</VnTable> </VnTable>
</template> </template>

View File

@ -230,7 +230,7 @@ watchEffect(selectedRows);
</span> </span>
</template> </template>
<template #more-create-dialog="{ data }"> <template #more-create-dialog="{ data }">
<div class="row q-col-gutter-xs"> <div class="row q-col-gutter-xs col-span-2">
<div class="col-12"> <div class="col-12">
<div class="q-col-gutter-xs"> <div class="q-col-gutter-xs">
<VnRow fixed> <VnRow fixed>

View File

@ -172,6 +172,7 @@ const filterColumns = computed(() => {
> >
<template #more-create-dialog="{ data }"> <template #more-create-dialog="{ data }">
<VnInput <VnInput
class="col-span-2"
:label="t('globals.name')" :label="t('globals.name')"
v-model="data.socialName" v-model="data.socialName"
:uppercase="true" :uppercase="true"

View File

@ -223,7 +223,7 @@ async function autofillBic(worker) {
:right-search="false" :right-search="false"
> >
<template #more-create-dialog="{ data }"> <template #more-create-dialog="{ data }">
<div class="q-pa-lg full-width"> <div class="col-span-2">
<VnRadio <VnRadio
v-model="data.isFreelance" v-model="data.isFreelance"
:val="false" :val="false"