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 2022-05-28 12:13:59 +08:00
parent 718585f3a0
commit ec9f4c59c6
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/DeDrag/index.vue
View File

@ -759,7 +759,7 @@ export default {
elementMouseDown(e) { elementMouseDown(e) {
// private 设置当前组件数据及状态 // private 设置当前组件数据及状态
this.$store.commit('setClickComponentStatus', true) this.$store.commit('setClickComponentStatus', true)
if (this.element.component !== 'v-text' && this.element.component !== 'de-rich-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search' && this.element.component !== 'de-select-grid' && this.element.component !== 'de-number-range' && this.element.component !== 'de-date') { if (this.element.component !== 'de-frame' && this.element.component !== 'v-text' && this.element.component !== 'de-rich-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search' && this.element.component !== 'de-select-grid' && this.element.component !== 'de-number-range' && this.element.component !== 'de-date') {
e.preventDefault() e.preventDefault()
} }
// 阻止冒泡事件 // 阻止冒泡事件

4
frontend/src/components/canvas/custom-component/DeStreamMedia.vue
View File

@ -2,7 +2,7 @@
<el-row ref="mainPlayer" style="width: 100%;height: 100%"> <el-row ref="mainPlayer" style="width: 100%;height: 100%">
<div v-if="element.streamMediaLinks[element.streamMediaLinks.videoType].url" class="video-container"> <div v-if="element.streamMediaLinks[element.streamMediaLinks.videoType].url" class="video-container">
<video :ref="'player-'+element.id" class="centered-video" name="centeredVideo" :loop="pOption.loop" :controls="inScreen" muted /> <video :ref="'player-'+element.id" class="centered-video" name="centeredVideo" :loop="pOption.loop" :controls="inScreen" muted />
<div v-if="editMode==='edit'" class="stream-mask edit-mask" /> <div v-if="editMode==='edit'" class="stream-mask edit-mask-stream" />
<div v-if="mobileLayoutStatus" class="stream-mask"> <div v-if="mobileLayoutStatus" class="stream-mask">
<span style="opacity: 0.7;"> <span style="opacity: 0.7;">
<span style="color: lightgray;">{{ $t('panel.stream_mobile_tips') }}</span> <span style="color: lightgray;">{{ $t('panel.stream_mobile_tips') }}</span>
@ -177,7 +177,7 @@ export default {
justify-content: center; justify-content: center;
} }
.edit-mask{ .edit-mask-stream{
opacity: 0; opacity: 0;
} }

2
frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
View File

@ -158,7 +158,7 @@ export default {
}, },
chartBackground() { chartBackground() {
let style = {} let style = {}
if (this.subjectItemDetails) { if (this.subjectItemDetails && this.subjectItemDetails.chart.customStyle.background) {
style = { style = {
background: this.subjectItemDetails.chart.customStyle.background.color, background: this.subjectItemDetails.chart.customStyle.background.color,
opacity: this.subjectItemDetails.chart.customStyle.background.alpha / 100 opacity: this.subjectItemDetails.chart.customStyle.background.alpha / 100

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

@ -274,6 +274,7 @@
<Preview <Preview
v-if="previewVisible" v-if="previewVisible"
:in-screen="!previewVisible" :in-screen="!previewVisible"
:panel-info="panelInfo"
:show-type="canvasStyleData.selfAdaption?'full':'width'" :show-type="canvasStyleData.selfAdaption?'full':'width'"
:canvas-style-data="canvasStyleData" :canvas-style-data="canvasStyleData"
:component-data="componentData" :component-data="componentData"