diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue index 0c832ba9..8dd1f30b 100644 --- a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue +++ b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue @@ -551,9 +551,9 @@ const onPropsCancel = () => { const rules = [{ validator(_: any, v?: ActionsType) { - console.log('validator',v) + console.log('validator-action-item',v) if (v?.executor === 'device') { - if(!v.device?.productId || !v.device?.selectorValues) { + if(v?.device?.source === 'fixed' && (!v.device?.productId || !v.device?.selectorValues)) { return Promise.reject(new Error('该数据已发生变更,请重新配置')) } } diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/List.vue b/src/views/rule-engine/Scene/Save/action/ListItem/List.vue index 229b8464..1d15c422 100644 --- a/src/views/rule-engine/Scene/Save/action/ListItem/List.vue +++ b/src/views/rule-engine/Scene/Save/action/ListItem/List.vue @@ -73,19 +73,6 @@ const thenName = computed(() => { return _data.value.branches![props.branchesName].then.findIndex(item => item.parallel === props.parallel) }) - -const rules = [{ - validator(_: any, v?: ActionsType) { - console.log('validator',v) - if (v?.executor === 'device') { - if(!v.device?.productId || !v.device?.selectorValues) { - return Promise.reject(new Error('该数据已发生变更,请重新配置')) - } - } - return Promise.resolve() - } -}] - const onAdd = () => { visible.value = true; }; diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue index 62fa0745..cba40b5d 100644 --- a/src/views/system/Apply/index.vue +++ b/src/views/system/Apply/index.vue @@ -49,7 +49,7 @@ >