Merge branch 'master' into 0810-yuluo/fix

apache · Aug 18, 2024 · 26152e1 · 26152e1
2 parents 6f18eff + 031e83d
commit 26152e1
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.ts
@@ -164,7 +164,7 @@ export class AlertSettingComponent implements OnInit {
   onNewAlertDefine() {
     this.define = new AlertDefine();
     this.define.tags = [];
-    this.resetQbData({ condition: 'and', rules: [] });
+    this.resetQbDataDefault();
     this.isManageModalAdd = true;
     this.isManageModalVisible = true;
     this.isManageModalOkLoading = false;
@@ -593,6 +593,7 @@ export class AlertSettingComponent implements OnInit {
   };
 
   cascadeOnChange(values: string[]): void {
+    this.resetQbDataDefault();
     if (values == null || values.length != 3) {
       return;
     }
@@ -645,26 +646,30 @@ export class AlertSettingComponent implements OnInit {
     } catch (e) {
       console.error(e);
       this.isExpr = true;
-      this.resetQbData({ condition: 'and', rules: [] });
+      this.resetQbDataDefault();
       return;
     }
   }
 
   onManageModalCancel() {
     this.cascadeValues = [];
     this.isExpr = false;
-    this.resetQbData({ condition: 'and', rules: [] });
+    this.resetQbDataDefault();
     this.isManageModalVisible = false;
   }
 
   resetQbData(qbData: RuleSet) {
     this.qbFormCtrl.reset((this.qbData = qbData));
   }
 
+  resetQbDataDefault() {
+    this.resetQbData({ condition: 'and', rules: [] });
+  }
+
   resetManageModalData() {
     this.cascadeValues = [];
     this.isExpr = false;
-    this.resetQbData({ condition: 'and', rules: [] });
+    this.resetQbDataDefault();
     this.isManageModalVisible = false;
   }