From 97cc9a56159b6fcb5e0046591f63a3ff2c2997a2 Mon Sep 17 00:00:00 2001 From: Joel Date: Wed, 4 Sep 2024 11:28:36 +0800 Subject: [PATCH] feat: check file item key not set --- web/app/components/workflow/nodes/list-filter/default.ts | 9 ++++++--- web/i18n/en-US/workflow.ts | 1 + web/i18n/zh-Hans/workflow.ts | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/web/app/components/workflow/nodes/list-filter/default.ts b/web/app/components/workflow/nodes/list-filter/default.ts index 39be24ede5..0cd17b6075 100644 --- a/web/app/components/workflow/nodes/list-filter/default.ts +++ b/web/app/components/workflow/nodes/list-filter/default.ts @@ -1,4 +1,4 @@ -import { BlockEnum } from '../../types' +import { BlockEnum, VarType } from '../../types' import type { NodeDefault } from '../../types' import { comparisonOperatorNotRequireValue } from '../if-else/utils' import { type ListFilterNodeType, OrderBy } from './types' @@ -31,14 +31,17 @@ const nodeDefault: NodeDefault = { }, checkValid(payload: ListFilterNodeType, t: any) { let errorMessages = '' - const { variable, filter_by } = payload + const { variable, var_type, filter_by } = payload if (!errorMessages && !variable?.length) errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: t('workflow.nodes.listFilter.inputVar') }) // Check filter condition if (!errorMessages) { - if (!filter_by[0]?.comparison_operator) + if (var_type === VarType.arrayFile && !filter_by[0]?.key) + errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: t('workflow.nodes.listFilter.filterConditionKey') }) + + if (!errorMessages && !filter_by[0]?.comparison_operator) errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: t('workflow.nodes.listFilter.filterConditionComparisonOperator') }) if (!errorMessages && !comparisonOperatorNotRequireValue(filter_by[0]?.comparison_operator) && !filter_by[0]?.value) diff --git a/web/i18n/en-US/workflow.ts b/web/i18n/en-US/workflow.ts index b89c11aefc..c8f2d400b6 100644 --- a/web/i18n/en-US/workflow.ts +++ b/web/i18n/en-US/workflow.ts @@ -562,6 +562,7 @@ const translation = { listFilter: { inputVar: 'Input Variable', filterCondition: 'Filter Condition', + filterConditionKey: 'Filter Condition Key', filterConditionComparisonOperator: 'Filter Condition Comparison Operator', filterConditionComparisonValue: 'Filter Condition value', selectVariableKeyPlaceholder: 'Select sub variable key', diff --git a/web/i18n/zh-Hans/workflow.ts b/web/i18n/zh-Hans/workflow.ts index 0307a81090..eedf0de008 100644 --- a/web/i18n/zh-Hans/workflow.ts +++ b/web/i18n/zh-Hans/workflow.ts @@ -562,6 +562,7 @@ const translation = { listFilter: { inputVar: '输入变量', filterCondition: '过滤条件', + filterConditionKey: '过滤条件的 Key', filterConditionComparisonOperator: '过滤条件比较操作符', filterConditionComparisonValue: '过滤条件比较值', selectVariableKeyPlaceholder: '选择子变量的 Key',