github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-07 12:55:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Default filter operator to eq for field with choices (#12598)

Browse Source 
* Default filter to 'eq' for field with choices

* fix function name type
This commit is contained in:
Azri Kahar
2022-04-06 22:31:59 +08:00
committed by GitHub
parent f7e651cbe3
commit 4f7abf0733
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/interfaces/_system/system-filter/system-filter.vue
View File

@@ -55,7 +55,7 @@
<script lang="ts" setup>
import { useFieldsStore } from '@/stores';
import { Filter, Type } from '@directus/shared/types';
import { Filter, Type, FieldFunction } from '@directus/shared/types';
import { getFilterOperatorsForType, getOutputTypeForFunction } from '@directus/shared/utils';
import { cloneDeep, get, isEmpty, set } from 'lodash';
import { computed, inject, ref } from 'vue';
@@ -130,15 +130,16 @@ function addNode(key: string) {
innerValue.value = innerValue.value.concat({ _and: [] });
} else {
let type: Type;
const field = fieldsStore.getField(collection.value, key);
if (key.includes('(') && key.includes(')')) {
const functionName = key.split('(')[0];
const functionName = key.split('(')[0] as FieldFunction;
type = getOutputTypeForFunction(functionName);
} else {
const field = fieldsStore.getField(collection.value, key)!;
type = field?.type || 'unknown';
}
const operator = getFilterOperatorsForType(type)[0];
let filterOperators = getFilterOperatorsForType(type);
const operator = field?.meta?.options?.choices && filterOperators.includes('eq') ? 'eq' : filterOperators[0];
const node = set({}, key, { ['_' + operator]: null });
innerValue.value = innerValue.value.concat(node);
}