From d5144373c23426d847af60c7443785131b6834c6 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Thu, 21 Jul 2022 11:30:35 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix=20:=20asset=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=AA=A8=E6=9E=B6=E5=B1=8F=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/asset/asset.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index bf05cabe5..daf80e67d 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -338,7 +338,7 @@ export default {
             { key: 'Down', value: 0, name: 'Down' },
             { key: 'Up', value: 1, name: 'Up' }
           ],
-          show: true,
+          show: false,
           showMore: false,
           width: 0,
           index: -1
@@ -404,7 +404,7 @@ export default {
             { key: 'Down', id: 0, name: 'Down' },
             { key: 'Up', id: 1, name: 'Up' }
           ],
-          show: true,
+          show: false,
           showMore: false,
           dropShow: false,
           width: 0,

From 4f65ad4e4b660163c14ac36a785d0c65bfbaffd2 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Thu, 21 Jul 2022 17:05:51 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix=20:=20agent=E6=8F=90=E7=A4=BA=E6=A1=86?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9(=E5=85=A8=E8=8B=B1=E6=96=87)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/alert/alertStateInfo.vue   | 16 ++++++++--------
 .../components/common/project/popData/Info.vue   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertStateInfo.vue b/nezha-fronted/src/components/common/alert/alertStateInfo.vue
index b2ac04935..9148eecb0 100644
--- a/nezha-fronted/src/components/common/alert/alertStateInfo.vue
+++ b/nezha-fronted/src/components/common/alert/alertStateInfo.vue
@@ -10,7 +10,7 @@
       <!-- title -->
       <div class="alert-label-header-title">
         <span>
-            {{$t('overall.version')}} :
+            Version :
         </span>
         <span class="alert-label-header-text">
             {{ that && that.version ? that.version : "--" }}
@@ -19,27 +19,27 @@
       <!-- body -->
       <div class="alert-label-box">
         <span :class="that.auth ? 'green-bg' : 'red-bg'" class="active-icon"></span>
-        <span class="alert-label-value">{{$t('overall.auth')}}</span>
+        <span class="alert-label-value">Auth</span>
       </div>
        <div class="alert-label-box" v-if="that.prometheus">
         <span :class="{'green-bg': that.prometheus == 'UP','red-bg': that.prometheus == 'DOWN'}" class="active-icon"></span>
-        <span class="alert-label-value">{{$t('dashboard.overview.mapTooltip.prometheus')}}</span>
+        <span class="alert-label-value">Prometheus</span>
       </div>
        <div class="alert-label-box" v-if="that.cortex">
         <span :class="{'green-bg': that.cortex == 'UP','red-bg': that.cortex == 'DOWN', 'gray-bg': that.cortex == 'UNAVAILABLE'}" class="active-icon"></span>
-        <span class="alert-label-value">{{$t('overall.cortex')}}</span>
+        <span class="alert-label-value">Cortex</span>
       </div>
        <div class="alert-label-box" v-if="that.loki">
         <span :class="{'green-bg': that.loki == 'UP','red-bg': that.loki == 'DOWN','gray-bg': that.loki == 'UNAVAILABLE'}" class="active-icon"></span>
-        <span class="alert-label-value">{{$t('overall.loki')}}</span>
+        <span class="alert-label-value">Loki</span>
       </div>
       <div class="alert-label-box" v-if="that.snmp_exporter">
         <span :class="{'green-bg': that.snmp_exporter == 'UP','red-bg': that.snmp_exporter == 'DOWN'}" class="active-icon"></span>
-        <span class="alert-label-value">{{$t('overall.snmp_exporter')}}</span>
+        <span class="alert-label-value">SNMP exporter</span>
       </div>
       <div class="alert-label-box" v-if="that.blackbox_exporter">
         <span :class="{'green-bg': that.blackbox_exporter == 'UP','red-bg': that.blackbox_exporter == 'DOWN'}" class="active-icon"></span>
-        <span class="alert-label-value">{{$t('overall.blackbox_exporter')}}</span>
+        <span class="alert-label-value">Blackbox exporter</span>
       </div>
   </div>
   </div>
@@ -124,7 +124,7 @@ export default {
           delete labelPosition.left
 
           labelPosition.right =
-            clientWidth - position.left - leftOffSetView - position.width * 3.5 + 'px'
+            clientWidth - position.left - leftOffSetView - position.width * 4 + 'px'
         }
         return labelPosition
       }
diff --git a/nezha-fronted/src/components/common/project/popData/Info.vue b/nezha-fronted/src/components/common/project/popData/Info.vue
index 6c9f981c3..5c2a24eaa 100644
--- a/nezha-fronted/src/components/common/project/popData/Info.vue
+++ b/nezha-fronted/src/components/common/project/popData/Info.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="info-content pop-data-info-content" v-if="showInfo">
-    <div class="info-box"v-my-loading="loading">
+    <div class="info-box" v-my-loading="loading">
       <div class="info-box-title">{{$t('overall.module')}} {{$t('project.topo.icon.info')}}</div>
       <div class="info-box-content">
         <div class="content-box">

From ddc5f7e923f420e65d4adfa4f127fec62a4058bb Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 21 Jul 2022 18:32:25 +0800
Subject: [PATCH 3/4] =?UTF-8?q?NEZ-2059=20fix=EF=BC=9Apanel=20=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=20=E6=9C=AA=E5=AE=8C=E5=85=A8=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/panelChart.vue       | 20 +++++++++----------
 .../rightBox/chart/otherChartConfig.vue       |  2 +-
 .../rightBox/chart/systemChartConfig.vue      |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 2dae84488..94ed585d0 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -546,22 +546,22 @@ export default {
     },
     variablesReplace (expression) {
       let str = expression
-      let confirmReg = ''
-      let confirmRegItem = ''
+      let confirmReg = []
       this.variablesArr.forEach(item => {
         const reg = '$' + item.name // 后续需要考虑 item,name 使用特殊字符的问题
         const index = expression.indexOf(reg)
         if (index !== -1) {
-          if (reg.length > confirmReg.length) {
-            confirmReg = reg
-            confirmRegItem = item
-          }
+          confirmReg.push(item)
         }
       })
-      if (confirmReg) {
-        const index = expression.indexOf(confirmReg)
-        const replaceStr = confirmRegItem.checked.map(label => label.replace(/\"/g, '\\"').replace(/\'/g, "\\'")).join('|')
-        str = str.substring(0, index) + replaceStr + str.substring(index + confirmReg.length)
+      confirmReg = this.$loadsh.sortBy(confirmReg, function (item) { // 根据 匹配的name的长度排序 避免匹配的 $a 没匹配 $asset的问题
+        return item.name.length
+      })
+      if (confirmReg.length) {
+        confirmReg.forEach(item => {
+          const reg = new RegExp('\\$' + item.name, 'g') // 后续需要考虑 item,name 使用特殊字符的问题
+          str = str.replace(reg, item.checked.map(label => label.replace(/\"/g, '\\"').replace(/\'/g, "\\'")).join('|'))
+        })
       }
       return str
     },
diff --git a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
index aab7518f2..70c00e82a 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
@@ -150,7 +150,7 @@
       </el-form-item>
 
       <!-- visibility -->
-      <div>
+      <div v-if="params.type === 'group'">
         <div class="form__sub-title">
           <span>{{$t('dashboard.panel.showHidden')}}</span>
           <el-switch
diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index 4fb1f9abe..0da23fffb 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -680,7 +680,7 @@
       </div>
 
       <!-- visibility -->
-      <div>
+      <div v-if="params.type === 'group'">
         <div class="form__sub-title">
           <span>{{$t('dashboard.panel.showHidden')}}</span>
           <el-switch

From e76bb7463f886882b53f36b7e08cffbb5d37b3f7 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 21 Jul 2022 18:57:15 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix=EF=BC=9A=20alert=20rule=20trbShot=20?=
 =?UTF-8?q?=E6=9C=AA=E8=AE=BE=E7=BD=AE=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/panelChart.vue           | 6 ++++--
 .../src/components/common/alert/alertMessageInfoTab.vue     | 4 ++--
 .../src/components/common/rightBox/alertRuleBox.vue         | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 94ed585d0..72380bf1c 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -554,9 +554,11 @@ export default {
           confirmReg.push(item)
         }
       })
-      confirmReg = this.$loadsh.sortBy(confirmReg, function (item) { // 根据 匹配的name的长度排序 避免匹配的 $a 没匹配 $asset的问题
+      confirmReg = this.$loadsh.orderBy(confirmReg, function (item) { // 根据 匹配的name的长度排序 避免匹配的 $a 没匹配 $asset的问题
+        console.log(item.name.length)
         return item.name.length
-      })
+      }, 'desc')
+      console.log(confirmReg)
       if (confirmReg.length) {
         confirmReg.forEach(item => {
           const reg = new RegExp('\\$' + item.name, 'g') // 后续需要考虑 item,name 使用特殊字符的问题
diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
index a47d6b140..0b1ce75be 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
@@ -23,7 +23,7 @@
           />
         </div>
         <div v-else-if="item.key === 'trbShot' && activeName === 'trbShot'">
-          <div v-html="infoData.alertRule.trbShot">
+          <div v-html="infoData.alertRule.trbShot" v-if="infoData.alertRule.trbShot">
           </div>
         </div>
       </el-tab-pane>
@@ -108,7 +108,7 @@ export default {
               this.cardNames.push(item)
             }
           })
-          if (n.alertRule && n.alertRule.trbShot) {
+          if (n.alertRule && n.alertRule.trbShot && n.alertRule.trbShot != '<div  class="editor-core ql-container ql-snow"><div class="ql-editor"><p><br></p></div></div>') {
             this.cardNames.push({
               key: 'trbShot',
               label: this.$t('alert.config.trbShot')
diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
index b6fd00125..881fd55a1 100644
--- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
@@ -507,6 +507,9 @@ export default {
         method: this.editAlertRule.method.join(','),
         type: this.editAlertRule.type
       }
+      if (this.editAlertRule.trbShot && this.editAlertRule.trbShot == '<div  class="editor-core ql-container ql-snow"><div class="ql-editor"><p><br></p></div></div>') {
+        this.editAlertRule.trbShot = ''
+      }
       this.$refs.alertRuleForm.validate((valid) => {
         if (valid) {
           params.receiver = this.editAlertRule.receiverShow.join(',')