From b64e4063b1a6165ae32408fa4e2010b8daa8a9b1 Mon Sep 17 00:00:00 2001 From: Ivan Skvortsov Date: Mon, 12 May 2025 19:07:11 +0300 Subject: [PATCH 01/14] fix: improved singleselectfilter design --- .../events/components/EventsDataTable.vue | 4 +- .../components/LinkedFieldsSelector.vue | 2 +- .../data/DataTableMultiSelectFilter.vue | 2 +- .../data/DataTableSingleSelectFilter.vue | 98 ++++++++++++------- 4 files changed, 69 insertions(+), 37 deletions(-) diff --git a/frontend/src/modules/events/components/EventsDataTable.vue b/frontend/src/modules/events/components/EventsDataTable.vue index c29aa83..d02f1d4 100644 --- a/frontend/src/modules/events/components/EventsDataTable.vue +++ b/frontend/src/modules/events/components/EventsDataTable.vue @@ -39,7 +39,9 @@ const { table } = useDataTable({ diff --git a/frontend/src/modules/fields/components/LinkedFieldsSelector.vue b/frontend/src/modules/fields/components/LinkedFieldsSelector.vue index 8e7c487..0b8fb00 100644 --- a/frontend/src/modules/fields/components/LinkedFieldsSelector.vue +++ b/frontend/src/modules/fields/components/LinkedFieldsSelector.vue @@ -21,7 +21,7 @@ const emit = defineEmits<{ -
+
new Set(props.column?.getFilterValue() as Clear filters diff --git a/frontend/src/shared/components/data/DataTableSingleSelectFilter.vue b/frontend/src/shared/components/data/DataTableSingleSelectFilter.vue index 8fd4707..362ece1 100644 --- a/frontend/src/shared/components/data/DataTableSingleSelectFilter.vue +++ b/frontend/src/shared/components/data/DataTableSingleSelectFilter.vue @@ -1,53 +1,83 @@ - - From a35273b5c6f028fbe9886242cd98c8246a75ff43 Mon Sep 17 00:00:00 2001 From: Ivan Skvortsov Date: Tue, 13 May 2025 09:42:39 +0300 Subject: [PATCH 02/14] fix: uiux polish --- .../components/data/DataTableSingleSelectFilter.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/frontend/src/shared/components/data/DataTableSingleSelectFilter.vue b/frontend/src/shared/components/data/DataTableSingleSelectFilter.vue index 362ece1..24d67aa 100644 --- a/frontend/src/shared/components/data/DataTableSingleSelectFilter.vue +++ b/frontend/src/shared/components/data/DataTableSingleSelectFilter.vue @@ -3,7 +3,6 @@ import type { Column } from '@tanstack/vue-table' import { computed } from 'vue' import { cn } from '@/shared/utils/general' import { Button } from '@/shared/ui/button' -import { Badge } from '@/shared/ui/badge' import { Icon } from '@iconify/vue' import { Popover, PopoverTrigger, PopoverContent } from '@/shared/ui/popover' @@ -15,7 +14,6 @@ import { CommandGroup, CommandEmpty, } from '@/shared/ui/command' -import { Separator } from '@/shared/ui/separator' interface Props { column?: Column @@ -37,12 +35,19 @@ const selectedValue = computed(() => props.column?.getFilterValue() as string |