diff --git a/src/views/rule-engine/Scene/Save/Manual/index.vue b/src/views/rule-engine/Scene/Save/Manual/index.vue index 98677d24..5527eef9 100644 --- a/src/views/rule-engine/Scene/Save/Manual/index.vue +++ b/src/views/rule-engine/Scene/Save/Manual/index.vue @@ -23,7 +23,8 @@ const { data } = storeToRefs(sceneStore); const actionRules = [{ validator(_: any, v?: BranchesThen[]) { - if (!v || (v && !v.length) || (v && v.length && !v[0].actions.length)) { + + if (!v || (v && !v.length) || !v.some(item => item.actions && item.actions.length)) { return Promise.reject('至少配置一个执行动作'); } return Promise.resolve(); diff --git a/src/views/rule-engine/Scene/Save/Timer/index.vue b/src/views/rule-engine/Scene/Save/Timer/index.vue index 81d29554..43ff6cb2 100644 --- a/src/views/rule-engine/Scene/Save/Timer/index.vue +++ b/src/views/rule-engine/Scene/Save/Timer/index.vue @@ -59,7 +59,7 @@ const rules = [{ const actionRules = [{ validator(_: any, v?: BranchesThen[]) { - if (!v || (v && !v.length)) { + if (!v || (v && !v.length) || !v.some(item => item.actions && item.actions.length)) { return Promise.reject('至少配置一个执行动作'); } return Promise.resolve(); diff --git a/src/views/rule-engine/Scene/Save/components/Terms/util.ts b/src/views/rule-engine/Scene/Save/components/Terms/util.ts index a8e23e82..4f49ea9b 100644 --- a/src/views/rule-engine/Scene/Save/components/Terms/util.ts +++ b/src/views/rule-engine/Scene/Save/components/Terms/util.ts @@ -13,11 +13,8 @@ export const handleParamsData = (data: any[], key: string = 'column'): any[] => export const thenRules = [{ validator(_: string, value: any) { - if (!value || (value && !value.length)) { + if (!value || (value && !value.length) || !v.some(item => item.actions && item.actions.length)) { return Promise.reject('至少配置一个执行动作') - } else { - const isActions = value.some((item: any) => item.actions && item.actions.length) - return isActions ? Promise.resolve() : Promise.reject('至少配置一个执行动作'); } return Promise.resolve(); }