From f30ad4cbbd4d9e2943b9f18ae2546e947cc068d2 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 22 Jul 2022 16:50:20 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2060=20fix=EF=BC=9Atable=20=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=9B=BE=E8=A1=A8=20value=20mapping=E6=8A=98=E5=8F=A0?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=20column?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common.scss      |  2 +
 .../src/components/chart/chart/chartTable.vue | 54 +++++++++++++++----
 .../src/components/common/popBox/guide.vue    |  2 +-
 .../rightBox/administration/userBox.vue       |  2 +-
 .../common/rightBox/chart/chartConfig.vue     |  1 +
 .../rightBox/chart/systemChartConfig.vue      |  1 +
 .../src/components/layout/header.vue          |  4 +-
 7 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss
index 7b482338d..806813744 100644
--- a/nezha-fronted/src/assets/css/common.scss
+++ b/nezha-fronted/src/assets/css/common.scss
@@ -390,6 +390,8 @@ td .nz-icon-gear:before {
   padding: 0;
   .link-title {
     padding: 0 20px;
+    height: 100%;
+    display: block;
   }
 }
 .el-icon-arrow-right {
diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue
index c791787b5..7909361fa 100644
--- a/nezha-fronted/src/components/chart/chart/chartTable.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTable.vue
@@ -36,7 +36,7 @@
             {{showValueMapping(scope.row,col.title)}}
           </div>
           <div class="value-mapping-table" v-else>
-            {{scope.row.display[col.title + 'display']}}
+            {{scope.row.display[col.title + 'display'].display}}
           </div>
         </template>
       </el-table-column>
@@ -172,7 +172,7 @@ export default {
           if (this.chartInfo.param.enable && this.chartInfo.param.enable.valueMapping) {
             valueMapping[column.title].forEach(item => {
               // const rowValue = row.display[column.title + 'display']
-              const rowValue = row.display[column.title + 'display']
+              const rowValue = row.display[column.title + 'display'].oldValue
               if (item.type === 'value') {
                 if (rowValue == item.value) {
                   obj[column.title + 'mapping'] = item
@@ -201,7 +201,10 @@ export default {
         ...row
       }
       this.columns.forEach((column) => {
-        obj[column.title + 'display'] = ''
+        obj[column.title + 'display'] = {
+          display: '',
+          oldValue: ''
+        }
         if (/\{\{.+\}\}/.test(column.display)) {
           const labelValue = column.display.replace(/(\{\{.+?\}\})/g, function (i) {
             const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
@@ -233,9 +236,42 @@ export default {
             }
             return value || ''
           })
-          obj[column.title + 'display'] = labelValue
+          const oldLabelValue = column.display.replace(/(\{\{.+?\}\})/g, function (i) {
+            const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
+            let value = null
+            if (lodash.get(params, label)) {
+              value = lodash.get(params, label)
+              if (!((typeof value) == 'string' && value.constructor == String)) {
+                let legend = ''
+                if (value.__name__) {
+                  legend += `${value.__name__}{`
+                } else {
+                  legend += '{'
+                }
+                const tagKeysArr = Object.keys(value)
+                tagKeysArr.forEach(tagKey => {
+                  if (tagKey !== '__name__') {
+                    legend += `${tagKey}="${value[tagKey]}",`
+                  }
+                })
+                if (legend.endsWith(',')) {
+                  legend = legend.substr(0, legend.length - 1)
+                }
+                legend += '}'
+                value = legend
+              }
+            }
+            return value || ''
+          })
+          obj[column.title + 'display'] = {
+            display: labelValue,
+            oldValue: oldLabelValue
+          }
         } else {
-          obj[column.title + 'display'] = column.display
+          obj[column.title + 'display'] = {
+            display: column.display,
+            oldValue: column.display
+          }
         }
       })
       return obj
@@ -291,8 +327,8 @@ export default {
     // 本地正序
     asce (prop) {
       return function (obj1, obj2) {
-        const val1 = obj1.display[prop + 'display'].replace(/\s*/g, '')
-        const val2 = obj2.display[prop + 'display'].replace(/\s*/g, '')
+        const val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '')
+        const val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '')
         if (val1 < val2) {
           return -1
         } else if (val1 > val2) {
@@ -305,8 +341,8 @@ export default {
     // 本地倒序
     desc (prop) {
       return function (obj1, obj2) {
-        const val1 = obj1.display[prop + 'display'].replace(/\s*/g, '')
-        const val2 = obj2.display[prop + 'display'].replace(/\s*/g, '')
+        const val1 = obj1.display[prop + 'display'].display.replace(/\s*/g, '')
+        const val2 = obj2.display[prop + 'display'].display.replace(/\s*/g, '')
         if (val1 < val2) {
           return -1
         } else if (val1 > val2) {
diff --git a/nezha-fronted/src/components/common/popBox/guide.vue b/nezha-fronted/src/components/common/popBox/guide.vue
index c83eaf5ce..f395c52d7 100644
--- a/nezha-fronted/src/components/common/popBox/guide.vue
+++ b/nezha-fronted/src/components/common/popBox/guide.vue
@@ -24,7 +24,7 @@
         </div>
       </template>
       <template v-if="activeIndex === 1">
-        <div class="desc-text">{{$t('overall.agentTip')}}</div>
+        <div class="desc-text">{{$t('guide.agentTip')}}</div>
         <div class="guide__btn-group">
           <button :class="{'guide__btn--disabled': !hasButton('agent_add')}" class="guide__btn" type="button" @click="jumpAndOpen('agent')">{{$t('overall.createPrometheusServer')}}</button>
           <button :class="{'guide__btn--disabled': !hasButton('agent_add')}" class="guide__btn" type="button" @click="downloadAgent">{{$t('guide.downloadAgent')}}</button>
diff --git a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
index 0172a4b58..964fa8a7d 100644
--- a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue
@@ -137,7 +137,7 @@ export default {
       if (value === '' && this.editUser.pin) {
         callback(new Error(this.$t('config.user.reinputPin')))
       } else if (value !== this.editUser.pin) {
-        callback(new Error(this.$t('profile.confirmPasswordErr')))
+        callback(new Error(this.$t('profile.confirmPasswordError')))
       } else {
         callback()
       }
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 14aad7aee..99e47ed8a 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -572,6 +572,7 @@
               <div class="chart-title chart-title-config">
                 <span class="chart-title-content">
                   <i class="nz-icon nz-icon-arrow-down" :class="item.show?'':'is-active'" @click="showMapping(index)"></i>
+                  <span v-if="item.column && !item.show">{{item.column}}:</span>
                   <span v-show="!item.show" class="title-content-left">
                     <span v-if="item.type === 'value'">
                       {{item.value}}
diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index 10a2049dd..b9ec13a09 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -525,6 +525,7 @@
               <div class="chart-title chart-title-config">
                 <span class="chart-title-content">
                   <i class="nz-icon nz-icon-arrow-down" :class="item.show?'':'is-active'" @click="showMapping(index)"></i>
+                   <span v-if="item.column && !item.show">{{item.column}}:</span>
                   <span v-show="!item.show" class="title-content-left">
                     <span v-if="item.type === 'value'">
                       {{item.value}}
diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue
index 3fe7ae802..bedcce106 100644
--- a/nezha-fronted/src/components/layout/header.vue
+++ b/nezha-fronted/src/components/layout/header.vue
@@ -14,8 +14,8 @@
       <el-dropdown trigger="click">
         <div class="header-menu__item" :title="$t('config.system.link.link')"><i class="nz-icon nz-icon-more-app"></i></div>
         <el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top el-dropdown-menu-link">
-          <el-dropdown-item v-for="(item, index) in linkData" :key="index" :index="'0-' + index" v-if="linkData.length">
-            <a :href='item.url' rel="noopener noreferrer" target="_blank" class="link-title nz-  a">
+          <el-dropdown-item v-for="(item, index) in linkData" :key="index" :index="'0-' + index" v-if="linkData.length" class="el-dropdown-menu-link-item">
+            <a :href='item.url' rel="noopener noreferrer" target="_blank" class="link-title nz-a">
               <i class="nz-icon nz-icon-link"></i>
               <span class="nz-  a">{{item.name}}</span>
             </a>