From 5f3169a889c45655d644c67c408389202ad9390d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 24 Jun 2022 18:29:27 +0800
Subject: [PATCH 1/4] =?UTF-8?q?NEZ-1952=20fix=EF=BC=9A=E5=9C=A8Group?=
 =?UTF-8?q?=E5=86=85=E6=B7=BB=E5=8A=A0=E5=9B=BE=E8=A1=A8=E5=90=8E=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=8B=96=E4=BD=8F=EF=BC=8C=E5=9B=BE=E8=A1=A8=E8=83=BD?=
 =?UTF-8?q?=E8=B6=85=E5=87=BA=E4=BB=A5=E5=88=9B=E5=BB=BA=E7=9A=84Group?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart/grid/utils.js | 7 +++++--
 nezha-fronted/src/components/chart/chartList.vue       | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/grid/utils.js b/nezha-fronted/src/components/chart/chart/grid/utils.js
index 2fa6c35df..732292e8e 100644
--- a/nezha-fronted/src/components/chart/chart/grid/utils.js
+++ b/nezha-fronted/src/components/chart/chart/grid/utils.js
@@ -291,8 +291,11 @@ export function moveElementAwayFromCollision (layout, collidesWith, itemToMove,
 
   // Previously this was optimized to move below the collision directly, but this can cause problems
   // with cascading moves, as an item may actually leapflog a collision and cause a reversal in order.
-
-  return moveElement(layout, itemToMove, undefined, itemToMove.y + 0.15, preventCollision)
+  let addY = 0.15
+  if (itemToMove.groupId) {
+    addY = 1
+  }
+  return moveElement(layout, itemToMove, undefined, itemToMove.y + addY, preventCollision)
 }
 
 /**
diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index 16735171d..7bb7097dd 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -479,6 +479,9 @@ export default {
             // } catch (e) {
             //   console.info(e)
             // }
+            if (item.y < 0) {
+              item.y = 0
+            }
             height = (item.type === 'group' && item.param.collapse) ? this.headerH : item.height
             // param.showHeader = true
             if (param.valueMapping) {

From fb44c6b61a71830572f03b4e2a84f01394dececc Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 27 Jun 2022 09:46:52 +0800
Subject: [PATCH 2/4] =?UTF-8?q?NEZ-1980=20perf=20:=20api=20keys=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/config/system/apiKeyTable.vue        | 29 ++++++++++++-------
 .../page/config/system/selfApiKeyTable.vue    |  7 +++--
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/nezha-fronted/src/components/page/config/system/apiKeyTable.vue b/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
index 24bb7cc6c..8ba749f07 100644
--- a/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
+++ b/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
@@ -39,7 +39,7 @@
                 <el-input slot="reference" maxlength="64" show-word-limit v-model="scope.row[item.prop]" size="small" ></el-input>
               </el-popover>
             </template>
-            <template v-if="item.prop == 'role'">
+            <!-- <template v-if="item.prop == 'role'">
               <el-popover :content="rules.roleId.message" placement="top" trigger="manual" v-model="rules.roleId.switch" popper-class="small-pop warn-pop" @after-enter="popShow(rules.roleId)">
                 <el-select v-model="scope.row[item.prop]" size="small" :placeholder="$t('el.select.placeholder')" value-key="id" slot="reference" popper-class="api-select right-box-select-top right-public-box-dropdown-top role-system-table">
                   <template v-for="role in roles" >
@@ -47,7 +47,7 @@
                   </template>
                 </el-select>
               </el-popover>
-            </template>
+            </template> -->
             <template v-if="item.prop == 'expireAt'">
 <!--              <el-popover :content="rules.expireAt.message" placement="top" trigger="manual" v-model="rules.expireAt.switch" popper-class="small-pop warn-pop" @after-enter="popShow(rules.expireAt)">-->
                 <my-date-picker
@@ -68,15 +68,21 @@
             <template v-if="item.prop == 'createUser'">
               {{scope.row[item.prop]?scope.row[item.prop].name:'-'}}
             </template>
-            <template v-else-if="item.prop == 'role'">
+            <!-- <template v-else-if="item.prop == 'role'">
               {{scope.row[item.prop]?scope.row[item.prop].name:'-'}}
-            </template>
+            </template> -->
             <template v-else-if="item.prop == 'expireAt'">
               {{scope.row[item.prop]?utcTimeToTimezoneStr(scope.row[item.prop]):$t('config.system.apiKey.noExpire')}}
             </template>
             <template v-else-if="item.prop == 'createAt'">
               {{scope.row[item.prop]?utcTimeToTimezoneStr(scope.row[item.prop]):$t('config.system.apiKey.noExpire')}}
             </template>
+            <template v-else-if="item.prop == 'token'">
+              <div style="cursor:text" class="document-copy-block">
+              <span class="document-copy-text"> {{scope.row[item.prop].replace(/(?<=.{8})./g, '*')}}</span>
+              <i  class="nz-icon nz-icon-override" style="cursor: pointer;visibility: hidden" @click="onCopy(scope.row[item.prop])"></i>
+              </div>
+            </template>
             <template v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</template>
             <template v-else>-</template>
           </template>
@@ -133,12 +139,14 @@ export default {
         }, {
           label: this.$t('apiKey.key'),
           prop: 'token',
-          show: true
-        }, {
-          label: this.$t('profile.role'),
-          prop: 'role',
-          show: true
-        }, {
+          show: false
+        },
+        //  {
+        //   label: this.$t('profile.role'),
+        //   prop: 'role',
+        //   show: true
+        // },
+        {
           label: this.$t('config.system.apiKey.expireAt'),
           prop: 'expireAt',
           show: true
@@ -203,7 +211,6 @@ export default {
     }
   },
   mounted () {
-
   }
 }
 </script>
diff --git a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
index 324cab568..66bce389b 100644
--- a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
+++ b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
@@ -40,7 +40,10 @@
                {{scope.row[item.prop]?scope.row[item.prop]:'-'}}
             </template>
              <template v-if="item.prop == 'token'">
-               {{scope.row[item.prop]?scope.row[item.prop]:'-'}}
+              <div style="cursor:text" class="document-copy-block">
+              <span class="document-copy-text">  {{scope.row[item.prop]?scope.row[item.prop].replace(/(?<=.{8})./g, '*'):'-'}}</span>
+              <i  class="nz-icon nz-icon-override" style="cursor: pointer;visibility: hidden" @click="onCopy(scope.row[item.prop])"></i>
+              </div>
             </template>
              <template v-if="item.prop == 'expireAt'">
               {{scope.row[item.prop]?utcTimeToTimezoneStr(scope.row[item.prop]):'-'}}
@@ -106,7 +109,7 @@ export default {
           label: this.$t('asset.talon.token'),
           prop: 'token',
           minWidth: 180,
-          show: true
+          show: false
         }, {
           label: this.$t('config.system.apiKey.expireAt'),
           prop: 'expireAt',

From 63d99f0f2a7e814dbdadd273650904e3f10d7f0e Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 27 Jun 2022 09:58:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=E5=9C=A8Group=E5=86=85?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E8=A1=A8=E5=90=8E=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=8B=96=E4=BD=8F=EF=BC=8C=E5=9B=BE=E8=A1=A8=E8=83=BD=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E4=BB=A5=E5=88=9B=E5=BB=BA=E7=9A=84Group?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart/grid/utils.js | 7 +++++--
 nezha-fronted/src/components/chart/chartList.vue       | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/grid/utils.js b/nezha-fronted/src/components/chart/chart/grid/utils.js
index 2fa6c35df..732292e8e 100644
--- a/nezha-fronted/src/components/chart/chart/grid/utils.js
+++ b/nezha-fronted/src/components/chart/chart/grid/utils.js
@@ -291,8 +291,11 @@ export function moveElementAwayFromCollision (layout, collidesWith, itemToMove,
 
   // Previously this was optimized to move below the collision directly, but this can cause problems
   // with cascading moves, as an item may actually leapflog a collision and cause a reversal in order.
-
-  return moveElement(layout, itemToMove, undefined, itemToMove.y + 0.15, preventCollision)
+  let addY = 0.15
+  if (itemToMove.groupId) {
+    addY = 1
+  }
+  return moveElement(layout, itemToMove, undefined, itemToMove.y + addY, preventCollision)
 }
 
 /**
diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index 16735171d..7bb7097dd 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -479,6 +479,9 @@ export default {
             // } catch (e) {
             //   console.info(e)
             // }
+            if (item.y < 0) {
+              item.y = 0
+            }
             height = (item.type === 'group' && item.param.collapse) ? this.headerH : item.height
             // param.showHeader = true
             if (param.valueMapping) {

From 39fe482397c60af2db7585ab90029f8f89d2c187 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 27 Jun 2022 10:10:49 +0800
Subject: [PATCH 4/4] =?UTF-8?q?NEZ-1980=20perf=20:=20api=20keys=20?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/config/system/apiKeyTable.vue        | 5 +++--
 .../src/components/page/config/system/selfApiKeyTable.vue    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/page/config/system/apiKeyTable.vue b/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
index 8ba749f07..171338a4b 100644
--- a/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
+++ b/nezha-fronted/src/components/page/config/system/apiKeyTable.vue
@@ -79,7 +79,7 @@
             </template>
             <template v-else-if="item.prop == 'token'">
               <div style="cursor:text" class="document-copy-block">
-              <span class="document-copy-text"> {{scope.row[item.prop].replace(/(?<=.{8})./g, '*')}}</span>
+              <span class="document-copy-text"> {{scope.row[item.prop].replace(reg, '*')}}</span>
               <i  class="nz-icon nz-icon-override" style="cursor: pointer;visibility: hidden" @click="onCopy(scope.row[item.prop])"></i>
               </div>
             </template>
@@ -172,7 +172,8 @@ export default {
         disabledDate (time) {
           return time.getTime() < Date.now() - 24 * 60 * 60 * 1000
         }
-      }
+      },
+      reg: new RegExp("(?<=.{8}).", 'g')
     }
   },
   methods: {
diff --git a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
index 66bce389b..c41b1c2cc 100644
--- a/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
+++ b/nezha-fronted/src/components/page/config/system/selfApiKeyTable.vue
@@ -41,7 +41,7 @@
             </template>
              <template v-if="item.prop == 'token'">
               <div style="cursor:text" class="document-copy-block">
-              <span class="document-copy-text">  {{scope.row[item.prop]?scope.row[item.prop].replace(/(?<=.{8})./g, '*'):'-'}}</span>
+              <span class="document-copy-text">  {{scope.row[item.prop]?scope.row[item.prop].replace(reg, '*'):'-'}}</span>
               <i  class="nz-icon nz-icon-override" style="cursor: pointer;visibility: hidden" @click="onCopy(scope.row[item.prop])"></i>
               </div>
             </template>
@@ -126,7 +126,8 @@ export default {
           minWidth: 100,
           show: true
         }
-      ]
+      ],
+      reg: new RegExp("(?<=.{8}).", 'g')
     }
   },
   methods: {