mirror of
https://github.com/mealie-recipes/mealie.git
synced 2026-04-18 02:45:37 -04:00
fix: Blank query filter builder fields (#7480)
This commit is contained in:
@@ -41,19 +41,14 @@
|
|||||||
>
|
>
|
||||||
<v-select
|
<v-select
|
||||||
v-if="index"
|
v-if="index"
|
||||||
:model-value="field.logicalOperator"
|
:model-value="field.logicalOperator?.value"
|
||||||
:items="[logOps.AND, logOps.OR]"
|
:items="[logOps.AND, logOps.OR]"
|
||||||
item-title="label"
|
item-title="label"
|
||||||
item-value="value"
|
item-value="value"
|
||||||
variant="underlined"
|
variant="underlined"
|
||||||
|
class="text-center"
|
||||||
@update:model-value="setLogicalOperatorValue(field, index, $event as unknown as LogicalOperator)"
|
@update:model-value="setLogicalOperatorValue(field, index, $event as unknown as LogicalOperator)"
|
||||||
>
|
/>
|
||||||
<template #chip="{ item }">
|
|
||||||
<span :class="config.select.textClass" style="width: 100%;">
|
|
||||||
{{ item.raw.label }}
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
</v-select>
|
|
||||||
</v-col>
|
</v-col>
|
||||||
|
|
||||||
<!-- left parenthesis -->
|
<!-- left parenthesis -->
|
||||||
@@ -67,14 +62,9 @@
|
|||||||
:model-value="field.leftParenthesis"
|
:model-value="field.leftParenthesis"
|
||||||
:items="['', '(', '((', '(((']"
|
:items="['', '(', '((', '(((']"
|
||||||
variant="underlined"
|
variant="underlined"
|
||||||
|
class="text-center"
|
||||||
@update:model-value="setLeftParenthesisValue(field, index, $event)"
|
@update:model-value="setLeftParenthesisValue(field, index, $event)"
|
||||||
>
|
/>
|
||||||
<template #chip="{ item }">
|
|
||||||
<span :class="config.select.textClass" style="width: 100%;">
|
|
||||||
{{ item.raw }}
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
</v-select>
|
|
||||||
</v-col>
|
</v-col>
|
||||||
|
|
||||||
<!-- field name -->
|
<!-- field name -->
|
||||||
@@ -84,19 +74,14 @@
|
|||||||
:class="config.col.class"
|
:class="config.col.class"
|
||||||
>
|
>
|
||||||
<v-select
|
<v-select
|
||||||
chips
|
|
||||||
:model-value="field.label"
|
:model-value="field.label"
|
||||||
:items="fieldDefs"
|
:items="fieldDefs"
|
||||||
variant="underlined"
|
variant="underlined"
|
||||||
item-title="label"
|
item-title="label"
|
||||||
|
item-value="label"
|
||||||
|
class="text-center"
|
||||||
@update:model-value="setField(index, $event)"
|
@update:model-value="setField(index, $event)"
|
||||||
>
|
/>
|
||||||
<template #chip="{ item }">
|
|
||||||
<span :class="config.select.textClass" style="width: 100%;">
|
|
||||||
{{ item.raw.label }}
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
</v-select>
|
|
||||||
</v-col>
|
</v-col>
|
||||||
|
|
||||||
<!-- relational operator -->
|
<!-- relational operator -->
|
||||||
@@ -107,19 +92,14 @@
|
|||||||
>
|
>
|
||||||
<v-select
|
<v-select
|
||||||
v-if="field.type !== 'boolean'"
|
v-if="field.type !== 'boolean'"
|
||||||
:model-value="field.relationalOperatorValue"
|
:model-value="field.relationalOperatorValue?.value"
|
||||||
:items="field.relationalOperatorChoices"
|
:items="field.relationalOperatorChoices"
|
||||||
item-title="label"
|
item-title="label"
|
||||||
item-value="value"
|
item-value="value"
|
||||||
variant="underlined"
|
variant="underlined"
|
||||||
|
class="text-center"
|
||||||
@update:model-value="setRelationalOperatorValue(field, index, $event as unknown as RelationalKeyword | RelationalOperator)"
|
@update:model-value="setRelationalOperatorValue(field, index, $event as unknown as RelationalKeyword | RelationalOperator)"
|
||||||
>
|
/>
|
||||||
<template #chip="{ item }">
|
|
||||||
<span :class="config.select.textClass" style="width: 100%;">
|
|
||||||
{{ item.raw.label }}
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
</v-select>
|
|
||||||
</v-col>
|
</v-col>
|
||||||
|
|
||||||
<!-- field value -->
|
<!-- field value -->
|
||||||
@@ -275,18 +255,9 @@
|
|||||||
:model-value="field.rightParenthesis"
|
:model-value="field.rightParenthesis"
|
||||||
:items="['', ')', '))', ')))']"
|
:items="['', ')', '))', ')))']"
|
||||||
variant="underlined"
|
variant="underlined"
|
||||||
|
class="text-center"
|
||||||
@update:model-value="setRightParenthesisValue(field, index, $event)"
|
@update:model-value="setRightParenthesisValue(field, index, $event)"
|
||||||
>
|
/>
|
||||||
<template #chip="{ item }">
|
|
||||||
<span :class="config.select.textClass" style="width: 100%;">
|
|
||||||
{{ item.raw }}
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
</v-select>
|
|
||||||
</v-col>
|
|
||||||
|
|
||||||
<!-- field actions -->
|
|
||||||
<v-col
|
|
||||||
v-if="!$vuetify.display.smAndDown || index === fields.length - 1"
|
v-if="!$vuetify.display.smAndDown || index === fields.length - 1"
|
||||||
:cols="config.items.fieldActions.cols(index)"
|
:cols="config.items.fieldActions.cols(index)"
|
||||||
:sm="config.items.fieldActions.sm(index)"
|
:sm="config.items.fieldActions.sm(index)"
|
||||||
@@ -723,9 +694,6 @@ const config = computed(() => {
|
|||||||
col: {
|
col: {
|
||||||
class: "d-flex justify-center align-end py-0",
|
class: "d-flex justify-center align-end py-0",
|
||||||
},
|
},
|
||||||
select: {
|
|
||||||
textClass: "d-flex justify-center text-center",
|
|
||||||
},
|
|
||||||
items: {
|
items: {
|
||||||
icon: {
|
icon: {
|
||||||
cols: (_index: number) => 2,
|
cols: (_index: number) => 2,
|
||||||
|
|||||||
Reference in New Issue
Block a user