filter behaviour WIP

This commit is contained in:
Jan Prochazka
2024-08-19 12:49:26 +02:00
parent 2a48e0c4a0
commit c3609e8c7b
24 changed files with 105 additions and 76 deletions

View File

@@ -13,7 +13,7 @@
export let condition1;
export let onFilter;
export let filterType;
export let filterBehaviour;
const hasOperand = condition => {
return condition != 'NULL' && condition != 'NOT NULL' && condition != 'EXISTS' && condition != 'NOT EXISTS';
@@ -24,7 +24,9 @@
if (!value) return null;
if (condition == 'sql') return `{${value}}`;
if (condition == 'sqlRight') return `{$$ ${value}}`;
if (filterType == 'string') return `${condition}"${value}"`;
if (filterBehaviour.allowStringToken) {
return `${condition}"${value}"`;
}
return `${condition}${value}`;
};
@@ -48,7 +50,7 @@
<div class="row">Show rows where</div>
<div class="row">
<div class="col-6 mr-1">
<SetFilterModal_Select {filterType} name="condition1" />
<SetFilterModal_Select {filterBehaviour} name="condition1" />
</div>
<div class="col-6 mr-1">
<FormValues let:values>
@@ -66,7 +68,7 @@
<div class="row">
<div class="col-6 mr-1">
<SetFilterModal_Select {filterType} name="condition2" />
<SetFilterModal_Select {filterBehaviour} name="condition2" />
</div>
<div class="col-6 mr-1">
<FormValues let:values>

View File

@@ -2,7 +2,6 @@
import FormSelectFieldRaw from '../forms/FormSelectFieldRaw.svelte';
export let name;
export let filterType;
export let filterBehaviour;
function getOptions() {