Merge branch 'master_dev'

src/app/main/topic-module-detail/topic-module-detail.component.ts

@@ -116,10 +116,12 @@ export class TopicModuleDetailComponent implements OnInit {
     this.req.frequency = 0;
     this.isUpdate = false;
     this.try = {
-      trans: {topicName: 'topicName', topicType: 'topicType',
+      trans: {topicName: 'topicName', topicType: 'topicType', retentionPolicyNo: 'retentionPolicyNo',
         dataType: 'dataType', interval: 'inTime', dataInterval: 'dataInterval'},
-      field: ['topicName', 'topicType', 'dataType', 'interval'],
-      num: ['dataType', 'interval', 'dataInterval']};
+      field: ['topicName', 'topicType', 'dataType', 'interval', 'retentionPolicyNo'],
+      num: ['dataType', 'interval', 'dataInterval'],
+      retentionPolicyNo: ['retentionPolicyNo']
+    };
     this.isV = true;
   }
 
@@ -137,10 +139,12 @@ export class TopicModuleDetailComponent implements OnInit {
     }
 
     this.try = {
-      trans: {topicName: 'topicName', topicType: 'topicType',
+      trans: {topicName: 'topicName', topicType: 'topicType',  retentionPolicyNo: 'retentionPolicyNo',
         dataType: 'dataType', interval: 'inTime', dataInterval: 'dataInterval'},
-      field: ['topicModelNo', 'topicName', 'topicType', 'dataType', 'interval'],
-      num: ['dataType', 'interval', 'dataInterval']};
+      field: ['topicModelNo', 'topicName', 'topicType', 'dataType', 'interval','retentionPolicyNo'],
+      num: ['dataType', 'interval', 'dataInterval'],
+      retentionPolicyNo: ['retentionPolicyNo']
+    };
     this.isV = true;
   }
 

src/app/service/check.ts

@@ -71,6 +71,14 @@ export class CheckService {
       }
     }
 
+    if (req.retentionPolicyNo) {
+      console.log(req, req.retentionPolicyNo)
+      req.retentionPolicyNo.filter((item) => this.checkRetentionPolicyNo(fieldStr, data, item));
+      if (this.flag) {
+        return false;
+      }
+    }
+
     return true;
   }
 
@@ -93,6 +101,19 @@ export class CheckService {
     }
   }
 
+  private checkRetentionPolicyNo(fieldStr, data, field) {
+    if (this.flag === 1) {
+      return false;
+    }
+    if ((data[field] === '' || isUndefined(data[field]) || data[field] === null) && fieldStr.indexOf('-' + field + '-') >= -1) {
+      this.message.warning(this.translate.instant(this.trans[field]) + '为必填字段, 请检查');
+      this.flag = 1;
+      return false;
+    } else {
+      return true
+    }
+  }
+
   private checkTime(fieldStr, data, time) {
     if (this.flag === 1) {
       return false;