From e9353eae3e693a8abac4f99ba711ec937c3ae5ca Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Wed, 24 Feb 2021 17:38:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E4=B8=8A=E4=B8=A4=E5=A4=84?=
 =?UTF-8?q?=E6=BC=8F=E6=8E=89=E7=9A=84=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/popBox/selectPanel.vue          | 8 +++++---
 .../src/components/common/project/topologyL5.vue          | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/popBox/selectPanel.vue b/nezha-fronted/src/components/common/popBox/selectPanel.vue
index a449186ba..59490676c 100644
--- a/nezha-fronted/src/components/common/popBox/selectPanel.vue
+++ b/nezha-fronted/src/components/common/popBox/selectPanel.vue
@@ -23,8 +23,8 @@
             <div class="tree--node" slot-scope="{ node, data }">
               <span>{{ node.label }}</span>
               <span class="tree--operation" v-if="!panelLock">
-                <span @click.stop="deletePanel(data)" class="panel-dropdown-btn panel-dropdown-btn-delete" ><i class="nz-icon nz-icon-delete"></i></span>
-                <span @click.stop="editPanel(data)" class="panel-dropdown-btn"><i class="nz-icon nz-icon-edit"></i></span>
+                <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 @click.stop="editPanel(data)" class="panel-dropdown-btn"><i class="nz-icon nz-icon-edit" v-has="'panel:update'"></i></span>
               </span>
             </div>
           </el-tree>
@@ -61,7 +61,9 @@
         showPanel: {
           immediate: true,
           handler(n) {
-            this.panel = JSON.parse(JSON.stringify(n));
+            if (n) {
+              this.panel = JSON.parse(JSON.stringify(n));
+            }
           }
         },
         /*panel: {
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 5cc39ede1..4f406cfa2 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -184,7 +184,7 @@
 
 
         <button @click="editTopology" class="nz-btn nz-btn-size-normal nz-btn-style-light float-right"
-                style="border-right: 1px solid rgba(162,162,162,0.50);margin-right: 12px" type="button"
+                style="border-right: 1px solid rgba(162,162,162,0.50);margin-right: 12px" type="button" v-has="'project_topo_save'"
         >
                   <i class="nz-icon nz-icon-edit" :title="$t('project.topology.edit')"></i>
         </button>