From 5f0acb794a33e0e1409082930befe3ba0aa474e7 Mon Sep 17 00:00:00 2001
From: tomsun28 <tomsun28@outlook.com>
Date: Sat, 18 Dec 2021 22:10:13 +0800
Subject: [PATCH] =?UTF-8?q?[web-app]=20=E5=91=8A=E8=AD=A6=E9=98=88?=
 =?UTF-8?q?=E5=80=BC=E9=85=8D=E7=BD=AE=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alert-setting.component.html              | 21 ++++++++++++++-
 .../alert-setting/alert-setting.component.ts  |  1 +
 web-app/src/app/routes/alert/alert.module.ts  | 26 +++++++++++--------
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
index 1e2b2f2..533d34a 100644
--- a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
+++ b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
@@ -123,12 +123,31 @@
           </nz-cascader>
         </nz-form-control>
       </nz-form-item >
+      <nz-form-item>
+        <nz-col [nzSpan]="8" nzOffset="7">
+          <nz-collapse>
+            <nz-collapse-panel
+              [nzActive] = "isManageModalAdd"
+              nzHeader="支持的阈值触发表达式环境变量"
+            >
+              <nz-list nzSize="small" nzSplit="false">
+                <nz-list-item *ngIf="cascadeValues.length == 3">
+                  <code>{{cascadeValues[2]}} : 选中的指标对象</code>
+                </nz-list-item>
+                <nz-list-item>
+                  <code>instance : 所属行实例值</code>
+                </nz-list-item>
+              </nz-list>
+            </nz-collapse-panel>
+          </nz-collapse>
+        </nz-col>
+      </nz-form-item>
       <nz-form-item>
         <nz-form-label [nzSpan]="7" nzFor= 'expr' nzRequired="true">阈值触发表达式</nz-form-label>
         <nz-form-control [nzSpan]="8">
           <nz-textarea-count [nzMaxCharacterCount]="100">
             <textarea [(ngModel)]="define.expr" rows="3" nz-input
-                      name="expr" id="expr"  placeholder="请输入阈值判断表达式">
+                      name="expr" id="expr"  placeholder="请输入阈值判断表达式,示例: instance.equals(cpu1)&&usage>40">
             </textarea>
           </nz-textarea-count>
         </nz-form-control>
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
index 86f4787..0f2135b 100644
--- 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
@@ -344,4 +344,5 @@ export class AlertSettingComponent implements OnInit {
     });
   }
   // end 告警定义与监控关联model
+
 }
diff --git a/web-app/src/app/routes/alert/alert.module.ts b/web-app/src/app/routes/alert/alert.module.ts
index ad432a9..ac108b5 100644
--- a/web-app/src/app/routes/alert/alert.module.ts
+++ b/web-app/src/app/routes/alert/alert.module.ts
@@ -11,6 +11,8 @@ import {NzRadioModule} from "ng-zorro-antd/radio";
 import {NzSwitchModule} from "ng-zorro-antd/switch";
 import {NzCascaderModule} from "ng-zorro-antd/cascader";
 import {NzTransferModule} from "ng-zorro-antd/transfer";
+import {NzCollapseModule} from "ng-zorro-antd/collapse";
+import {NzListModule} from "ng-zorro-antd/list";
 
 const COMPONENTS: Type<void>[] = [
   AlertCenterComponent,
@@ -19,17 +21,19 @@ const COMPONENTS: Type<void>[] = [
 ];
 
 @NgModule({
-    imports: [
-        SharedModule,
-        AlertRoutingModule,
-        NzDividerModule,
-        NzBreadCrumbModule,
-        NzTagModule,
-        NzRadioModule,
-        NzSwitchModule,
-        NzCascaderModule,
-        NzTransferModule
-    ],
+  imports: [
+    SharedModule,
+    AlertRoutingModule,
+    NzDividerModule,
+    NzBreadCrumbModule,
+    NzTagModule,
+    NzRadioModule,
+    NzSwitchModule,
+    NzCascaderModule,
+    NzTransferModule,
+    NzCollapseModule,
+    NzListModule
+  ],
   declarations: COMPONENTS,
 })
 export class AlertModule { }