|
|
@ -1,6 +1,7 @@ |
|
|
|
<script setup lang="ts"> |
|
|
|
<script setup lang="ts"> |
|
|
|
import type { ColumnType, FilterType } from 'nocodb-sdk' |
|
|
|
import type { ColumnType, FilterType } from 'nocodb-sdk' |
|
|
|
import { PlanLimitTypes, UITypes } from 'nocodb-sdk' |
|
|
|
import { PlanLimitTypes, UITypes } from 'nocodb-sdk' |
|
|
|
|
|
|
|
import type { Filter } from '#imports' |
|
|
|
import { |
|
|
|
import { |
|
|
|
ActiveViewInj, |
|
|
|
ActiveViewInj, |
|
|
|
AllFiltersInj, |
|
|
|
AllFiltersInj, |
|
|
@ -17,7 +18,6 @@ import { |
|
|
|
useViewFilters, |
|
|
|
useViewFilters, |
|
|
|
watch, |
|
|
|
watch, |
|
|
|
} from '#imports' |
|
|
|
} from '#imports' |
|
|
|
import type { Filter } from '#imports' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
interface Props { |
|
|
|
interface Props { |
|
|
|
nestedLevel?: number |
|
|
|
nestedLevel?: number |
|
|
@ -241,7 +241,10 @@ const selectFilterField = (filter: Filter, index: number) => { |
|
|
|
isComparisonOpAllowed(filter, compOp), |
|
|
|
isComparisonOpAllowed(filter, compOp), |
|
|
|
)?.value as FilterType['comparison_op'] |
|
|
|
)?.value as FilterType['comparison_op'] |
|
|
|
|
|
|
|
|
|
|
|
if ([UITypes.Date, UITypes.DateTime].includes(col.uidt as UITypes) && !['blank', 'notblank'].includes(filter.comparison_op!)) { |
|
|
|
if ( |
|
|
|
|
|
|
|
[UITypes.Date, UITypes.DateTime, UITypes.CreatedTime, UITypes.LastModifiedTime].includes(col.uidt as UITypes) && |
|
|
|
|
|
|
|
!['blank', 'notblank'].includes(filter.comparison_op!) |
|
|
|
|
|
|
|
) { |
|
|
|
if (filter.comparison_op === 'isWithin') { |
|
|
|
if (filter.comparison_op === 'isWithin') { |
|
|
|
filter.comparison_sub_op = 'pastNumberOfDays' |
|
|
|
filter.comparison_sub_op = 'pastNumberOfDays' |
|
|
|
} else { |
|
|
|
} else { |
|
|
|