From 133ae7c70b2addaa38531ae7691f5ee280d86483 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 11 Nov 2021 15:43:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E5=A2=9E=E5=8A=A0=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E7=BC=96=E8=BE=91=E5=BF=AB=E6=8D=B7=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/Editor/index.vue |  2 +-
 frontend/src/components/canvas/store/snapshot.js      |  2 +-
 frontend/src/views/panel/list/PanelList.vue           | 11 +++++++++++
 frontend/src/views/panel/list/PanelMain.vue           |  7 +++++--
 frontend/src/views/panel/list/PanelViewShow.vue       |  8 ++++++++
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 6c3b4d297c..7e74686b24 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -1024,7 +1024,7 @@ export default {
         // 初始化时componentData 加载可能出现慢的情况 此时重新初始化一下matrix
         if (newVal.length !== this.lastComponentDataLength) {
           this.lastComponentDataLength = newVal.length
-          console.log('.initMatrix2')
+          // console.log('.initMatrix2')
           this.initMatrix()
         }
       },
diff --git a/frontend/src/components/canvas/store/snapshot.js b/frontend/src/components/canvas/store/snapshot.js
index d9717c8c6b..173725a674 100644
--- a/frontend/src/components/canvas/store/snapshot.js
+++ b/frontend/src/components/canvas/store/snapshot.js
@@ -45,7 +45,7 @@ export default {
       }
     },
     refreshSnapshot(state) {
-      console.log('refreshSnapshot')
+      // console.log('refreshSnapshot')
       // 刷新快照
       state.snapshotData = []
       state.snapshotStyleData = []
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index d6c87cc0e9..07a4e2d79d 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -131,6 +131,14 @@
                     </el-dropdown-menu>
                   </el-dropdown>
                 </span>
+                <span v-if="data.nodeType==='panel'" @click.stop>
+                  <el-button
+                    icon="el-icon-edit"
+                    type="text"
+                    size="small"
+                    @click="edit(data, node)"
+                  />
+                </span>
                 <span style="margin-left: 12px;" @click.stop>
                   <el-dropdown trigger="click" size="small" @command="clickMore">
                     <span class="el-dropdown-link">
@@ -803,6 +811,9 @@ export default {
     },
     searchTypeClick(searchTypeInfo) {
       this.searchType = searchTypeInfo
+    },
+    editFromPanelViewShow() {
+      this.edit(this.lastActiveNodeData, this.lastActiveNode)
     }
   }
 }
diff --git a/frontend/src/views/panel/list/PanelMain.vue b/frontend/src/views/panel/list/PanelMain.vue
index 46c776c713..5c16329626 100644
--- a/frontend/src/views/panel/list/PanelMain.vue
+++ b/frontend/src/views/panel/list/PanelMain.vue
@@ -4,7 +4,7 @@
       <el-tabs v-model="activeName" class="tab-panel" :stretch="true" @tab-click="handleClick">
         <el-tab-pane name="PanelList">
           <span slot="label"><i class="el-icon-document tablepanel-i" />{{ $t('panel.panel_list') }}</span>
-          <panel-list v-if="activeName==='PanelList'" />
+          <panel-list ref="panelList" v-if="activeName==='PanelList'" />
         </el-tab-pane>
         <el-tab-pane name="panels_star" :lazy="true">
           <span slot="label"><i class="el-icon-star-off tablepanel-i" />{{ $t('panel.store') }}</span>
@@ -17,7 +17,7 @@
       </el-tabs>
     </de-aside-container>
     <de-main-container>
-      <PanelViewShow v-if="mainActiveName==='PanelMain'" :active-tab="activeName" />
+      <PanelViewShow v-if="mainActiveName==='PanelMain'" :active-tab="activeName"  @editPanel="editPanel"/>
     </de-main-container>
   </de-container>
 </template>
@@ -101,6 +101,9 @@ export default {
           }
         }
       })
+    },
+    editPanel() {
+      this.$refs.panelList.editFromPanelViewShow()
     }
 
   }
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index d2c79e40cf..41ed961b6d 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -61,6 +61,11 @@
                 <el-button class="el-icon-star-on" size="mini" circle @click="unstar" />
               </el-tooltip>
             </span>
+            <span v-if="hasDataPermission('edit',panelInfo.privileges)&&activeTab==='PanelList'" style="float: right;margin-right: 10px">
+              <el-tooltip :content="$t('commons.edit')">
+                <el-button class="el-icon-edit" size="mini" circle @click="editPanel" />
+              </el-tooltip>
+            </span>
           </el-col>
         </div>
       </el-row>
@@ -301,6 +306,9 @@ export default {
     },
     closePreExport() {
       this.pdfExportShow = false
+    },
+    editPanel() {
+      this.$emit('editPanel')
     }
 
   }