From 1284c6fab232e505f554f63619dd1c6a2ca2c8a3 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 18 Jul 2022 17:34:41 +0800
Subject: [PATCH 01/18] =?UTF-8?q?feat=20:=20=E5=A2=9E=E5=8A=A0MIB=20browse?=
 =?UTF-8?q?r=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=A4=8D=E5=88=B6=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/config/mibBrowser.vue     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue
index 1b0251f35..f311079f5 100644
--- a/nezha-fronted/src/components/page/config/mibBrowser.vue
+++ b/nezha-fronted/src/components/page/config/mibBrowser.vue
@@ -86,15 +86,24 @@
             <div ref="detailScrollbar" class="mib-browser-detail">
               <div class="mib-browser-detail-row">
                 <div>Name</div>
-                <div>{{currentWalk.name}}</div>
+                <div class="document-copy-block">
+                <div class="document-copy-text">{{currentWalk.name}}</div>
+                <i  class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(currentWalk.name)" :title="$t('overall.copyText')"></i>
+                </div> 
               </div>
               <div class="mib-browser-detail-row">
                 <div>OID</div>
-                <div>{{currentWalk.objectID}}</div>
+                <div class="document-copy-block">
+                <div class="document-copy-text">{{currentWalk.objectID}}</div>
+                <i  class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(currentWalk.objectID)" :title="$t('overall.copyText')"></i>
+                </div>
               </div>
               <div class="mib-browser-detail-row">
                 <div>MIB</div>
-                <div>{{mibName(currentWalk.objectID)}}</div>
+                <div class="document-copy-block">
+                <div class="document-copy-text">{{currentWalk.objectID}}</div>
+                <i  class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(currentWalk.objectID)" :title="$t('overall.copyText')"></i>
+                </div>
               </div>
               <div class="mib-browser-detail-row">
                 <div>Syntax</div>

From 51607a09743a97432a64878a12504b305d0da4af Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 19 Jul 2022 10:33:50 +0800
Subject: [PATCH 02/18] =?UTF-8?q?fix=20:=20MIB=20browser=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/config/mibBrowser.vue        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue
index f311079f5..a35a33411 100644
--- a/nezha-fronted/src/components/page/config/mibBrowser.vue
+++ b/nezha-fronted/src/components/page/config/mibBrowser.vue
@@ -86,23 +86,23 @@
             <div ref="detailScrollbar" class="mib-browser-detail">
               <div class="mib-browser-detail-row">
                 <div>Name</div>
-                <div class="document-copy-block">
+                <div class="document-copy-block" >
                 <div class="document-copy-text">{{currentWalk.name}}</div>
-                <i  class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(currentWalk.name)" :title="$t('overall.copyText')"></i>
-                </div> 
+                <i v-if="currentWalk.name" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(currentWalk.name)" :title="$t('overall.copyText')"></i>
+                </div>
               </div>
               <div class="mib-browser-detail-row">
                 <div>OID</div>
                 <div class="document-copy-block">
                 <div class="document-copy-text">{{currentWalk.objectID}}</div>
-                <i  class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(currentWalk.objectID)" :title="$t('overall.copyText')"></i>
+                <i v-if="currentWalk.objectID" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(currentWalk.objectID)" :title="$t('overall.copyText')"></i>
                 </div>
               </div>
               <div class="mib-browser-detail-row">
                 <div>MIB</div>
                 <div class="document-copy-block">
-                <div class="document-copy-text">{{currentWalk.objectID}}</div>
-                <i  class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(currentWalk.objectID)" :title="$t('overall.copyText')"></i>
+                <div class="document-copy-text">{{mibName(currentWalk.objectID)}}</div>
+                <i v-if="mibName(currentWalk.objectID)" class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(mibName(currentWalk.objectID))" :title="$t('overall.copyText')"></i>
                 </div>
               </div>
               <div class="mib-browser-detail-row">

From 514acb13e450c4b82b4cbdfc31d6c56b3ebd6e89 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 19 Jul 2022 10:54:09 +0800
Subject: [PATCH 03/18] =?UTF-8?q?NEZ-2044=20fix=EF=BC=9A=20chart=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=20=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=8D=A1=E9=A1=BF=E5=93=8D=E5=BA=94=E6=85=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/chart/chartConfig.vue     | 25 ++++++++-----------
 .../rightBox/chart/systemChartConfig.vue      | 25 ++++++++-----------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index ca66684f1..9add1bb08 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -691,26 +691,21 @@
                   </div>
                   <el-form-item :prop="'param.valueMapping.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item">
                     <el-input v-model="item.display" style="margin-right: 10px" :placeholder="$t('placeholder.chart.display')" size="small" @change="change('valueMapping', index)" class="mapping-display-input">
-                      <el-popover
-                        slot="prefix"
-                        placement="top-start"
-                        trigger="manual"
-                        popper-class="mapping-iconPop no-style-class"
-                        v-clickoutside="()=>{closeChoose(index)}"
-                        v-model="isChoose[index]"
-                        >
-                        <ul class="mapping-iconList">
-                          <li class="mapping-iconItem" :class="{active:item.icon===subItem.value}" v-for="subItem in mappingIconList" @click="iconActive(item,subItem,index)" :key="subItem.value">
-                            <i :class="subItem.value"></i>
-                          </li>
-                        </ul>
-                        <div slot="reference" @click="chooseIcon(isChoose[index],index)">
+                      <el-dropdown trigger="click" slot="prefix" placement="top-start">
+                        <div class="el-dropdown-link">
                           <i v-if="item.icon" class="mapping-icon" :class="item.icon" :style="{ color: item.color.icon }"></i>
                           <div v-else class="mapping-iconSelect" :title="$t('tip.add')">
                             <i class="nz-icon nz-icon-create-square"></i>
                           </div>
                         </div>
-                      </el-popover>
+                        <el-dropdown-menu slot="dropdown" class="mapping-iconPop">
+                            <ul class="mapping-iconList">
+                              <li class="mapping-iconItem" :class="{active:item.icon===subItem.value}" v-for="subItem in mappingIconList" @click="iconActive(item,subItem,index)" :key="subItem.value">
+                                <i :class="subItem.value"></i>
+                              </li>
+                            </ul>
+                        </el-dropdown-menu>
+                      </el-dropdown>
                     </el-input>
                   </el-form-item>
                   <nezhaColor
diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index 76f88a86e..0f4bba8a3 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -645,26 +645,21 @@
                   </div>
                   <el-form-item :prop="'param.valueMapping.' + index + '.display'" :rules="{ required: true, message: $t('validate.required'), trigger: 'blur'}" class="thresholds-from-item">
                     <el-input v-model="item.display" style="margin-right: 10px" :placeholder="$t('placeholder.chart.display')" size="small" @change="change('valueMapping', index)" class="mapping-display-input">
-                      <el-popover
-                        slot="prefix"
-                        placement="top-start"
-                        trigger="manual"
-                        popper-class="mapping-iconPop no-style-class"
-                        v-clickoutside="()=>{closeChoose(index)}"
-                        v-model="isChoose[index]"
-                        >
-                        <ul class="mapping-iconList">
-                          <li class="mapping-iconItem" :class="{active:item.icon===subItem.value}" v-for="subItem in mappingIconList" @click="iconActive(item,subItem,index)" :key="subItem.value">
-                            <i :class="subItem.value"></i>
-                          </li>
-                        </ul>
-                        <div slot="reference" @click="chooseIcon(isChoose[index],index)">
+                      <el-dropdown trigger="click" slot="prefix" placement="top-start">
+                        <div class="el-dropdown-link">
                           <i v-if="item.icon" class="mapping-icon" :class="item.icon" :style="{ color: item.color.icon }"></i>
                           <div v-else class="mapping-iconSelect" :title="$t('tip.add')">
                             <i class="nz-icon nz-icon-create-square"></i>
                           </div>
                         </div>
-                      </el-popover>
+                        <el-dropdown-menu slot="dropdown" class="mapping-iconPop">
+                          <ul class="mapping-iconList">
+                            <li class="mapping-iconItem" :class="{active:item.icon===subItem.value}" v-for="subItem in mappingIconList" @click="iconActive(item,subItem,index)" :key="subItem.value">
+                              <i :class="subItem.value"></i>
+                            </li>
+                          </ul>
+                        </el-dropdown-menu>
+                      </el-dropdown>
                     </el-input>
                   </el-form-item>
                   <nezhaColor

From 8f28ad3e82564bb46e35d5ff8ca548c93e096505 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 19 Jul 2022 11:37:30 +0800
Subject: [PATCH 04/18] =?UTF-8?q?feat=20:=20mibBroeser=20value=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=A4=8D=E5=88=B6=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/config/mibBrowser.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue
index a35a33411..a94888aae 100644
--- a/nezha-fronted/src/components/page/config/mibBrowser.vue
+++ b/nezha-fronted/src/components/page/config/mibBrowser.vue
@@ -149,7 +149,12 @@
                </div>
               </pl-table-column>
               <pl-table-column v-slot="{row}" label="Value">
-                <template><div @click="searchParam.oid = row.oid">{{row.value}}</div></template>
+                 <div class="document-copy-block">
+                  <div class="document-copy-text">
+                    <div @click="searchParam.oid = row.oid">{{row.value}}</div>
+                  </div>
+                  <i v-if="row.value"  class="nz-icon nz-icon-override" style="visibility: hidden" @click="onCopy(row.value)" :title="$t('overall.copyText')"></i>
+               </div>
               </pl-table-column>
               <pl-table-column v-slot="{row}" label="Type">
                 <template><div @click="searchParam.oid = row.oid">{{row.type}}</div></template>

From 11c17db9f38f93e788d7fbe35cb7c144d03bd556 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 19 Jul 2022 12:46:55 +0800
Subject: [PATCH 05/18] =?UTF-8?q?fix=20:=20chartRightBox=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=20=E5=9B=BD=E9=99=85=E5=8C=96=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/chart/chartConfig.vue       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 9add1bb08..0fb469bce 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -814,8 +814,12 @@
                 size="small"
                 @change="change"
               >
-                <el-option label="Show" value="show"></el-option>
-                <el-option label="Hidden" value="hidden"></el-option>
+                <el-option
+                v-for="item in showHidden"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">{{item.name}}</el-option>
+                <!-- <el-option value="hidden">{{$t('overall.hidden')}}</el-option> -->
               </el-select>
             </el-form-item>
           </div>
@@ -868,6 +872,15 @@ export default {
       oldType: '',
       tag: '',
       promqlType: 'log',
+      showHidden: [
+        {
+          id: 'show',
+          name: this.$t('overall.show')
+        }, {
+          id: 'hidden',
+          name: this.$t('overall.hidden')
+        }
+      ],
       chartTypeList: [
         {
           id: 'line',

From e5d219a60d6468204f0a6570a540f625dd374bc3 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 19 Jul 2022 14:36:33 +0800
Subject: [PATCH 06/18] =?UTF-8?q?NEZ-2048=20fix=EF=BC=9A=20dashboard=20var?=
 =?UTF-8?q?iable=20=E4=B8=8B=E6=8B=89=E6=A1=86=20=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=BA=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/panelChart.vue         | 17 ++++++++++++++---
 .../components/common/panel/panelVariables.vue  | 10 ++++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index c3eafd1ac..2dae84488 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -546,12 +546,23 @@ export default {
     },
     variablesReplace (expression) {
       let str = expression
+      let confirmReg = ''
+      let confirmRegItem = ''
       this.variablesArr.forEach(item => {
-        const reg = new RegExp('\\$' + item.name, 'g') // 后续需要考虑 item,name 使用特殊字符的问题
-        if (reg.test(expression)) {
-          str = str.replace(reg, item.checked.map(label => label.replace(/\"/g, '\\"').replace(/\'/g, "\\'")).join('|'))
+        const reg = '$' + item.name // 后续需要考虑 item,name 使用特殊字符的问题
+        const index = expression.indexOf(reg)
+        if (index !== -1) {
+          if (reg.length > confirmReg.length) {
+            confirmReg = reg
+            confirmRegItem = 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)
+      }
       return str
     },
     getHexagonFigureData () {
diff --git a/nezha-fronted/src/components/common/panel/panelVariables.vue b/nezha-fronted/src/components/common/panel/panelVariables.vue
index 427225b50..d123399ae 100644
--- a/nezha-fronted/src/components/common/panel/panelVariables.vue
+++ b/nezha-fronted/src/components/common/panel/panelVariables.vue
@@ -368,16 +368,19 @@ export default {
       })
       item.checked = item.checkAll ? allValue : []
       item.isIndeterminate = false
-      this.$store.dispatch('dispatchVariablesArr', [...this.labelArr])
+      if (!item.multi) {
+        this.close()
+        this.$store.dispatch('dispatchVariablesArr', [...this.labelArr])
+      }
     },
     checkedChange (item, value) {
       const checkedCount = value.length
       item.checkAll = checkedCount === this.labelValue[item.name].length
       item.isIndeterminate = checkedCount > 0 && checkedCount < this.labelValue[item.name].length
-      this.$store.dispatch('dispatchVariablesArr', [...this.labelArr])
     },
     selectLabelValue (item, value) {
       item.checked = [value.value]
+      this.close()
       this.$store.dispatch('dispatchVariablesArr', [...this.labelArr])
     },
     triggerVisible (item) {
@@ -387,6 +390,9 @@ export default {
     },
     close () {
       this.labelArr.forEach((item) => {
+        if (item.visible && item.multi) {
+          this.$store.dispatch('dispatchVariablesArr', [...this.labelArr])
+        }
         item.visible = false
       })
     }

From d82dadf5c093edd0f8e6eb855ef636583344564a Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 19 Jul 2022 14:59:07 +0800
Subject: [PATCH 07/18] =?UTF-8?q?NEZ-2046=20fix=20:=20chart=20legend=20?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/chart/chartConfig.vue       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 0fb469bce..7697c9cb6 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -95,7 +95,8 @@
                 <el-col class="legend-title">
                   <span class="legend-title__span">{{$t('dashboard.panel.chartForm.legend')}}&nbsp;</span>
                   <el-popover placement="top" trigger="hover" width="211" popper-class="prevent-clickoutside">
-                    <div :style="{'word-break':language!=='cn'?'keep-all':'break-all'}">{{$t('dashboard.panel.chartForm.legendTip')}}</div>
+                    <div style="word-break:break-all; white-space: normal">{{$t('dashboard.panel.chartForm.legendTip')}}</div>
+                    <!-- <div :style="{'word-break':language!=='cn'?'keep-all':'break-all'}">{{$t('dashboard.panel.chartForm.legendTip')}}</div> -->
                     <i @mouseover="rz" class="nz-icon nz-icon-info-normal" slot="reference" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
                   </el-popover>
                 </el-col>

From 985687ad499378aef3e0138befb24f1fba75a30d Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 19 Jul 2022 16:09:44 +0800
Subject: [PATCH 08/18] =?UTF-8?q?NEZ-2045=20fix=20:=20project=20topology?=
 =?UTF-8?q?=20=E4=BE=A7=E6=BB=91=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/monitor/project/project.scss         | 24 +++++++++++++++++++
 .../src/components/common/alert/nzTooltip.vue |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss
index eed14888d..983c41fe2 100644
--- a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss
+++ b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss
@@ -139,3 +139,27 @@
 .el-collapse-item__header {
   border-bottom: 1px solid $--border-color-light;
 }
+
+.main-list--project.main-list{
+  .project.projectTopo{
+    .project-box.list-page{
+      .mc{
+        .right-box{
+          td{
+            .cell{
+              padding-right: 11px !important;
+            }
+          }
+          .cell{
+            padding: 0 10px !important;
+            .el-checkbox__inner{
+              box-sizing: border-box;
+              width: 15px;
+              height: 15px;
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/nezha-fronted/src/components/common/alert/nzTooltip.vue b/nezha-fronted/src/components/common/alert/nzTooltip.vue
index bfa0eaf86..a43899c97 100644
--- a/nezha-fronted/src/components/common/alert/nzTooltip.vue
+++ b/nezha-fronted/src/components/common/alert/nzTooltip.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :class="calcHeight(that.position,that)" :style="calcPosition(that.position,that)" class="alert-label__border" ref="alertLabels"
+  <div style="padding:15px" :class="calcHeight(that.position,that)" :style="calcPosition(that.position,that)" class="alert-label__border" ref="alertLabels"
        @mouseenter="tooltipHover(true)"
        @mouseleave="tooltipHover(false)">
     <slot name="default"/>

From 517ce4bbe1bca896bfc7b4953b035449cf3f3078 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 19 Jul 2022 16:31:08 +0800
Subject: [PATCH 09/18] =?UTF-8?q?NEZ-2047=20fix=EF=BC=9A=20bug1=20bug2=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common/rightBoxCommon.scss  | 2 +-
 .../src/components/common/mixin/system/systemMixin.js    | 2 +-
 .../src/components/common/rightBox/snmpCredentialBox.vue | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
index ff493c21a..e6182c1bb 100644
--- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
+++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
@@ -221,7 +221,7 @@
   align-items: center;
   justify-content: center;
   height: 70px;
-  box-shadow: -3px 0 8px -3px rgba(205,205,205,0.77);
+  box-shadow: $--right-box-shadow;
 }
 .footer__btn {
   margin: 0 15px;
diff --git a/nezha-fronted/src/components/common/mixin/system/systemMixin.js b/nezha-fronted/src/components/common/mixin/system/systemMixin.js
index e556267e8..4bd5b88d8 100644
--- a/nezha-fronted/src/components/common/mixin/system/systemMixin.js
+++ b/nezha-fronted/src/components/common/mixin/system/systemMixin.js
@@ -252,7 +252,7 @@ export default {
             this.$refs.emailForm.clearValidate()
           }
           if (type == 'monitor') {
-
+            localStorage.setItem('nz-prometheus-federation-enabled', this.monitor.prometheus_federation_enabled)
           }
           this[type + 'Copy'] = Object.assign({}, this[type])
         }
diff --git a/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue b/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue
index de3cfa92f..8de01efaf 100644
--- a/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue
@@ -33,7 +33,7 @@
             <el-form-item :label='$t("config.mib.credential.writeCommunity")' prop="writeCommunity" v-if="editCredential.type ===1 || editCredential.type === 2">
               <el-input placeholder="" autocomplete="new-password" maxlength="64" show-word-limit v-model="editCredential.config.writeCommunity" size="small" id="credential-box-input-writeCommunity" type="password" show-password></el-input>
             </el-form-item>
-            <el-form-item :label='$t("profile.username")' prop="username" v-if="editCredential.type === 3">
+            <el-form-item :label='$t("profile.username")' prop="config.username" v-if="editCredential.type === 3">
               <el-input placeholder="" maxlength="64" show-word-limit v-model="editCredential.config.username" size="small" id="credential-box-input-username"></el-input>
             </el-form-item>
             <el-form-item :label='$t("config.mib.credential.contextName")' prop="contextname"  v-if="editCredential.type === 3">
@@ -50,7 +50,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item :label='$t("login.pin")' prop="authPin" v-if="editCredential.type === 3">
+            <el-form-item :label='$t("login.pin")' prop="authPin" v-if="editCredential.type === 3" :rules="[ { required: editCredential.config.authProtocol, message: this.$t('validate.required'), trigger: 'blur' }]">
               <el-input placeholder=""  autocomplete="new-password"  v-model="editCredential.config.authPin" size="small" id="credential-box-input-authPin" type="password" show-password></el-input>
             </el-form-item>
 
@@ -64,7 +64,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item :label='$t("login.pin")' prop="privPin"  v-if="editCredential.type === 3">
+            <el-form-item :label='$t("login.pin")' prop="privPin"  v-if="editCredential.type === 3" :rules="[ { required: editCredential.config.privProtocol, message: this.$t('validate.required'), trigger: 'blur' }]">
               <el-input placeholder=""  autocomplete="new-password"  v-model="editCredential.config.privPin" size="small" id="credential-box-input-privPin" :disabled="!editCredential.config.authProtocol || editCredential.config.authProtocol === ''" type="password" show-password></el-input>
             </el-form-item>
           </el-form>
@@ -102,6 +102,9 @@ export default {
         name: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        'config.username': [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         remark: [
           // { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],

From 1712e7c926cfe72d2227704e7751a58a9e7269ac Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 20 Jul 2022 09:54:12 +0800
Subject: [PATCH 10/18] =?UTF-8?q?NEZ-2051=20fix=EF=BC=9Aconsole=20?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/@topology/core/src/core.js        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nezha-fronted/src/components/common/@topology/core/src/core.js b/nezha-fronted/src/components/common/@topology/core/src/core.js
index ee4997280..88157997f 100644
--- a/nezha-fronted/src/components/common/@topology/core/src/core.js
+++ b/nezha-fronted/src/components/common/@topology/core/src/core.js
@@ -823,9 +823,11 @@ const Topology = /** @class */ (function () {
     this.setupMouseEvent()
     // Wait for parent dom load
     setTimeout(function () {
+      if (!_this.divLayer) return
       _this.canvasPos = _this.divLayer.canvas.getBoundingClientRect()
     }, 500)
     setTimeout(function () {
+      if (!_this.divLayer) return
       _this.canvasPos = _this.divLayer.canvas.getBoundingClientRect()
     }, 1000)
     this.cache()
@@ -1300,6 +1302,9 @@ const Topology = /** @class */ (function () {
       return this
     }
     this.rendering = true
+    if (!this.offscreen ) {
+      return
+    }
     // 获取 ctx 对象
     const ctx = this.offscreen.canvas.getContext('2d')
     ctx.clearRect(0, 0, this.offscreen.canvas.width, this.offscreen.canvas.height)
@@ -2510,6 +2515,7 @@ const Topology = /** @class */ (function () {
     }
     this.cacheTimer = setTimeout(function () {
       let _a
+      if (!this.animateLayer) return
       _this.animateLayer.readyPlay(undefined, true)
       _this.animateLayer.animate();
       (_a = _this.cache) === null || _a === void 0 ? void 0 : _a.call(_this)

From bbc3b83e5cba156f46c110b0cab0a86fe81ea054 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Wed, 20 Jul 2022 10:46:46 +0800
Subject: [PATCH 11/18] =?UTF-8?q?NEZ-2041=20feat=20:=20about=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=88=9D=E7=89=88=EF=BC=88=E6=97=A0=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E7=89=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/page/config/about.scss     | 150 +++++++++++---
 .../src/components/page/config/about.vue      | 186 +++++++++++++++++-
 2 files changed, 302 insertions(+), 34 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/page/config/about.scss b/nezha-fronted/src/assets/css/components/page/config/about.scss
index bca32d062..c89f0704a 100644
--- a/nezha-fronted/src/assets/css/components/page/config/about.scss
+++ b/nezha-fronted/src/assets/css/components/page/config/about.scss
@@ -1,20 +1,30 @@
 .about {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
   height: 100%;
+  width: 100%;
+  padding: 20px 20px 10px 20px;
   background-color: $--background-color-empty;
-  //border: 10px solid $--background-color-base;
   box-sizing: border-box;
 
+  .app{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 100%;
+    height: 140px;
+    background-color: $--background-color-2;
+  }
   .about-label {
     color: $--color-text-secondary;
   }
 
   .app-header {
     display: flex;
-    min-width: 360px;
+    justify-content: center;
+    align-items: center;
+    border-right: 2px solid $--border-color-light;
+    padding-right: 20px;
+    margin-right: 20px;
+    // min-width: 360px;
 
     .header-logo {
       font-size: 0;
@@ -22,19 +32,20 @@
     }
 
     .header-title {
-      padding-left: 20px;
+      padding-left: 10px;
       display: flex;
       flex-direction: column;
-      justify-content: space-between;
+      justify-content: center;
 
       .app-name {
         font-weight: bold;
-        line-height: 50px;
+        line-height: 30px;
         font-size: 20px;
         color: $--color-text-primary;
       }
 
       .app-version {
+        padding-left: 1px;
         font-size: 14px;
         color: $--color-text-primary;
         font-weight: 400;
@@ -43,28 +54,107 @@
   }
 
   .app-component {
-    width: 360px;
-    margin-top: 35px;
-
-    .component-title {
-      color: $--color-text-secondary;
-      height: 30px;
-      font-size: 14px;
-      line-height: 30px;
-      border-bottom: 1px solid $--color-text-secondary;
-    }
-
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     .component-content {
-      padding-top: 8px;
-    }
-
-    .app-component-row {
-      line-height: 28px;
-      display: flex;
-      color: $--color-text-primary;
-      font-size: 16px;
-      font-weight: 400;
-      justify-content: space-between;
+      // padding-top: 8px;
+      .app-component-row {
+        line-height: 28px;
+        display: flex;
+        color: $--color-text-primary;
+        font-size: 14px;
+        font-weight: 400;
+        justify-content: space-between;
+      }
+      .component-name{
+        color: $--color-text-regular;
+        margin-right: 20px;
+      }
     }
   }
+
+  .time-line{
+    width: 100%;
+    height: calc(100% - 160px);
+    .time-line-title{
+      margin-top: 20px;
+      width: 100%;
+      padding-bottom: 10px;
+      color: $--color-text-regular;
+      font-size: 14px;
+      font-weight: 700;
+    }
+    .time-line-body{
+      width: 100%;
+      height: 96%;
+      padding: 30px 30px 0 35px;
+      border: 1px solid $--border-color-light;
+      box-sizing: border-box;
+      overflow-y: auto;
+      .el-timeline-item{
+        padding-bottom: 0;
+      }
+      .about-summary{
+        display: flex;
+        justify-content: start;
+        align-items: center;
+        padding-top: 6px;
+        line-height: 21px;
+        .dot{
+          width: 6px;
+          height: 6px;
+          border-radius: 50%;
+          background-color: $--color-info;
+          margin-right: 5px;
+        }
+        .about-summary-text{
+          font-size: 14px;
+          color: $--color-text-regular;
+        }
+      }
+    }
+  }
+
+  .el-timeline-item__node.el-timeline-item__node--normal.el-timeline-item__node--{
+    position: relative;
+    box-sizing: border-box;
+    width: 18px;
+    height: 18px;
+    border: 1px solid  $--color-primary;
+    background-color: $--background-color-empty;
+    z-index: 3;
+  }
+  .el-timeline-item__node.el-timeline-item__node--normal.el-timeline-item__node--::before{
+    content: "";
+    width: 12px;
+    height: 12px;
+    border-radius: 50%;
+    background-color: $--color-primary;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    margin: auto;
+    z-index: 3;
+  }
+  .el-timeline-item__tail{
+    border-left: 1px solid  rgba(250,144,28,0.12);
+    left: 8px;
+  }
+  .el-timeline-item__wrapper{
+    top:-21px;
+    padding-left: 38px;
+    .el-timeline-item__timestamp.is-top{
+      font-size: 16px;
+      color: $--color-text-primary;
+      margin-bottom: 5px;
+    }
+  }
+
+
+
+
+
 }
diff --git a/nezha-fronted/src/components/page/config/about.vue b/nezha-fronted/src/components/page/config/about.vue
index e4423db70..ff8570211 100644
--- a/nezha-fronted/src/components/page/config/about.vue
+++ b/nezha-fronted/src/components/page/config/about.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="about">
-    <div class="app-header">
-      <div class="header-logo"><img width="88" height="88" src="../../../assets/img/logo1-2.png"></div>
+    <div class="app">
+       <div class="app-header">
+      <div class="header-logo"><img width="60" height="60" src="../../../assets/img/logo1-2.png"></div>
       <div class="header-title">
         <div class="app-name">{{version.nezha.name}}</div>
         <div class="app-version"><span class="about-label">{{$t("overall.version")}}&nbsp;&nbsp;&nbsp;</span><span>{{version.nezha.version}}</span></div>
       </div>
     </div>
     <div class="app-component">
-      <div class="component-title">{{$t("overall.components")}}</div>
       <div class="component-content">
         <div class="app-component-row" v-for="(item, index) in version.components" :key="index">
           <div class="component-name">{{item.name}}</div>
@@ -16,6 +16,26 @@
         </div>
       </div>
     </div>
+    </div>
+    <div class="time-line">
+      <div class="time-line-title">{{$t('about.releaseNotes')}}</div>
+      <div class="time-line-body">
+        <el-timeline v-my-loading="loading">
+          <!-- v-if="!noData && timeLineData.length" -->
+          <el-timeline-item
+           v-for="(item) in activities"
+           :key="item.id"
+           :timestamp="item.timestamp ? item.timestamp : ''"
+            placement="top"
+            >
+              <div class="about-summary" v-for="(val) in item.content" :key="val.chinese">
+                <span class="dot"></span>
+                <div class="about-summary-text">{{language === "en" ? val.english :val.chinese}}</div>
+              </div>
+            </el-timeline-item>
+        </el-timeline>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -23,10 +43,167 @@ export default {
   name: 'about',
   data () {
     return {
+      noData: false,
+      timeLineData: [],
+      language: '',
       version: {
         nezha: { name: '', version: '' },
         components: [{ name: '', version: '' }]
-      }
+      },
+      activities: [{
+        timestamp: 'Release 22.08 - Aug 2022',
+        content: [{
+          id: 1,
+          chinese: '[FEATURE] 仪表盘增加快照导出功能'
+        }, {
+          id: 2,
+          chinese: '[FEATURE] 仪表盘支持定义变量，变量可以在chart表达式中使用'
+        }, {
+          id: 3,
+          chinese: '[FEATURE] 仪表盘支持定时生成报告并通过邮件发送给接收人'
+        }, {
+          id: 4,
+          chinese: '[FEATURE] 列表文字支持快捷复制到剪切板'
+        }, {
+          id: 5,
+          chinese: '[ENHANCEMENT] 图表表达式增加是否启用配置项'
+        }, {
+          id: 6,
+          chinese: '[ENHANCEMENT] 增加新增资产、新增业务系统等完成后的使用提示'
+        }]
+      }, {
+        timestamp: 'Release 22.05 - May 2022',
+        content: [{
+          id: 7,
+          chinese: '[FEATURE] Endpoint支持批量修改标签，是否启用采集'
+        }, {
+          id: 8,
+          chinese: '[FEATURE] 仪表盘增加查看模式切换'
+        }, {
+          id: 9,
+          chinese: '[FEATURE] 仪表盘增加用户收藏功能 '
+        }, {
+          id: 10,
+          chinese: '[FEATURE] 分布式Ping，traceroute功能'
+        }, {
+          id: 11,
+          chinese: '[ENHANCEMENT] 丰富告警消息详情页面显示内容'
+        }]
+      }, {
+        timestamp: 'Release 22.02 - Feb 2022',
+        content: [{
+          id: 12,
+          chinese: '[FEATURE] 新增 密码策略 配置，支持密码长度，复杂度，有效性，重试次数等配置项'
+        }, {
+          id: 13,
+          chinese: '[FEATURE] 丰富图表类型，新增hexgon, treemap, topology 等图表'
+        }, {
+          id: 14,
+          chinese: '[FEATURE] 支持自定义日期显示格式'
+        }, {
+          id: 15,
+          chinese: '[FEATURE] 新增license管理功能'
+        }, {
+          id: 16,
+          chinese: '[FEATURE] 新增IP地址管理功能'
+        }, {
+          id: 17,
+          chinese: '[FEATURE] 新增全局搜索功能'
+        }, {
+          id: 18,
+          chinese: '[ENHANCEMENT] 优化表格图表类型配置及显示，支持多个表达式结果关联显示在同一个表格中'
+        }, {
+          id: 19,
+          chinese: '[ENHANCEMENT] 优化折线图，面积图图表类型显示，支持是否启用堆叠'
+        }]
+      }, {
+        timestamp: 'Release 21.11 - Nov 2021',
+        content: [{
+          id: 20,
+          chinese: '[FEATURE] 资产、告警规则、模块等增加详细视图'
+        }, {
+          id: 21,
+          chinese: '[FEATURE] 增加个人中心，支持查看本人操作记录等信息'
+        }, {
+          id: 22,
+          chinese: '[ENHANCEMENT] 重构告警规则实现，统一指标、日志和SNMP trap告警规则定义'
+        }, {
+          id: 23,
+          chinese: '[ENHANCEMENT] 资产支持批量修改标签，密码等'
+        }]
+      }, {
+        timestamp: 'Release 21.09 - Sep 2021',
+        content: [{
+          id: 24,
+          chinese: '[FEATURE] 集中的日志数据观测'
+        }, {
+          id: 25,
+          chinese: '[FEATURE] 资产支持父子数据关联'
+        }, {
+          id: 26,
+          chinese: '[[FEATURE] 双因素认证'
+        }, {
+          id: 27,
+          chinese: '[FEATURE] 支持创建图表模板'
+        }, {
+          id: 28,
+          chinese: '[ENHANCEMENT] 优化折线图表类型显示效果'
+        }, {
+          id: 29,
+          chinese: '[ENHANCEMENT] 优化图表排列方式'
+        }]
+      }, {
+        timestamp: 'Release 21.07 - Jul 2022',
+        content: [{
+          id: 30,
+          chinese: '[FEATURE] 系统初始化配置功能，方便用户首次部署配置'
+        }, {
+          id: 31,
+          chinese: '[FEATURE] 使用向导功能'
+        }, {
+          id: 32,
+          chinese: '[FEATURE] NZ-AGENT组件实现一键部署'
+        }, {
+          id: 33,
+          chinese: '[ENHANCEMENT] UI界面优化'
+        }]
+      }, {
+        timestamp: 'Release 21.04 - Apr 2021',
+        content: [{
+          id: 34,
+          chinese: '[FEATURE] UI界面重构'
+        }, {
+          id: 35,
+          chinese: '[FEATURE] 系统拓扑图功能'
+        }, {
+          id: 36,
+          chinese: '[FEATURE] 堡垒机操作录像及回放功能'
+        }, {
+          id: 37,
+          chinese: '[ENHANCEMENT] 优化堡垒机命令解析方式，使命令解析结果更准确'
+        }]
+      }, {
+        timestamp: 'Release 2.0 - Jul 2020',
+        content: [{
+          id: 38,
+          chinese: '[FEATURE] 系统概览功能'
+        }, {
+          id: 39,
+          chinese: '[FEATURE] 告警规则查看详情'
+        }, {
+          id: 40,
+          chinese: '[FEATURE] 列表数据批量导入导出功能'
+        }, {
+          id: 41,
+          chinese: '[ENHANCEMENT] 列表字段支持排序'
+        }, {
+          id: 42,
+          chinese: '[ENHANCEMENT] 图表实现调整位置和大小'
+        }, {
+          id: 43,
+          chinese: '[ENHANCEMENT] 列表字段支持排序'
+        }]
+      }]
     }
   },
   methods: {
@@ -38,6 +215,7 @@ export default {
   },
   mounted () {
     this.getVersion()
+    this.language = localStorage.getItem('nz-language') || 'en'
   }
 }
 </script>

From b0e0ac6921576d0671c8fff201cbdd24ac3f263c Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Wed, 20 Jul 2022 10:47:57 +0800
Subject: [PATCH 12/18] =?UTF-8?q?NEZ-2045=20fix=20:=20project=20topology?=
 =?UTF-8?q?=20=E4=BE=A7=E6=BB=91=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/common/project/L5/popData/common.scss     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nezha-fronted/src/assets/css/components/common/project/L5/popData/common.scss b/nezha-fronted/src/assets/css/components/common/project/L5/popData/common.scss
index e8251c934..92260b40b 100644
--- a/nezha-fronted/src/assets/css/components/common/project/L5/popData/common.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/L5/popData/common.scss
@@ -4,17 +4,22 @@
   }
   .right-box-project-endpoint,.right-box-project-asset {
     padding-right: 10px;
+    padding-left: 10px;
   }
   .right-box-project-alert {
     width: 850px;
     padding-right: 10px;
+    padding-left: 10px;
   }
 
   .right-box-title {
     font-weight: bold;
     padding-left: 20px;
+    padding-top: 20px;
     position: absolute;
     z-index: 1;
+    display: flex;
+    align-items: center;
   }
 
   .mc {

From 49df64db13d04b89953c1cc4b7a9136d6d51ea4c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 20 Jul 2022 14:21:40 +0800
Subject: [PATCH 13/18] =?UTF-8?q?fix=EF=BC=9Achart=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E6=94=B9=E4=B8=BA=20=E5=8F=AA=E6=9C=89=20?=
 =?UTF-8?q?=20type=20=3D=20group=20=E6=98=BE=E7=A4=BA=20=20show/hidden=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chartList.vue        | 29 ++++++++++++++++++-
 .../common/rightBox/chart/chartConfig.vue     |  2 +-
 .../common/rightBox/chart/chartRightBox.vue   |  6 ++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index 9ea56f579..b1d9b1b4a 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -176,7 +176,8 @@ export default {
       scrollTop: 0,
       scrollTopTimer: null,
       // 变量比较结果 图表是否显示/隐藏
-      showHidden: {}
+      showHidden: {},
+      tempList: []
     }
   },
   methods: {
@@ -440,6 +441,7 @@ export default {
     },
     // 比较变量 图表是否显示/隐藏
     compareVariables () {
+      console.log(123123123123)
       if (!this.panelLock) {
         return false
       }
@@ -507,6 +509,24 @@ export default {
           })
         }
       })
+      // this.copyDataList.forEach((item, index) => {
+      //   if (!this.showHidden[item.id] && item.id !== -2) {
+      //     delete this.copyDataList[index]
+      //   }
+      // })
+      for (let i = 0; i < this.copyDataList.length; i++) {
+        const item = this.copyDataList[i]
+        if ((this.showHidden[item.id] && this.showHidden[item.id] === 'hidden') && item.id !== -2) {
+          this.copyDataList.splice(i, 1)
+          i--
+        }
+      }
+      this.tempList.forEach(item => {
+        if ((!this.showHidden[item.id] || this.showHidden[item.id] === 'show') && item.id !== -2 && !this.copyDataList.find(chart => chart.id === item.id)) {
+          this.copyDataList.push(item)
+        }
+      })
+      this.onScroll(this.scrollTop)
     }
   },
   created () {
@@ -549,6 +569,12 @@ export default {
       handler (flag) {
         if (!flag) {
           this.showHidden = {}
+          this.tempList.forEach(item => {
+            if (!this.copyDataList.find(chart => chart.id === item.id)) {
+              this.copyDataList.push(item)
+            }
+          })
+          this.onScroll(this.scrollTop)
         } else {
           // 比较变量 图表是否显示/隐藏
           this.compareVariables()
@@ -618,6 +644,7 @@ export default {
           })
         }
         this.$nextTick(() => {
+          this.tempList = JSON.parse(JSON.stringify(tempList))
           this.copyDataList = JSON.parse(JSON.stringify(tempList))
           // 比较变量 图表是否显示/隐藏
           this.compareVariables()
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 7697c9cb6..f85919f78 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -726,7 +726,7 @@
       </div>
 
       <!-- 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/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index be7953f70..e07071f3f 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -600,6 +600,12 @@ export default {
       handler (n) {
         if (n === 'group') {
           this.editChart.groupId = ''
+        } else {
+          this.editChart.param.enable.visibility = false
+          this.editChart.param.visibility.varName = ''
+          this.editChart.param.visibility.operator = ''
+          this.editChart.param.visibility.varValue = ''
+          this.editChart.param.visibility.result = ''
         }
       }
     },

From 45b7d25b9923597feac4a2fdd302ef6b118dd835 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Wed, 20 Jul 2022 15:07:54 +0800
Subject: [PATCH 14/18] =?UTF-8?q?fix=20:=20=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/filterSearch/filterSearch.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/filterSearch/filterSearch.vue b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue
index 6a4e9c523..4dee25e5b 100644
--- a/nezha-fronted/src/components/common/filterSearch/filterSearch.vue
+++ b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue
@@ -201,7 +201,7 @@ export default {
         const reg = new RegExp(item.regex)
         if (!reg.test(meta.value)) {
           meta.value = ''
-          this.$message.error(this.$t(item.tip))
+          this.$message.error(this.$t('FILTER_PROJECT_IS_NULL'))
           break
         }
       }

From e4b0475bf4ce4882338fb41bcc47063db26d7d33 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Wed, 20 Jul 2022 15:09:41 +0800
Subject: [PATCH 15/18] =?UTF-8?q?NEZ-2043=20fix=20:=20=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AF=A6=E6=83=85=20=E9=AA=A8=E6=9E=B6?=
 =?UTF-8?q?=E5=B1=8F=20=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/globalSearch/searchItemInfo.scss          |  4 ++++
 .../common/globalSearch/searchItemInfo.vue           | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss
index 69bdd4ef9..d600cde99 100644
--- a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss
+++ b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss
@@ -59,6 +59,10 @@
       width: calc(100% - 120px);
       display: flex;
       align-items: center;
+      div.active-icon.green-bg{
+        width: 8px !important;
+        margin-top: 0 !important;
+      }
       >div{
         width: calc(100% - 30px);
       }
diff --git a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
index f55a2bffc..8afd78ae8 100644
--- a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
+++ b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
@@ -1,18 +1,18 @@
 <template>
   <el-skeleton style="height: 100%;width: 100%" :loading="loading || faLoading" animated>
     <template slot="template">
-      <div class="search-item-box">
+      <div class="search-item-box" style="padding-top:70px;padding-left:75px;padding-right:45px">
         <div class="search-item-title-icon">
           <el-skeleton-item
             variant="image"
-            style="width: 60px; height: 60px;"
+            style="width: 40px; height: 40px;"
           />
         </div>
-        <el-skeleton-item  class="search-item-path" search-item-path variant="h3" style="width: 50%;" />
-        <el-skeleton-item class="search-item-name" search-item-path variant="h3" style="width: 30%" />
+        <el-skeleton-item class="search-item-path" search-item-path variant="h3" style="width: 30%;height: 21px;margin-top: 16px;margin-bottom: 16px" />
+        <el-skeleton-item class="search-item-name" search-item-path variant="h3" style="width: 50%;height: 30px;margin-bottom: 30px" />
         <div v-for="item in skeletonArr" :key="item" class="search-item-info">
-          <el-skeleton-item class="search-item-key"/>
-          <el-skeleton-item class="search-item-value-box" style="margin-left: 20px;height: 13px"/>
+          <el-skeleton-item class="search-item-key" style="height: 21px"/>
+          <el-skeleton-item class="search-item-value-box" style="width: 57%;margin-left: 20px;height: 21px;margin-top: 13px;margin-bottom: 13px"/>
         </div>
       </div>
     </template>

From e5d431d0377ea43943eeef13e51f3113dd4def15 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Wed, 20 Jul 2022 15:10:35 +0800
Subject: [PATCH 16/18] =?UTF-8?q?perf=20:=20about=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/config/about.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/page/config/about.vue b/nezha-fronted/src/components/page/config/about.vue
index ff8570211..3bfb34da6 100644
--- a/nezha-fronted/src/components/page/config/about.vue
+++ b/nezha-fronted/src/components/page/config/about.vue
@@ -20,15 +20,14 @@
     <div class="time-line">
       <div class="time-line-title">{{$t('about.releaseNotes')}}</div>
       <div class="time-line-body">
-        <el-timeline v-my-loading="loading">
-          <!-- v-if="!noData && timeLineData.length" -->
+        <el-timeline>
           <el-timeline-item
            v-for="(item) in activities"
            :key="item.id"
            :timestamp="item.timestamp ? item.timestamp : ''"
             placement="top"
             >
-              <div class="about-summary" v-for="(val) in item.content" :key="val.chinese">
+              <div class="about-summary" v-for="(val) in item.content" :key="val.id">
                 <span class="dot"></span>
                 <div class="about-summary-text">{{language === "en" ? val.english :val.chinese}}</div>
               </div>
@@ -45,7 +44,7 @@ export default {
     return {
       noData: false,
       timeLineData: [],
-      language: '',
+      // language: '',
       version: {
         nezha: { name: '', version: '' },
         components: [{ name: '', version: '' }]
@@ -215,7 +214,9 @@ export default {
   },
   mounted () {
     this.getVersion()
-    this.language = localStorage.getItem('nz-language') || 'en'
+  },
+  computed: {
+    language () { return this.$store.getters.getLanguage }
   }
 }
 </script>

From 759152129cf028a1994f3cbf01cbb4b901f81d3d Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Wed, 20 Jul 2022 15:32:15 +0800
Subject: [PATCH 17/18] =?UTF-8?q?fix=20:=20chartRightBox=20=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/chart/otherChartConfig.vue | 4 ++--
 .../components/common/rightBox/chart/systemChartConfig.vue    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
index a16287e83..aab7518f2 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
@@ -239,8 +239,8 @@
                 size="small"
                 @change="change"
               >
-                <el-option label="Show" value="show"></el-option>
-                <el-option label="Hidden" value="hidden"></el-option>
+                <el-option :label="$t('overall.show')" value="show">{{$t('overall.show')}}</el-option>
+                <el-option :label="$t('overall.hidden')" value="hidden">{{$t('overall.hidden')}}</el-option>
               </el-select>
             </el-form-item>
           </div>
diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index 0f4bba8a3..e3ab955ae 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -769,8 +769,8 @@
                 size="small"
                 @change="change"
               >
-                <el-option label="Show" value="show"></el-option>
-                <el-option label="Hidden" value="hidden"></el-option>
+                <el-option :label="$t('overall.show')" value="show">{{$t('overall.show')}}</el-option>
+                <el-option :label="$t('overall.hidden')" value="hidden">{{$t('overall.hidden')}}</el-option>
               </el-select>
             </el-form-item>
           </div>

From b5fc10ac6455c1e2bb5c7bcebcaac81c312f268e Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Wed, 20 Jul 2022 16:29:03 +0800
Subject: [PATCH 18/18] =?UTF-8?q?NEZ-2041=20feat=20=EF=BC=9B=20about?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E8=8B=B1=E6=96=87=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/config/about.vue      | 130 +++++++++++-------
 1 file changed, 84 insertions(+), 46 deletions(-)

diff --git a/nezha-fronted/src/components/page/config/about.vue b/nezha-fronted/src/components/page/config/about.vue
index 3bfb34da6..1c6602798 100644
--- a/nezha-fronted/src/components/page/config/about.vue
+++ b/nezha-fronted/src/components/page/config/about.vue
@@ -44,7 +44,6 @@ export default {
     return {
       noData: false,
       timeLineData: [],
-      // language: '',
       version: {
         nezha: { name: '', version: '' },
         components: [{ name: '', version: '' }]
@@ -53,154 +52,193 @@ export default {
         timestamp: 'Release 22.08 - Aug 2022',
         content: [{
           id: 1,
-          chinese: '[FEATURE] 仪表盘增加快照导出功能'
+          chinese: '[FEATURE] 仪表盘增加快照导出功能',
+          english: '[FEATURE] Add snapshot export to dashboards'
         }, {
           id: 2,
-          chinese: '[FEATURE] 仪表盘支持定义变量，变量可以在chart表达式中使用'
+          chinese: '[FEATURE] 仪表盘支持定义变量，变量可以在chart表达式中使用',
+          english: '[FEATURE] Dashboards support defining variables, which can be used in chart expressions'
         }, {
           id: 3,
-          chinese: '[FEATURE] 仪表盘支持定时生成报告并通过邮件发送给接收人'
+          chinese: '[FEATURE] 仪表盘支持定时生成报告并通过邮件发送给接收人',
+          english: '[FEATURE] Dashboards support scheduled generation of reports, which will be sent to receivers via email'
         }, {
           id: 4,
-          chinese: '[FEATURE] 列表文字支持快捷复制到剪切板'
+          chinese: '[FEATURE] 列表文字支持快捷复制到剪切板',
+          english: '[FEATURE] Texts on the list can be copied to clipboard using shortcuts'
         }, {
           id: 5,
-          chinese: '[ENHANCEMENT] 图表表达式增加是否启用配置项'
+          chinese: '[ENHANCEMENT] 图表表达式增加是否启用配置项',
+          english: '[ENHANCEMENT] Add whether to enable the configuration item for chart expressions'
         }, {
           id: 6,
-          chinese: '[ENHANCEMENT] 增加新增资产、新增业务系统等完成后的使用提示'
+          chinese: '[ENHANCEMENT] 增加新增资产、新增业务系统等完成后的使用提示',
+          english: '[ENHANCEMENT] Add a prompt that appears after an asset or a project is created'
         }]
       }, {
         timestamp: 'Release 22.05 - May 2022',
         content: [{
           id: 7,
-          chinese: '[FEATURE] Endpoint支持批量修改标签，是否启用采集'
+          chinese: '[FEATURE] Endpoint支持批量修改标签，是否启用采集',
+          english: '[FEATURE] Endpoints support batch modification of label and whether to enable data gathering'
         }, {
           id: 8,
-          chinese: '[FEATURE] 仪表盘增加查看模式切换'
+          chinese: '[FEATURE] 仪表盘增加查看模式切换',
+          english: '[FEATURE] Add view mode switch to dashboards'
         }, {
           id: 9,
-          chinese: '[FEATURE] 仪表盘增加用户收藏功能 '
+          chinese: '[FEATURE] 仪表盘增加用户收藏功能 ',
+          english: '[FEATURE] Add user favorites to dashboards'
         }, {
           id: 10,
-          chinese: '[FEATURE] 分布式Ping，traceroute功能'
+          chinese: '[FEATURE] 分布式Ping，traceroute功能',
+          english: '[FEATURE] Support distributed Ping and Traceroute'
         }, {
           id: 11,
-          chinese: '[ENHANCEMENT] 丰富告警消息详情页面显示内容'
+          chinese: '[ENHANCEMENT] 丰富告警消息详情页面显示内容',
+          english: '[ENHANCEMENT] Enrich the content displayed in the alert details page'
         }]
       }, {
         timestamp: 'Release 22.02 - Feb 2022',
         content: [{
           id: 12,
-          chinese: '[FEATURE] 新增 密码策略 配置，支持密码长度，复杂度，有效性，重试次数等配置项'
+          chinese: '[FEATURE] 新增 密码策略 配置，支持密码长度，复杂度，有效性，重试次数等配置项',
+          english: '[FEATURE] Add Password Policy configuration and support the configuration items including password length, complexity, effectiveness and retry times'
         }, {
           id: 13,
-          chinese: '[FEATURE] 丰富图表类型，新增hexgon, treemap, topology 等图表'
+          chinese: '[FEATURE] 丰富图表类型，新增hexgon, treemap, topology 等图表',
+          english: '[FEATURE] Increase chart types, such as hexgon, treemap, and topology'
         }, {
           id: 14,
-          chinese: '[FEATURE] 支持自定义日期显示格式'
+          chinese: '[FEATURE] 支持自定义日期显示格式',
+          english: '[FEATURE] Support custom date display format'
         }, {
           id: 15,
-          chinese: '[FEATURE] 新增license管理功能'
+          chinese: '[FEATURE] 新增license管理功能',
+          english: '[FEATURE] Add license management'
         }, {
           id: 16,
-          chinese: '[FEATURE] 新增IP地址管理功能'
+          chinese: '[FEATURE] 新增IP地址管理功能',
+          english: '[FEATURE] Add IP address management'
         }, {
           id: 17,
-          chinese: '[FEATURE] 新增全局搜索功能'
+          chinese: '[FEATURE] 新增全局搜索功能',
+          english: '[FEATURE] Add global search'
         }, {
           id: 18,
-          chinese: '[ENHANCEMENT] 优化表格图表类型配置及显示，支持多个表达式结果关联显示在同一个表格中'
+          chinese: '[ENHANCEMENT] 优化表格图表类型配置及显示，支持多个表达式结果关联显示在同一个表格中',
+          english: '[ENHANCEMENT] Improve the configuration and display for tables and support multiple expression results being associated and displayed in a same table'
         }, {
           id: 19,
-          chinese: '[ENHANCEMENT] 优化折线图，面积图图表类型显示，支持是否启用堆叠'
+          chinese: '[ENHANCEMENT] 优化折线图，面积图图表类型显示，支持是否启用堆叠',
+          english: '[ENHANCEMENT] Optimize the display of line charts and area charts, and support whether to enable stacking'
         }]
       }, {
         timestamp: 'Release 21.11 - Nov 2021',
         content: [{
           id: 20,
-          chinese: '[FEATURE] 资产、告警规则、模块等增加详细视图'
+          chinese: '[FEATURE] 资产、告警规则、模块等增加详细视图',
+          english: '[FEATURE] Add detailed views to assets, alert rules and modules'
         }, {
           id: 21,
-          chinese: '[FEATURE] 增加个人中心，支持查看本人操作记录等信息'
+          chinese: '[FEATURE] 增加个人中心，支持查看本人操作记录等信息',
+          english: '[FEATURE] Add personal center and allow for viewing one’s own operational record, etc.'
         }, {
           id: 22,
-          chinese: '[ENHANCEMENT] 重构告警规则实现，统一指标、日志和SNMP trap告警规则定义'
+          chinese: '[ENHANCEMENT] 重构告警规则实现，统一指标、日志和SNMP trap告警规则定义',
+          english: '[ENHANCEMENT] Reconstruct alert rule implementation and unify the alert rule definition of metrics, logs and SNMP trap'
         }, {
           id: 23,
-          chinese: '[ENHANCEMENT] 资产支持批量修改标签，密码等'
+          chinese: '[ENHANCEMENT] 资产支持批量修改标签，密码等',
+          english: '[ENHANCEMENT] Assets support batch modification of tags and passwords'
         }]
       }, {
         timestamp: 'Release 21.09 - Sep 2021',
         content: [{
           id: 24,
-          chinese: '[FEATURE] 集中的日志数据观测'
+          chinese: '[FEATURE] 集中的日志数据观测',
+          english: '[FEATURE] Centralized observation of log data'
         }, {
           id: 25,
-          chinese: '[FEATURE] 资产支持父子数据关联'
+          chinese: '[FEATURE] 资产支持父子数据关联',
+          english: '[FEATURE] Assets support parent-child data association'
         }, {
           id: 26,
-          chinese: '[[FEATURE] 双因素认证'
+          chinese: '[[FEATURE] 双因素认证',
+          english: '[FEATURE] Two-factor Authentication'
         }, {
           id: 27,
-          chinese: '[FEATURE] 支持创建图表模板'
+          chinese: '[FEATURE] 支持创建图表模板',
+          english: '[FEATURE] Support creating chart templates'
         }, {
           id: 28,
-          chinese: '[ENHANCEMENT] 优化折线图表类型显示效果'
+          chinese: '[ENHANCEMENT] 优化折线图表类型显示效果',
+          english: '[ENHANCEMENT] Improve the display of line charts'
         }, {
           id: 29,
-          chinese: '[ENHANCEMENT] 优化图表排列方式'
+          chinese: '[ENHANCEMENT] 优化图表排列方式',
+          english: '[ENHANCEMENT] Optimize chart layout'
         }]
       }, {
         timestamp: 'Release 21.07 - Jul 2022',
         content: [{
           id: 30,
-          chinese: '[FEATURE] 系统初始化配置功能，方便用户首次部署配置'
+          chinese: '[FEATURE] 系统初始化配置功能，方便用户首次部署配置',
+          english: '[FEATURE] Initialize system configuration to make users’ first deployment configuration easier'
         }, {
           id: 31,
-          chinese: '[FEATURE] 使用向导功能'
+          chinese: '[FEATURE] 使用向导功能',
+          english: '[FEATURE] Add usage wizard'
         }, {
           id: 32,
-          chinese: '[FEATURE] NZ-AGENT组件实现一键部署'
+          chinese: '[FEATURE] NZ-AGENT组件实现一键部署',
+          english: '[FEATURE] Allow for one-touch deployment of NZ-AGENT'
         }, {
           id: 33,
-          chinese: '[ENHANCEMENT] UI界面优化'
+          chinese: '[ENHANCEMENT] UI界面优化',
+          english: '[ENHANCEMENT] Enhance UI'
         }]
       }, {
         timestamp: 'Release 21.04 - Apr 2021',
         content: [{
           id: 34,
-          chinese: '[FEATURE] UI界面重构'
+          chinese: '[FEATURE] UI界面重构',
+          english: '[FEATURE] Reconstruct UI'
         }, {
           id: 35,
-          chinese: '[FEATURE] 系统拓扑图功能'
+          chinese: '[FEATURE] 系统拓扑图功能',
+          english: '[FEATURE] Add the system topology map'
         }, {
           id: 36,
-          chinese: '[FEATURE] 堡垒机操作录像及回放功能'
+          chinese: '[FEATURE] 堡垒机操作录像及回放功能',
+          english: '[FEATURE] Support the recording and playback of bastion host’s operations'
         }, {
           id: 37,
-          chinese: '[ENHANCEMENT] 优化堡垒机命令解析方式，使命令解析结果更准确'
+          chinese: '[ENHANCEMENT] 优化堡垒机命令解析方式，使命令解析结果更准确',
+          english: '[ENHANCEMENT] Optimize the parsing method of bastion host’s commands for the parsed results to be more accurate'
         }]
       }, {
         timestamp: 'Release 2.0 - Jul 2020',
         content: [{
           id: 38,
-          chinese: '[FEATURE] 系统概览功能'
+          chinese: '[FEATURE] 系统概览功能',
+          english: '[FEATURE] Add system overview'
         }, {
           id: 39,
-          chinese: '[FEATURE] 告警规则查看详情'
+          chinese: '[FEATURE] 告警规则查看详情',
+          english: '[FEATURE] Add a detail view to alert rules'
         }, {
           id: 40,
-          chinese: '[FEATURE] 列表数据批量导入导出功能'
+          chinese: '[FEATURE] 列表数据批量导入导出功能',
+          english: '[FEATURE] The lists can be imported and exported in batch'
         }, {
           id: 41,
-          chinese: '[ENHANCEMENT] 列表字段支持排序'
+          chinese: '[ENHANCEMENT] 列表字段支持排序',
+          english: '[ENHANCEMENT] Support field ranking list'
         }, {
           id: 42,
-          chinese: '[ENHANCEMENT] 图表实现调整位置和大小'
-        }, {
-          id: 43,
-          chinese: '[ENHANCEMENT] 列表字段支持排序'
+          chinese: '[ENHANCEMENT] 图表实现调整位置和大小',
+          english: '[ENHANCEMENT] The position and size of charts can be adjusted'
         }]
       }]
     }