From 3f62634ccd31fcab4a1a4d64a389363d90b42805 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 24 Sep 2021 14:10:50 +0800
Subject: [PATCH 1/6] =?UTF-8?q?NEZ-1027=20feat:=20alert=20rule=20&=20datac?=
 =?UTF-8?q?enter=20=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=20user=20=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E5=88=97=E8=A1=A8=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    | 7 +++++++
 .../src/components/common/rightBox/alertRuleBox.vue        | 1 +
 nezha-fronted/src/components/common/rightBox/dcBox.vue     | 1 +
 .../src/components/common/table/alert/alertRuleTable.vue   | 2 +-
 .../src/components/common/table/settings/dcTable.vue       | 4 +++-
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
index 60e5ada22..c934749df 100644
--- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
+++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
@@ -311,3 +311,10 @@
 .el-form-item__content .el-autocomplete .el-input-group {
   vertical-align: unset;
 }
+.user-name {
+  font-weight: bold;
+  margin-right: 5px;
+}
+.user-username{
+  color: #999;
+}
diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
index ef6b726c7..fc4e08dba 100644
--- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
@@ -316,6 +316,7 @@
                 :key="item.id"
                 :label="item.username"
                 :value="item.id">
+                <span class="user-name">{{item.name}}</span><span class="user-username">@{{item.username}}</span>
               </el-option>
             </el-select>
           </el-form-item>
diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue
index 3a7ab887e..b0b36b705 100644
--- a/nezha-fronted/src/components/common/rightBox/dcBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue
@@ -23,6 +23,7 @@
             <el-form-item :label='$t("asset.principal")' prop="principal">
               <el-select value-key="id" class="right-box__select" popper-class="right-box-select-dropdown prevent-clickoutside" v-model="editDc.principal" placeholder="" size="small" id="dc-box-input-principal">
                 <el-option v-for="item in userData" :key="item.id" :label="item.name" :value="item.id">
+                  <span class="user-name">{{item.name}}</span><span class="user-username">@{{item.username}}</span>
                 </el-option>
               </el-select>
             </el-form-item>
diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
index 164166fe4..4e074204d 100644
--- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
@@ -58,7 +58,7 @@
           <span v-else>-</span>
         </template>
         <template v-else-if="item.prop === 'receivers'">
-          <el-tag v-for="(user, index) in scope.row[item.prop]" v-if="user&&user.username" :key="index" class="alert-rule-tag" effect="dark" size="mini">{{user.username}}&nbsp;</el-tag>
+          <el-tag v-for="(user, index) in scope.row[item.prop]" v-if="user&&user.username" :key="index" class="alert-rule-tag" effect="dark" size="mini">{{user.name}}&nbsp;&nbsp;@{{user.username}}&nbsp;</el-tag>
         </template>
         <template v-else-if="item.prop === 'state'">
           <el-popover
diff --git a/nezha-fronted/src/components/common/table/settings/dcTable.vue b/nezha-fronted/src/components/common/table/settings/dcTable.vue
index 010c7bb97..335319906 100644
--- a/nezha-fronted/src/components/common/table/settings/dcTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/dcTable.vue
@@ -35,7 +35,9 @@
       </template>
       <template slot-scope="scope" :column="item">
         <template v-if="item.prop === 'principal'">
-          <template v-if="scope.row.adminUser">{{ scope.row.adminUser.username }}</template>
+          <template v-if="scope.row.adminUser">
+            <span class="user-name">{{scope.row.adminUser.name}}</span><span class="user-username">@{{scope.row.adminUser.username}}</span>
+          </template>
           <template v-else>-</template>
         </template>
         <template v-else-if="item.prop === 'state'">

From 7d9752643bee07139f97b6d7c870d117d6517172 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 24 Sep 2021 14:11:10 +0800
Subject: [PATCH 2/6] =?UTF-8?q?NEZ-1026=20fix=EF=BC=9Aterminal=20log=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=20Username=20=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=20User?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/language/en.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index df9ae0e78..d67869d49 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -861,7 +861,7 @@ const en = {
     terminallog: {
       terminallog: 'Terminal log',
       status: 'State', // "状态"
-      username: 'Username',
+      username: 'User',
       SessionID: 'Session ID',
       authtype: 'AuthType',
       statusItem: {

From a52d3d7004fe33f31e8bd616cc7e4b1b2b31a2ba Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 24 Sep 2021 14:11:30 +0800
Subject: [PATCH 3/6] =?UTF-8?q?NEZ-1025=20fx:=20panel=20name=E8=B6=85?=
 =?UTF-8?q?=E9=95=BF=20=E9=99=90=E5=88=B6=20=E6=9C=80=E5=A4=A7=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/dashboard/panel.vue          | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index f6df13aec..2477ac298 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -23,7 +23,7 @@
                 </template>
                 <template v-slot:trigger>
                   <i style="color: #BEBEBE" class="el-icon-menu"></i>
-                  <span style="display: inline-block;padding: 0 7px;font-weight: bold">{{showPanel.name}}</span>
+                  <span :title="showPanel.name" class="show-panel-name">{{showPanel.name}}</span>
                   <i style="font-size: 12px;color: #BEBEBE;" class="nz-icon nz-icon-arrow-down"></i>
                 </template>
                 <template v-slot:tail>
@@ -953,4 +953,14 @@ export default {
     background: center center no-repeat #fff;
     z-index: 10;
   }
+  .show-panel-name{
+    display: inline-block;
+    padding: 0 7px;
+    font-weight: bold;
+    max-width: 310px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    vertical-align: bottom;
+  }
 </style>

From 2a3d307902d7333a7209004ce41d2f06905083be Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 24 Sep 2021 14:29:19 +0800
Subject: [PATCH 4/6] =?UTF-8?q?style:=20alert=20rule=20&=20datacenter=20us?=
 =?UTF-8?q?er.name=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/css/common/rightBoxCommon.scss |  7 -------
 nezha-fronted/src/assets/stylus/main.scss     | 19 +++++++++++++++++++
 .../common/rightBox/alertRuleBox.vue          |  5 +++--
 .../src/components/common/rightBox/dcBox.vue  |  4 ++--
 .../common/table/alert/alertRuleTable.vue     |  2 +-
 .../common/table/settings/dcTable.vue         |  2 +-
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
index c934749df..60e5ada22 100644
--- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
+++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
@@ -311,10 +311,3 @@
 .el-form-item__content .el-autocomplete .el-input-group {
   vertical-align: unset;
 }
-.user-name {
-  font-weight: bold;
-  margin-right: 5px;
-}
-.user-username{
-  color: #999;
-}
diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index 5e656572b..4ef95a6c0 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -884,6 +884,7 @@ li{
 }
 .alert-rule-tag {
   cursor: default;
+  max-width: 100px;
 }
 /* end--内容*/
 
@@ -2179,3 +2180,21 @@ li{
 .nz-dialog.silence-box .el-dialog__body{
   padding-bottom: 0;
 }
+.user-name {
+  font-weight: bold;
+  margin-right: 5px;
+  max-width: 50%;
+  text-overflow:ellipsis;
+  white-space:nowrap;
+  vertical-align: bottom;
+}
+.user-username{
+  color: #999;
+  max-width: calc(50% - 10px);
+  text-overflow:ellipsis;
+  white-space:nowrap;
+  vertical-align: bottom;
+}
+.hover .user-username{
+  color: #fa901c;
+}
diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
index fc4e08dba..447cd9ddc 100644
--- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
@@ -312,11 +312,12 @@
               @change="receiverShowChange"
             >
               <el-option
+                style="width: 620px"
                 v-for="item in userData"
                 :key="item.id"
-                :label="item.username"
+                :label="item.name"
                 :value="item.id">
-                <span class="user-name">{{item.name}}</span><span class="user-username">@{{item.username}}</span>
+                <span class="user-name" :title="item.name">{{item.name}}</span><span class="user-username" :title="item.username">@{{item.username}}</span>
               </el-option>
             </el-select>
           </el-form-item>
diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue
index b0b36b705..998e79ca6 100644
--- a/nezha-fronted/src/components/common/rightBox/dcBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue
@@ -22,8 +22,8 @@
             </el-form-item>
             <el-form-item :label='$t("asset.principal")' prop="principal">
               <el-select value-key="id" class="right-box__select" popper-class="right-box-select-dropdown prevent-clickoutside" v-model="editDc.principal" placeholder="" size="small" id="dc-box-input-principal">
-                <el-option v-for="item in userData" :key="item.id" :label="item.name" :value="item.id">
-                  <span class="user-name">{{item.name}}</span><span class="user-username">@{{item.username}}</span>
+                <el-option v-for="item in userData" :key="item.id" :label="item.name" :value="item.id" style="width: 620px">
+                  <span class="user-name" :title="item.name">{{item.name}}</span><span class="user-username" :title="item.username">@{{item.username}}</span>
                 </el-option>
               </el-select>
             </el-form-item>
diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
index 4e074204d..37b1fab0b 100644
--- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue
@@ -58,7 +58,7 @@
           <span v-else>-</span>
         </template>
         <template v-else-if="item.prop === 'receivers'">
-          <el-tag v-for="(user, index) in scope.row[item.prop]" v-if="user&&user.username" :key="index" class="alert-rule-tag" effect="dark" size="mini">{{user.name}}&nbsp;&nbsp;@{{user.username}}&nbsp;</el-tag>
+          <el-tag v-for="(user, index) in scope.row[item.prop]" v-if="user&&user.username" :key="index" class="alert-rule-tag" effect="dark" size="mini" :title="user.name">{{user.name}}&nbsp;&nbsp;</el-tag>
         </template>
         <template v-else-if="item.prop === 'state'">
           <el-popover
diff --git a/nezha-fronted/src/components/common/table/settings/dcTable.vue b/nezha-fronted/src/components/common/table/settings/dcTable.vue
index 335319906..fc083a46f 100644
--- a/nezha-fronted/src/components/common/table/settings/dcTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/dcTable.vue
@@ -36,7 +36,7 @@
       <template slot-scope="scope" :column="item">
         <template v-if="item.prop === 'principal'">
           <template v-if="scope.row.adminUser">
-            <span class="user-name">{{scope.row.adminUser.name}}</span><span class="user-username">@{{scope.row.adminUser.username}}</span>
+            {{scope.row.adminUser.name}}
           </template>
           <template v-else>-</template>
         </template>

From 1d28bf503b19ce8a6a96f21c63e4bd9fb7755376 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 24 Sep 2021 14:49:48 +0800
Subject: [PATCH 5/6] =?UTF-8?q?style=EF=BC=9A=20topology=20=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/project/L5/CanvasProps.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
index b3d930405..5360f086c 100644
--- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
+++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
@@ -2499,4 +2499,7 @@ export default {
 /deep/ .el-collapse-item__arrow.el-icon-arrow-right{
   display: inline-block !important;
 }
+/deep/ .el-select--mini {
+  width: 100%;
+}
 </style>

From cae494a9eca734a09e3f8155370cb913148b8f2a Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 24 Sep 2021 15:07:23 +0800
Subject: [PATCH 6/6] =?UTF-8?q?NEZ-1025=20fix:panel=20name=E8=B6=85?=
 =?UTF-8?q?=E9=95=BF=20=E9=99=90=E5=88=B6=20=E6=9C=80=E5=A4=A7=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=20(=E8=A1=A5=E5=85=85=E6=98=BE=E7=A4=BA=20chartNum=20?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=20=E4=B8=8B=E6=8B=89=E6=A1=86=E5=86=85?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=20title)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/popBox/selectPanel.vue | 2 +-
 nezha-fronted/src/components/page/dashboard/panel.vue      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/popBox/selectPanel.vue b/nezha-fronted/src/components/common/popBox/selectPanel.vue
index a0aae7fae..9ec8be52a 100644
--- a/nezha-fronted/src/components/common/popBox/selectPanel.vue
+++ b/nezha-fronted/src/components/common/popBox/selectPanel.vue
@@ -21,7 +21,7 @@
             node-key="id"
             ref="panelTree">
             <div class="tree--node" slot-scope="{ node, data }">
-              <span>{{ node.label }}</span>
+              <span :title="node.label + ' (' + data.chartNum +'charts ）' ">{{ node.label }}</span>
 <!--              <span class="tree&#45;&#45;operation" v-if="!panelLock">-->
 <!--                <span @click.stop="deletePanel(data)" class="panel-dropdown-btn panel-dropdown-btn-delete" v-has="'panel_delete'"><i class="nz-icon nz-icon-delete"></i></span>-->
 <!--                <span class="panel-dropdown-btn" @click.stop="editPanel(data)"><i v-has="'panel_edit'" class="nz-icon nz-icon-edit"></i></span>-->
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 2477ac298..b28f8b5ab 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -23,7 +23,7 @@
                 </template>
                 <template v-slot:trigger>
                   <i style="color: #BEBEBE" class="el-icon-menu"></i>
-                  <span :title="showPanel.name" class="show-panel-name">{{showPanel.name}}</span>
+                  <span :title="showPanel.name  + ' (' + showPanel.chartNum +'charts ）' " class="show-panel-name">{{showPanel.name}}</span>
                   <i style="font-size: 12px;color: #BEBEBE;" class="nz-icon nz-icon-arrow-down"></i>
                 </template>
                 <template v-slot:tail>
@@ -517,7 +517,7 @@ export default {
           this.panelData = response.data.list
           for (let i = 0; i < this.panelData.length; i++) {
             if (this.panelData[i].id == this.showPanel.id) {
-              this.showPanel.name = this.panelData[i].name
+              this.showPanel = this.panelData[i]
               break
             }
           }