Browse Source

fix: condition correction

pull/8479/head
Pranav C 6 months ago
parent
commit
472431217b
  1. 4
      packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue
  2. 4
      packages/nc-gui/composables/useViewFilters.ts

4
packages/nc-gui/components/smartsheet/toolbar/ColumnFilter.vue

@ -206,10 +206,8 @@ const applyChanges = async (hookId?: string, nested = false, isConditionSupporte
if (!localNestedFilters.value?.length) return if (!localNestedFilters.value?.length) return
await nextTick()
for (const nestedFilter of localNestedFilters.value) { for (const nestedFilter of localNestedFilters.value) {
if (nestedFilter.parentId?.value) { if (nestedFilter.parentId) {
await nestedFilter.applyChanges(hookId, true) await nestedFilter.applyChanges(hookId, true)
} }
} }

4
packages/nc-gui/composables/useViewFilters.ts

@ -12,13 +12,15 @@ import { UITypes, isSystemColumn } from 'nocodb-sdk'
export function useViewFilters( export function useViewFilters(
view: Ref<ViewType | undefined>, view: Ref<ViewType | undefined>,
parentId: Ref<string | null>, _parentId: Ref<string | null> | null | string,
autoApply?: ComputedRef<boolean>, autoApply?: ComputedRef<boolean>,
reloadData?: () => void, reloadData?: () => void,
_currentFilters?: Filter[], _currentFilters?: Filter[],
isNestedRoot?: boolean, isNestedRoot?: boolean,
isWebhook?: boolean, isWebhook?: boolean,
) { ) {
const parentId = ref(_parentId)
const currentFilters = ref(_currentFilters) const currentFilters = ref(_currentFilters)
const btLookupTypesMap = ref({}) const btLookupTypesMap = ref({})

Loading…
Cancel
Save