Merge pull request #1182 from dataease/pr@dev@refactor_panel-edit

frontend/src/components/canvas/components/Toolbar.vue

@@ -12,33 +12,6 @@
       </span>
     </div>
     <div v-else class="toolbar">
-      <!--      <div class="canvas-config" style="margin-right: 10px">-->
-      <!--        <span>{{ $t('panel.new_element_distribution') }}:</span>-->
-      <!--        <el-switch-->
-      <!--          v-model="canvasStyleData.auxiliaryMatrix"-->
-      <!--          :width="35"-->
-      <!--          active-color="#13ce66"-->
-      <!--          inactive-color="#ff4949"-->
-      <!--          :active-text="$t('panel.matrix')"-->
-      <!--          :inactive-text="$t('panel.suspension')"-->
-      <!--        />-->
-      <!--      </div>-->
-      <!--      <div class="canvas-config" style="margin-right: 10px" @click.stop="auxiliaryMatrixChange">-->
-      <!--        <span>{{ $t('panel.new_element_distribution.matrix_design') }}:</span>-->
-      <!--        <span v-if="curComponent.auxiliaryMatrix">-->
-      <!--          <i class="icon iconfont icon-shujujuzhen" />-->
-      <!--          {{ $t('panel.matrix_design') }}-->
-      <!--        </span>-->
-      <!--        <span v-if="!curComponent.auxiliaryMatrix">-->
-      <!--          <i class="icon iconfont icon-xuanfuanniu" />-->
-      <!--          {{ $t('panel.suspension') }}-->
-      <!--        </span>-->
-      <!--      </div>-->
-      <!--      <div class="canvas-config" style="margin-right: 10px">-->
-      <!--        <span> {{ $t('panel.canvas_scale') }} </span>-->
-      <!--        <input v-model="scale" @input="handleScaleChange"> %-->
-      <!--      </div>-->
-
       <el-tooltip v-if="!canvasStyleData.auxiliaryMatrix" :content="$t('panel.new_element_distribution')+':'+$t('panel.suspension')">
         <el-button class="icon iconfont-tb icon-xuanfuanniu" size="mini" circle @click="auxiliaryMatrixChange" />
       </el-tooltip>
@@ -65,13 +38,9 @@
       <el-tooltip :content="$t('panel.redo') ">
         <el-button class="el-icon-refresh-left" size="mini" circle @click="redo" />
       </el-tooltip>
-      <!--      <el-tooltip :content="$t('panel.insert_picture') ">-->
-      <!--        <el-button class="el-icon-upload" size="mini" circle @click="goFile" />-->
-      <!--      </el-tooltip>-->
       <el-tooltip :content="$t('panel.clean_canvas')">
         <el-button class="el-icon-document-delete" size="mini" circle @click="clearCanvas" />
       </el-tooltip>
-      <!--      <input id="input" ref="files" type="file" hidden @change="handleFileChange">-->
       <el-tooltip :content="$t('panel.fullscreen_preview')">
         <el-button class="el-icon-view" size="mini" circle @click="clickPreview" />
       </el-tooltip>

frontend/src/views/panel/list/PanelViewShow.vue

@@ -23,6 +23,12 @@
             <span v-if="panelInfo.sourcePanelName" style="color: green;font-size: 12px">({{ $t('panel.source_panel_name') }}:{{ panelInfo.sourcePanelName }})</span>
           </el-col>
           <el-col :span="12">
+            <span v-if="hasDataPermission('edit',panelInfo.privileges)&&activeTab==='PanelList'" style="float: right;margin-right: 10px">
+              <el-button size="mini" type="primary" @click="editPanel">
+                {{ $t('commons.edit') }}
+              </el-button>
+            </span>
+
             <span v-if="hasDataPermission('export',panelInfo.privileges)" style="float: right;margin-right: 10px">
               <el-tooltip :content="$t('panel.save_to_panel')">
                 <el-button class="el-icon-folder-checked" size="mini" circle @click="saveToTemplate" />
@@ -61,11 +67,7 @@
                 <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>