center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix(仪表板): 修复仪表板编辑界面点击全屏后返回快捷键冲突

Browse Source
This commit is contained in:
wangjiahao 2023-01-16 15:07:43 +08:00
parent 4868ae4704
commit e375526f7d
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/src/views/panel/edit/index.vue
View File

@ -165,12 +165,12 @@
v-show=" show &&showIndex===1" v-show=" show &&showIndex===1"
:canvas-id="canvasId" :canvas-id="canvasId"
/> />
<subject-setting v-show=" show &&showIndex===2" /> <subject-setting v-show=" show &&showIndex===2"/>
<assist-component v-show=" show &&showIndex===3" /> <assist-component v-show=" show &&showIndex===3"/>
</div> </div>
</el-drawer> </el-drawer>
<!--PC端画布区域--> <!--PC端画布区域-->
<canvas-opt-bar v-if="!previewVisible&&!mobileLayoutStatus" /> <canvas-opt-bar v-if="!previewVisible&&!mobileLayoutStatus"/>
<de-canvas <de-canvas
v-if="!previewVisible&&!mobileLayoutStatus" v-if="!previewVisible&&!mobileLayoutStatus"
ref="canvasMainRef" ref="canvasMainRef"
@ -196,7 +196,7 @@
:style="customCanvasMobileStyle" :style="customCanvasMobileStyle"
class="this_mobile_canvas" 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"> <el-row class="this_mobile_canvas_inner_top">
{{ panelInfo.name }} {{ panelInfo.name }}
</el-row> </el-row>
@ -205,7 +205,7 @@
class="this_mobile_canvas_main" class="this_mobile_canvas_main"
:style="mobileCanvasStyle" :style="mobileCanvasStyle"
> >
<canvas-opt-bar v-if="!previewVisible&&mobileLayoutStatus" /> <canvas-opt-bar v-if="!previewVisible&&mobileLayoutStatus"/>
<de-canvas <de-canvas
v-if="!previewVisible&&mobileLayoutStatus" v-if="!previewVisible&&mobileLayoutStatus"
ref="canvasMainRef" ref="canvasMainRef"
@ -243,14 +243,14 @@
/> />
</el-col> </el-col>
</el-row> </el-row>
<el-row class="this_mobile_canvas_bottom" /> <el-row class="this_mobile_canvas_bottom"/>
</div> </div>
</el-col> </el-col>
<el-col <el-col
:span="16" :span="16"
class="this_mobile_canvas_cell this_mobile_canvas_wait_cell" class="this_mobile_canvas_cell this_mobile_canvas_wait_cell"
> >
<component-wait /> <component-wait/>
</el-col> </el-col>
</el-row> </el-row>
</de-main-container> </de-main-container>
@ -268,7 +268,7 @@
/> />
</div> </div>
<div v-if="showBatchViewToolsAside"> <div v-if="showBatchViewToolsAside">
<chart-style-batch-set /> <chart-style-batch-set/>
</div> </div>
<div v-if="!showViewToolsAside&&!showBatchViewToolsAside"> <div v-if="!showViewToolsAside&&!showBatchViewToolsAside">
<el-row style="height: 40px"> <el-row style="height: 40px">
@ -287,7 +287,7 @@
>{{ $t('panel.position_adjust') }}</span> >{{ $t('panel.position_adjust') }}</span>
</el-row> </el-row>
<el-row> <el-row>
<position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix" /> <position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix"/>
<div <div
v-else v-else
class="view-selected-message-class" class="view-selected-message-class"
@ -792,6 +792,9 @@ export default {
}, },
previewVisible(val) { previewVisible(val) {
this.$store.commit('setPreviewVisible', val) this.$store.commit('setPreviewVisible', val)
if (!val) {
listenGlobalKeyDown()
}
}, },
panelInfo: { panelInfo: {
handler(newVal, oldVla) { handler(newVal, oldVla) {