Commit e884e3082bf5afb3bad4e6746a720863b975f63a
1 parent
cdc35de9
fix:修复场景联动 执行动作设备、属性、条件筛选、 清除告警如果有则必填验证
Showing
1 changed file
with
6 additions
and
2 deletions
@@ -142,7 +142,6 @@ | @@ -142,7 +142,6 @@ | ||
142 | let predicateIsRequired = false; | 142 | let predicateIsRequired = false; |
143 | let predicateDoubleIsRequired = false; | 143 | let predicateDoubleIsRequired = false; |
144 | if (clearRule) { | 144 | if (clearRule) { |
145 | - console.log('clearRule', clearRule); | ||
146 | clearRule.some((s) => { | 145 | clearRule.some((s) => { |
147 | if (s.device == 'PART') { | 146 | if (s.device == 'PART') { |
148 | if (s.entityId == undefined) { | 147 | if (s.entityId == undefined) { |
@@ -161,6 +160,12 @@ | @@ -161,6 +160,12 @@ | ||
161 | if (arr.length == 0) { | 160 | if (arr.length == 0) { |
162 | predicateDoubleIsRequired = true; | 161 | predicateDoubleIsRequired = true; |
163 | } | 162 | } |
163 | + if (f.operation == undefined) { | ||
164 | + predicateDoubleIsRequired = true; | ||
165 | + } | ||
166 | + if (f.value == undefined) { | ||
167 | + predicateDoubleIsRequired = true; | ||
168 | + } | ||
164 | }); | 169 | }); |
165 | } | 170 | } |
166 | }); | 171 | }); |
@@ -206,7 +211,6 @@ | @@ -206,7 +211,6 @@ | ||
206 | }; | 211 | }; |
207 | }); | 212 | }); |
208 | deviceListItem.value = deviceList.value; | 213 | deviceListItem.value = deviceList.value; |
209 | - console.log(' deviceListItem.value', deviceListItem.value); | ||
210 | updateSchema({ | 214 | updateSchema({ |
211 | field: 'deviceId', | 215 | field: 'deviceId', |
212 | componentProps: { | 216 | componentProps: { |