diff --git a/packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue b/packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue index fed47eef44..181a0d18d3 100644 --- a/packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue +++ b/packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue @@ -23,9 +23,10 @@ interface Props { hookId?: string showLoading?: boolean modelValue?: Filter[] + webHook?: boolean } -const { nested = false, parentId, autoSave = true, hookId = null, modelValue, showLoading = true } = defineProps() +const { nested = false, parentId, autoSave = true, hookId = null, modelValue, showLoading = true, webHook } = defineProps() const emit = defineEmits(['update:filtersLength']) @@ -101,13 +102,13 @@ const types = computed(() => { watch( () => activeView.value?.id, (n, o) => { - if (n !== o) loadFilters(hookId as string) + if (n !== o && (hookId || !webHook)) loadFilters(hookId as string) }, { immediate: true }, ) watch( - () => filters.value.length, + () => filters.value.length , (length) => { emit('update:filtersLength', length ?? 0) }, @@ -280,7 +281,7 @@ defineExpose({ {{ $t('activity.addFilter') }} - +
diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue index 72f277cf9f..9b9e2c7aec 100644 --- a/packages/nc-gui/components/webhook/Editor.vue +++ b/packages/nc-gui/components/webhook/Editor.vue @@ -619,6 +619,7 @@ onMounted(async () => { :auto-save="false" :show-loading="false" :hook-id="hook.id" + web-hook />