From 73412433775ecfcb58ea7f276d16a40ddde234d6 Mon Sep 17 00:00:00 2001
From: Fine <fanxue0830@gmail.com>
Date: Mon, 13 Jan 2025 16:49:28 +0800
Subject: [PATCH] add expression

---
 src/locales/lang/en.ts                  | 1 +
 src/locales/lang/es.ts                  | 1 +
 src/locales/lang/zh.ts                  | 1 +
 src/views/alarm/Content.vue             | 9 ++++++---
 src/views/alarm/components/Line.vue     | 1 -
 src/views/alarm/components/Snapshot.vue | 1 -
 src/views/alarm/data.ts                 | 4 ++++
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index 0c843f2b..98764453 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -396,5 +396,6 @@ const msg = {
   execArgs: "Exec Args",
   instances: "Instances",
   snapshot: "Snapshot",
+  expression: "Expression",
 };
 export default msg;
diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts
index d9e46725..bc030873 100644
--- a/src/locales/lang/es.ts
+++ b/src/locales/lang/es.ts
@@ -396,5 +396,6 @@ const msg = {
   execArgs: "Exec Args",
   instances: "Instances",
   snapshot: "Snapshot",
+  expression: "Expression",
 };
 export default msg;
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index 9f39144b..359ebb97 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -394,5 +394,6 @@ const msg = {
   execArgs: "String任务扩展",
   instances: "实例",
   snapshot: "快照",
+  expression: "表达式",
 };
 export default msg;
diff --git a/src/views/alarm/Content.vue b/src/views/alarm/Content.vue
index ff7fe1c9..aee06071 100644
--- a/src/views/alarm/Content.vue
+++ b/src/views/alarm/Content.vue
@@ -48,7 +48,7 @@ limitations under the License. -->
     :destroy-on-close="true"
     @closed="isShowDetails = false"
   >
-    <div class="mb-10 clear alarm-detail" v-for="(item, index) in AlarmDetailCol" :key="index">
+    <div class="mb-20 clear alarm-detail" v-for="(item, index) in AlarmDetailCol" :key="index">
       <span class="g-sm-2 grey">{{ t(item.value) }}:</span>
       <span v-if="item.label === 'startTime'">
         {{ dateFormat(currentDetail[item.label]) }}
@@ -56,7 +56,7 @@ limitations under the License. -->
       <span v-else-if="item.label === 'tags'">
         <div v-for="(d, index) in alarmTags" :key="index">{{ d }}</div>
       </span>
-      <span v-else-if="item.label === 'events'" class="event-detail">
+      <span v-else-if="item.label === 'events'">
         <div>
           <ul>
             <li>
@@ -77,6 +77,9 @@ limitations under the License. -->
           </ul>
         </div>
       </span>
+      <span v-else-if="item.label === 'expression'">
+        {{ currentDetail.snapshot.expression }}
+      </span>
       <span v-else-if="item.label === 'snapshot'">
         <Snapshot :snapshot="currentDetail.snapshot" />
       </span>
@@ -90,7 +93,7 @@ limitations under the License. -->
     :destroy-on-close="true"
     @closed="showEventDetails = false"
   >
-    <div class="event-detail">
+    <div>
       <div class="mb-10" v-for="(eventKey, index) in EventsDetailKeys" :key="index">
         <span class="keys">{{ t(eventKey.text) }}</span>
         <span v-if="eventKey.class === 'parameters'">
diff --git a/src/views/alarm/components/Line.vue b/src/views/alarm/components/Line.vue
index 989c5f80..da8be69f 100644
--- a/src/views/alarm/components/Line.vue
+++ b/src/views/alarm/components/Line.vue
@@ -113,7 +113,6 @@ limitations under the License. -->
         link: { xAxisIndex: "all" },
       },
       legend: {
-        show: grid.length > 1,
         type: "scroll",
         icon: "circle",
         top: -5,
diff --git a/src/views/alarm/components/Snapshot.vue b/src/views/alarm/components/Snapshot.vue
index 690c0e63..5b7fad33 100644
--- a/src/views/alarm/components/Snapshot.vue
+++ b/src/views/alarm/components/Snapshot.vue
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License. -->
 <template>
   <LineChart
-    class="snapshot flex-v"
     :intervalTime="appStore.intervalTime"
     :data="metrics"
     :style="{ width: `800px`, height: `${metrics.length * 300}px` }"
diff --git a/src/views/alarm/data.ts b/src/views/alarm/data.ts
index e8bcd4d6..22701308 100644
--- a/src/views/alarm/data.ts
+++ b/src/views/alarm/data.ts
@@ -52,6 +52,10 @@ export const AlarmDetailCol = [
     label: "events",
     value: "eventDetail",
   },
+  {
+    label: "expression",
+    value: "expression",
+  },
   {
     label: "snapshot",
     value: "snapshot",