From 5c4b3fa6d8d3caf158eb0f3e256dc903e41fdd2c Mon Sep 17 00:00:00 2001
From: Fine <fanxue0830@gmail.com>
Date: Fri, 18 Oct 2024 11:18:49 +0800
Subject: [PATCH] update

---
 src/locales/lang/en.ts                                |  1 -
 src/locales/lang/es.ts                                |  1 -
 src/locales/lang/zh.ts                                |  1 -
 .../widget/graph-styles/components/ValueMappings.vue  |  4 +++-
 src/views/dashboard/graphs/Card.vue                   | 10 ++++++++--
 src/views/dashboard/graphs/Table.vue                  | 11 +++++++++--
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index 065f32af..bdd7f53b 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -387,6 +387,5 @@ const msg = {
   hierarchyNodeMetrics: "Metrics for Hierarchy Graph Node",
   hierarchyNodeDashboard: "As dashboard for Hierarchy Graph Node",
   valueMappings: "Value Mappings",
-  mappingTip: "Notice: The mapping key is a Regex string, for instance, ^-?(0|[1-9][0-9]*|2)(\\.0+)?$",
 };
 export default msg;
diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts
index e6408ace..f50ba9e6 100644
--- a/src/locales/lang/es.ts
+++ b/src/locales/lang/es.ts
@@ -387,6 +387,5 @@ const msg = {
   hierarchyNodeMetrics: "Metrics for Hierarchy Graph Node",
   hierarchyNodeDashboard: "As dashboard for Hierarchy Graph Node",
   valueMappings: "Value Mappings",
-  mappingTip: "Notice: The mapping key is a Regex string, for instance, ^-?(0|[1-9][0-9]*|2)(\\.0+)?$",
 };
 export default msg;
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index 43b5cadb..0323df52 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -385,6 +385,5 @@ const msg = {
   hierarchyNodeMetrics: "层次图节点的指标",
   hierarchyNodeDashboard: "作为层次图节点的dashboard",
   valueMappings: "值映射",
-  mappingTip: "注意: 映射键是一个正则表达式字符串，比如 ^-?(0|[1-9][0-9]*|2)(\\.0+)?$",
 };
 export default msg;
diff --git a/src/views/dashboard/configuration/widget/graph-styles/components/ValueMappings.vue b/src/views/dashboard/configuration/widget/graph-styles/components/ValueMappings.vue
index cc6d1bac..6bfe6c95 100644
--- a/src/views/dashboard/configuration/widget/graph-styles/components/ValueMappings.vue
+++ b/src/views/dashboard/configuration/widget/graph-styles/components/ValueMappings.vue
@@ -15,7 +15,9 @@ limitations under the License. -->
 <template>
   <div>
     <span class="label">{{ t("valueMappings") }}</span>
-    <span class="label red">({{ t("mappingTip") }})</span>
+    <span class="label red"
+      >Notice: The mapping key support a regex string, for instance, ^-?(0|[1-9][0-9]*|2)(\\.0+)?$</span
+    >
   </div>
   <div v-for="(key, index) in keys" :key="index" class="mb-10 flex-h">
     <div class="content-decoration" contenteditable="true" @blur="changeKeys($event, index)">
diff --git a/src/views/dashboard/graphs/Card.vue b/src/views/dashboard/graphs/Card.vue
index ff040ee6..029e5e9c 100644
--- a/src/views/dashboard/graphs/Card.vue
+++ b/src/views/dashboard/graphs/Card.vue
@@ -34,6 +34,7 @@ limitations under the License. -->
   import type { PropType } from "vue";
   import { useI18n } from "vue-i18n";
   import type { CardConfig, MetricConfigOpt } from "@/types/dashboard";
+  import { ElMessage } from "element-plus";
 
   /*global defineProps */
   const props = defineProps({
@@ -67,8 +68,13 @@ limitations under the License. -->
     }
     const list = Object.keys(valueMappings.value);
     for (const i of list) {
-      if (new RegExp(i).test(String(singleVal.value))) {
-        return valueMappings.value[i] || singleVal.value;
+      try {
+        if (new RegExp(i).test(String(singleVal.value))) {
+          return valueMappings.value[i] || singleVal.value;
+        }
+      } catch (e) {
+        ElMessage.error("invalid regex string");
+        return singleVal.value;
       }
     }
     return singleVal.value;
diff --git a/src/views/dashboard/graphs/Table.vue b/src/views/dashboard/graphs/Table.vue
index ffc62d3d..7ae83229 100644
--- a/src/views/dashboard/graphs/Table.vue
+++ b/src/views/dashboard/graphs/Table.vue
@@ -47,6 +47,8 @@ limitations under the License. -->
   import { computed } from "vue";
   import type { PropType } from "vue";
   import { useI18n } from "vue-i18n";
+  import { ElMessage } from "element-plus";
+
   /*global defineProps */
   const props = defineProps({
     data: {
@@ -83,8 +85,13 @@ limitations under the License. -->
     }
     const list = Object.keys(valueMappings.value);
     for (const i of list) {
-      if (new RegExp(i).test(String(source))) {
-        return valueMappings.value[i] || source;
+      try {
+        if (new RegExp(i).test(String(source))) {
+          return valueMappings.value[i] || source;
+        }
+      } catch (e) {
+        ElMessage.error("invalid regex string");
+        return source;
       }
     }
     return source;