Skip to content

fix: change component used by filter inputs #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 14, 2025
Merged

fix: change component used by filter inputs #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion adminforth/spa/src/afcl/Input.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
aria-describedby="helper-text-explanation"
class="inline-flex bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-0 focus:ring-lightPrimary focus:border-lightPrimary dark:focus:ring-darkPrimary dark:focus:border-darkPrimary
blue-500 focus:border-blue-500 block w-20 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white translate-y-0"
:class="{'rounded-l-md': !$slots.prefix, 'rounded-r-md': !$slots.suffix}"
:class="{'rounded-l-md': !$slots.prefix, 'rounded-r-md': !$slots.suffix, 'w-full': fullWidth}"
>


Expand All @@ -33,6 +33,7 @@

const props = defineProps({
type: String,
fullWidth: Boolean,
modelValue: String,
})

Expand Down
59 changes: 31 additions & 28 deletions adminforth/spa/src/components/Filters.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,14 @@
:modelValue="filtersStore.filters.find(f => f.field === c.name && f.operator === 'in')?.value || []"
/>

<input
v-else-if="[ 'string', 'text' ].includes(c.type)"
type="text" class="w-full py-1 px-2 border border-gray-300 rounded-md dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
:placeholder="$t('Search')"
@input="setFilterItem({ column: c, operator: 'ilike', value: $event.target.value || undefined })"
:value="getFilterItem({ column: c, operator: 'ilike' })"
>
<Input
v-else-if="[ 'string', 'text' ].includes(c.type)"
type="text"
full-width
:placeholder="$t('Search')"
@update:modelValue="setFilterItem({ column: c, operator: 'ilike', value: $event || undefined })"
:modelValue="getFilterItem({ column: c, operator: 'ilike' })"
/>

<CustomDateRangePicker
v-else-if="['datetime'].includes(c.type)"
Expand All @@ -70,13 +71,14 @@
@update:valueEnd="setFilterItem({ column: c, operator: 'lte', value: $event || undefined })"
/>

<input
v-else-if="[ 'date', 'time' ].includes(c.type)"
type="text" class="w-full py-1 px-2 border border-gray-300 rounded-md"
:placeholder="$t('Search datetime')"
@input="setFilterItem({ column: c, operator: 'ilike', value: $event.target.value || undefined })"
:value="getFilterItem({ column: c, operator: 'ilike' })"
>
<Input
v-else-if="[ 'date', 'time' ].includes(c.type)"
type="text"
full-width
:placeholder="$t('Search datetime')"
@update:modelValue="setFilterItem({ column: c, operator: 'ilike', value: $event || undefined })"
:modelValue="getFilterItem({ column: c, operator: 'ilike' })"
/>

<CustomRangePicker
v-else-if="['integer', 'decimal', 'float'].includes(c.type) && c.allowMinMaxQuery"
Expand All @@ -89,20 +91,20 @@
/>

<div v-else-if="['integer', 'decimal', 'float'].includes(c.type)" class="flex gap-2">
<input
type="number" aria-describedby="helper-text-explanation"
class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-20 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
:placeholder="$t('From')"
@input="setFilterItem({ column: c, operator: 'gte', value: $event.target.value || undefined })"
:value="getFilterItem({ column: c, operator: 'gte' })"
>
<input
type="number" aria-describedby="helper-text-explanation"
class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-20 p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
:placeholder="$t('To')"
@input="setFilterItem({ column: c, operator: 'lte', value: $event.target.value || undefined})"
:value="getFilterItem({ column: c, operator: 'lte' })"
>
<Input
type="number"
aria-describedby="helper-text-explanation"
:placeholder="$t('From')"
@update:modelValue="setFilterItem({ column: c, operator: 'gte', value: $event || undefined })"
:modelValue="getFilterItem({ column: c, operator: 'gte' })"
/>
<Input
type="number"
aria-describedby="helper-text-explanation"
:placeholder="$t('To')"
@update:modelValue="setFilterItem({ column: c, operator: 'lte', value: $event|| undefined })"
:modelValue="getFilterItem({ column: c, operator: 'lte' })"
/>
</div>

</li>
Expand Down Expand Up @@ -132,6 +134,7 @@ import { useRouter } from 'vue-router';
import { computedAsync } from '@vueuse/core'
import CustomRangePicker from "@/components/CustomRangePicker.vue";
import { useFiltersStore } from '@/stores/filters';
import Input from '@/afcl/Input.vue';
import Select from '@/afcl/Select.vue';

const filtersStore = useFiltersStore();
Expand Down