diff --git a/Jenkinsfile b/Jenkinsfile index df2421a0e..63577dad5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -123,7 +123,7 @@ pipeline { sh "docker-compose ${env.COMPOSE_PARAMS} up -d" 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' } } } diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index d0c657f8a..c60d072fe 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -1136,9 +1136,13 @@ es: .grid-create { display: grid; - grid-template-columns: repeat(auto-fit, minmax(150px, max-content)); + grid-template-columns: 1fr 1fr; + max-width: 100%; grid-gap: 20px; margin: 0 auto; + .col-span-2 { + grid-column: span 2; + } } .flex-one { diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue index 976af1d19..4f3f544c1 100644 --- a/src/pages/Account/AccountList.vue +++ b/src/pages/Account/AccountList.vue @@ -149,14 +149,12 @@ const columns = computed(() => [ :right-search="false" > <template #more-create-dialog="{ data }"> - <QCardSection> <VnInputPassword :label="t('Password')" v-model="data.password" :required="true" autocomplete="new-password" /> - </QCardSection> </template> </VnTable> </template> diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 8038b1284..034f416ed 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -230,7 +230,7 @@ watchEffect(selectedRows); </span> </template> <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="q-col-gutter-xs"> <VnRow fixed> diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue index d1d437a19..ec89d77e0 100644 --- a/src/pages/Supplier/SupplierList.vue +++ b/src/pages/Supplier/SupplierList.vue @@ -172,6 +172,7 @@ const filterColumns = computed(() => { > <template #more-create-dialog="{ data }"> <VnInput + class="col-span-2" :label="t('globals.name')" v-model="data.socialName" :uppercase="true" diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue index 79eb26881..b76790075 100644 --- a/src/pages/Worker/WorkerList.vue +++ b/src/pages/Worker/WorkerList.vue @@ -223,7 +223,7 @@ async function autofillBic(worker) { :right-search="false" > <template #more-create-dialog="{ data }"> - <div class="q-pa-lg full-width"> + <div class="col-span-2"> <VnRadio v-model="data.isFreelance" :val="false"