Commit 86d28687b9a55c1eedbbda664a845300268cde5c
1 parent
e548e63a
fix:DEFECT-486 修复编辑删除触发方式能编辑成功,新增未填写也能成功
Showing
2 changed files
with
6 additions
and
0 deletions
| ... | ... | @@ -105,6 +105,7 @@ |
| 105 | 105 | //TODO-fengtao-设备、属性、条件筛选验证 |
| 106 | 106 | const validate = getFieldsValue(); |
| 107 | 107 | if (validate.triggerType == undefined) return createMessage.error('请选择设备触发方式'); |
| 108 | + if (validate.type1 == undefined) return createMessage.error('请选择属性触发方式'); | |
| 108 | 109 | if (validate.device == 'PART') { |
| 109 | 110 | if (validate.entityId == undefined) return createMessage.error('请选择设备'); |
| 110 | 111 | } | ... | ... |
| ... | ... | @@ -142,6 +142,7 @@ |
| 142 | 142 | let predicateIsRequired = false; |
| 143 | 143 | let predicateDoubleIsRequired = false; |
| 144 | 144 | let triggerTypeIsRequired = false; |
| 145 | + let type1IsRequired = false; | |
| 145 | 146 | if (clearRule) { |
| 146 | 147 | clearRule.some((s) => { |
| 147 | 148 | if (s.device == 'PART') { |
| ... | ... | @@ -152,6 +153,9 @@ |
| 152 | 153 | if (s.type2 == '' || s.type2 == null) { |
| 153 | 154 | attrIsRequired = true; |
| 154 | 155 | } |
| 156 | + if (s.type1 == '' || s.type1 == null) { | |
| 157 | + type1IsRequired = true; | |
| 158 | + } | |
| 155 | 159 | if (s.triggerType == '' || s.triggerType == null || s.triggerType == undefined) { |
| 156 | 160 | triggerTypeIsRequired = true; |
| 157 | 161 | } |
| ... | ... | @@ -179,6 +183,7 @@ |
| 179 | 183 | if (predicateIsRequired) return createMessage.error('请填写条件筛选'); |
| 180 | 184 | if (predicateDoubleIsRequired) return createMessage.error('请填写条件筛选'); |
| 181 | 185 | if (triggerTypeIsRequired) return createMessage.error('请选择设备触发方式'); |
| 186 | + if (type1IsRequired) return createMessage.error('请选择属性触发方式'); | |
| 182 | 187 | //TODO-fengtao-清除告警验证 |
| 183 | 188 | //TODO-fengtao-设备验证 |
| 184 | 189 | const validate = getFieldsValue(); | ... | ... |