Merge pull request dataease#4382 from dataease/pr@dev@fix_shortkey

ziyujiahao · web-flow · commit 90d435b84785 · 2023-01-16T15:12:58.000+08:00
fix(仪表板): 修复仪表板编辑界面点击全屏后返回快捷键冲突
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
@@ -165,12 +165,12 @@
               v-show=" show &&showIndex===1"
               :canvas-id="canvasId"
             />
-            <subject-setting v-show=" show &&showIndex===2" />
-            <assist-component v-show=" show &&showIndex===3" />
+            <subject-setting v-show=" show &&showIndex===2"/>
+            <assist-component v-show=" show &&showIndex===3"/>
           </div>
         </el-drawer>
         <!--PC端画布区域-->
-        <canvas-opt-bar v-if="!previewVisible&&!mobileLayoutStatus" />
+        <canvas-opt-bar v-if="!previewVisible&&!mobileLayoutStatus"/>
         <de-canvas
           v-if="!previewVisible&&!mobileLayoutStatus"
           ref="canvasMainRef"
@@ -196,7 +196,7 @@
               :style="customCanvasMobileStyle"
               class="this_mobile_canvas"
             >
-              <el-row class="this_mobile_canvas_top" />
+              <el-row class="this_mobile_canvas_top"/>
               <el-row class="this_mobile_canvas_inner_top">
                 {{ panelInfo.name }}
               </el-row>
@@ -205,7 +205,7 @@
                 class="this_mobile_canvas_main"
                 :style="mobileCanvasStyle"
               >
-                <canvas-opt-bar v-if="!previewVisible&&mobileLayoutStatus" />
+                <canvas-opt-bar v-if="!previewVisible&&mobileLayoutStatus"/>
                 <de-canvas
                   v-if="!previewVisible&&mobileLayoutStatus"
                   ref="canvasMainRef"
@@ -243,14 +243,14 @@
                   />
                 </el-col>
               </el-row>
-              <el-row class="this_mobile_canvas_bottom" />
+              <el-row class="this_mobile_canvas_bottom"/>
             </div>
           </el-col>
           <el-col
             :span="16"
             class="this_mobile_canvas_cell this_mobile_canvas_wait_cell"
           >
-            <component-wait />
+            <component-wait/>
           </el-col>
         </el-row>
       </de-main-container>
@@ -268,7 +268,7 @@
           />
         </div>
         <div v-if="showBatchViewToolsAside">
-          <chart-style-batch-set />
+          <chart-style-batch-set/>
         </div>
         <div v-if="!showViewToolsAside&&!showBatchViewToolsAside">
           <el-row style="height: 40px">
@@ -287,7 +287,7 @@
             >{{ $t('panel.position_adjust') }}</span>
           </el-row>
           <el-row>
-            <position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix" />
+            <position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix"/>
             <div
               v-else
               class="view-selected-message-class"
@@ -792,6 +792,9 @@ export default {
     },
     previewVisible(val) {
       this.$store.commit('setPreviewVisible', val)
+      if (!val) {
+        listenGlobalKeyDown()
+      }
     },
     panelInfo: {
       handler(newVal, oldVla) {
