Commit 331ad43175dd591279564bf500fbb357d61643d8
1 parent
5bbfc25f
fix：修复场景联动 触发器和执行条件设备、属性、条件筛选如果有则必填验证
Showing
1 changed file
with
1 additions
and
1 deletions
| @@ -107,7 +107,7 @@ | @@ -107,7 +107,7 @@ | ||
| 107 | if (validate.device == 'PART') { | 107 | if (validate.device == 'PART') { |
| 108 | if (validate.entityId == undefined) return createMessage.error('请选择设备'); | 108 | if (validate.entityId == undefined) return createMessage.error('请选择设备'); |
| 109 | } | 109 | } |
| 110 | - if (validate.type2 == '') return createMessage.error('请选择属性'); | 110 | + if (validate.type2 == '' || validate.type2 == null) return createMessage.error('请选择属性'); |
| 111 | if (predicate == undefined) return createMessage.error('请填写条件筛选'); | 111 | if (predicate == undefined) return createMessage.error('请填写条件筛选'); |
| 112 | let predicateIsRequired = false; | 112 | let predicateIsRequired = false; |
| 113 | if (predicate) { | 113 | if (predicate) { |