Unverified 提交 ce5a9e5e authored 作者: 王嘉豪's avatar 王嘉豪 提交者: GitHub

Merge pull request #2209 from dataease/pr@dev@refactor-stream-media

refactor: 避免事件冲突,仪表板全屏预览状态不显示流媒体控制条
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
:style="getComponentStyleDefault(config.style)" :style="getComponentStyleDefault(config.style)"
:prop-value="config.propValue" :prop-value="config.propValue"
:is-edit="false" :is-edit="false"
:in-screen="inScreen"
:active="componentActiveFlag" :active="componentActiveFlag"
:element="config" :element="config"
:search-count="searchCount" :search-count="searchCount"
......
<template> <template>
<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 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" />
<div v-if="mobileLayoutStatus" class="stream-mask mobile-layout-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>
</span> </span>
...@@ -43,6 +43,11 @@ export default { ...@@ -43,6 +43,11 @@ export default {
h: { h: {
type: Number, type: Number,
default: 200 default: 200
},
inScreen: {
type: Boolean,
required: false,
default: true
} }
}, },
data() { data() {
...@@ -176,8 +181,5 @@ export default { ...@@ -176,8 +181,5 @@ export default {
opacity: 0; opacity: 0;
} }
.mobile-layout-mask{
}
</style> </style>
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论