From 9a1e33831023c08f58e2f0380b239a3472c8b7ab Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Thu, 26 Oct 2023 14:22:55 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3271=20fix=EF=BC=9ADashboard=E4=B8=AD?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=9B=BE=E8=A1=A8=E7=B1=BB=E5=9E=8B=E4=B8=BA?=
 =?UTF-8?q?Table=E6=97=B6=EF=BC=8CColumns-Display=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=86=85=E5=AE=B9=E4=B8=8D=E5=AE=8C=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/chartRightBox/chartRightBox.scss        | 1 +
 .../src/components/common/rightBox/chart/chartConfig.vue    | 6 +++---
 .../components/common/rightBox/chart/systemChartConfig.vue  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss
index c327af5a7..eaab74567 100644
--- a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss
@@ -357,6 +357,7 @@
     font-size: 14px;
     color: $--color-text-primary;
     line-height: 20px;
+    white-space: pre-wrap;
   }
 }
 
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 8d0d0abe3..0edf6ae76 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -755,9 +755,9 @@
                     <el-popover placement="top" trigger="hover" popper-class="prevent-clickoutside">
                       <div class="columns-dispaly-pop" style="width:396px">
                         <div class="columns-dispaly-title" v-pre>{{&lt;expression name&gt;.$labels.&lt;label name&gt;}}</div>
-                        <div class="columns-dispaly-msg">{{$t('tip.expressionLabel')}}{{$t('tip.$labels')}}</div>
+                        <div class="columns-dispaly-msg">{{$t('tip.expressionLabel',{expr:"\{\{A.$labels.asset\}\}"})}}</div>
                         <div class="columns-dispaly-title" v-pre>{{&lt;expression name&gt;.$value}}</div>
-                        <div class="columns-dispaly-msg">{{$t('tip.expressionValue')}}</div>
+                        <div class="columns-dispaly-msg">{{$t('tip.expressionValue',{expr:"\{\{A.$value\}\}"})}}</div>
                       </div>
                       <span slot="reference">
                         <i class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
@@ -1223,7 +1223,7 @@ export default {
               label: '',
               min: undefined,
               max: undefined
-            },
+            }
           }
           this.$nextTick(() => {
             this.chartConfig.param.thresholds.push({ value: undefined, color: randomcolor() })
diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index 64f283623..70f5f51d6 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -505,9 +505,9 @@
                     <el-popover placement="top" trigger="hover" popper-class="prevent-clickoutside">
                       <div class="columns-dispaly-pop" style="width:396px">
                         <div class="columns-dispaly-title" v-pre>{{&lt;expression name&gt;.$labels.&lt;label name&gt;}}</div>
-                        <div class="columns-dispaly-msg">{{$t('tip.expressionLabel')}}{{$t('tip.$labels')}}</div>
+                        <div class="columns-dispaly-msg">{{$t('tip.expressionLabel',{expr:"\{\{System.$labels.asset\}\}"})}}</div>
                         <div class="columns-dispaly-title" v-pre>{{&lt;expression name&gt;.$value}}</div>
-                        <div class="columns-dispaly-msg">{{$t('tip.expressionValue')}}</div>
+                        <div class="columns-dispaly-msg">{{$t('tip.expressionValue',{expr:"\{\{System.$value\}\}"})}}</div>
                       </div>
                       <span slot="reference">
                         <i class="nz-icon nz-icon-info-normal" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>