简柏林 / thingskit-front · Commits

Commit 2a5c95488e5d5dd6a92bd3eee8465c1a770de9ec

Authored by fengtao
1 parent 1b3be73d

pref:新增请选择产品验证

Inline Side-by-side
Showing 2 changed files with 9 additions and 0 deletions
@@ -113,6 +113,10 @@ @@ -113,6 +113,10 @@
113 ); 113 );
114 //TODO-fengtao-设备、属性、条件筛选验证 114 //TODO-fengtao-设备、属性、条件筛选验证
115 const validate = getFieldsValue(); 115 const validate = getFieldsValue();
  116 + if (validate.deviceProfileId === undefined) {
  117 + createMessage.error('请选择产品');
  118 + throw '请选择产品';
  119 + }
116 if (validate.triggerType == undefined) return createMessage.error('请选择设备触发方式'); 120 if (validate.triggerType == undefined) return createMessage.error('请选择设备触发方式');
117 if (validate.type1 == undefined) return createMessage.error('请选择属性触发方式'); 121 if (validate.type1 == undefined) return createMessage.error('请选择属性触发方式');
118 if (validate.device == 'PART') { 122 if (validate.device == 'PART') {
@@ -188,6 +188,7 @@ @@ -188,6 +188,7 @@
188 }; 188 };
189 }); 189 });
190 //TODO-fengtao-清除告警验证 190 //TODO-fengtao-清除告警验证
  191 + let productIdIsRequired = false;
191 let deviceIdIsRequired = false; 192 let deviceIdIsRequired = false;
192 let attrIsRequired = false; 193 let attrIsRequired = false;
193 let predicateIsRequired = false; 194 let predicateIsRequired = false;
@@ -201,6 +202,9 @@ @@ -201,6 +202,9 @@
201 deviceIdIsRequired = true; 202 deviceIdIsRequired = true;
202 } 203 }
203 } 204 }
  205 + if (s.deviceProfileId === undefined) {
  206 + productIdIsRequired = true;
  207 + }
204 if (s.type2 == '' || s.type2 == null) { 208 if (s.type2 == '' || s.type2 == null) {
205 attrIsRequired = true; 209 attrIsRequired = true;
206 } 210 }
@@ -229,6 +233,7 @@ @@ -229,6 +233,7 @@
229 } 233 }
230 }); 234 });
231 } 235 }
  236 + if (productIdIsRequired) return createMessage.error('请选择产品');
232 if (deviceIdIsRequired) return createMessage.error('请选择设备'); 237 if (deviceIdIsRequired) return createMessage.error('请选择设备');
233 if (attrIsRequired) return createMessage.error('请选择属性'); 238 if (attrIsRequired) return createMessage.error('请选择属性');
234 if (predicateIsRequired) return createMessage.error('请填写条件筛选'); 239 if (predicateIsRequired) return createMessage.error('请填写条件筛选');