Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
39503493
Unverified
提交
39503493
authored
4月 05, 2022
作者:
fit2cloudrd
提交者:
GitHub
4月 05, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 视频链接第一次错误后再填写链接无法立即显示
Co-authored-by:
wangjiahao
<
1522128093@qq.com
>
上级
00c3d572
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
26 行增加
和
10 行删除
+26
-10
VideoLinks.vue
...nd/src/components/canvas/components/Editor/VideoLinks.vue
+2
-0
DeStreamMedia.vue
.../src/components/canvas/custom-component/DeStreamMedia.vue
+8
-1
DeVideo.vue
frontend/src/components/canvas/custom-component/DeVideo.vue
+14
-8
component-list.js
.../src/components/canvas/custom-component/component-list.js
+2
-1
没有找到文件。
frontend/src/components/canvas/components/Editor/VideoLinks.vue
浏览文件 @
39503493
...
...
@@ -43,6 +43,7 @@
import
{
mapState
}
from
'vuex'
import
{
deepCopy
}
from
'@/components/canvas/utils/utils'
import
{
checkAddHttp
}
from
'@/utils/urlUtils'
import
bus
from
"@/utils/bus"
;
export
default
{
props
:
{
...
...
@@ -88,6 +89,7 @@ export default {
this
.
linkInfoTemp
[
this
.
linkInfoTemp
.
videoType
].
sources
[
0
].
src
=
checkAddHttp
(
this
.
linkInfoTemp
[
this
.
linkInfoTemp
.
videoType
].
sources
[
0
].
src
)
this
.
curComponent
.
videoLinks
=
this
.
linkInfoTemp
this
.
$store
.
state
.
styleChangeTimes
++
bus
.
$emit
(
'videoLinksChange-'
+
this
.
curComponent
.
id
)
this
.
popoverClose
()
},
onClose
()
{
...
...
frontend/src/components/canvas/custom-component/DeStreamMedia.vue
浏览文件 @
39503493
...
...
@@ -42,7 +42,8 @@ export default {
data
()
{
return
{
pOption
:
this
.
element
.
streamMediaLinks
[
this
.
element
.
streamMediaLinks
.
videoType
],
flvPlayer
:
null
flvPlayer
:
null
,
videoShow
:
true
}
},
...
...
@@ -70,8 +71,14 @@ export default {
mounted
()
{
this
.
initOption
()
bus
.
$on
(
'streamMediaLinksChange-'
+
this
.
element
.
id
,
()
=>
{
this
.
pOption
=
this
.
element
.
streamMediaLinks
[
this
.
element
.
streamMediaLinks
.
videoType
],
this
.
flvPlayer
=
null
,
this
.
videoShow
=
false
this
.
$nextTick
(()
=>
{
this
.
videoShow
=
true
this
.
initOption
()
})
})
},
methods
:
{
initOption
()
{
...
...
frontend/src/components/canvas/custom-component/DeVideo.vue
浏览文件 @
39503493
...
...
@@ -2,12 +2,12 @@
<el-row
ref=
"mainPlayer"
>
<div
v-if=
"element.videoLinks[element.videoLinks.videoType].sources[0].src"
class=
"player"
>
<video-player
v-if=
"showVideo"
ref=
"videoPlayer"
class=
"vjs-custom-skin"
:options=
"editMode==='preview'?pOption:playerOptions"
:playsinline=
"true"
@
play=
"onPlayerPlay($event)"
@
pause=
"onPlayerPause($event)"
@
ended=
"onPlayerEnded($event)"
@
loadeddata=
"onPlayerLoadeddata($event)"
@
waiting=
"onPlayerWaiting($event)"
...
...
@@ -29,6 +29,7 @@
// custom skin css
import
'@/custom-theme.css'
import
{
mapState
}
from
'vuex'
import
bus
from
'@/utils/bus'
// import SWF_URL from 'videojs-swf/dist/video-js.swf'
export
default
{
...
...
@@ -59,7 +60,8 @@ export default {
},
data
()
{
return
{
pOption
:
{}
pOption
:
{},
showVideo
:
true
}
},
...
...
@@ -83,15 +85,22 @@ export default {
'canvasStyleData'
])
},
created
()
{
this
.
initOption
()
},
watch
:
{
h
(
newVal
,
oldVla
)
{
this
.
initOption
()
}
},
created
()
{
this
.
initOption
()
},
mounted
()
{
bus
.
$on
(
'videoLinksChange-'
+
this
.
element
.
id
,
()
=>
{
this
.
showVideo
=
false
this
.
$nextTick
(()
=>
{
this
.
showVideo
=
true
this
.
initOption
()
})
})
},
methods
:
{
initOption
()
{
...
...
@@ -102,9 +111,6 @@ export default {
onPlayerPlay
(
player
)
{
// console.log('player play!', player)
},
onPlayerPause
(
player
)
{
// console.log('player pause!', player)
},
onPlayerEnded
(
player
)
{
// console.log('player ended!', player)
},
...
...
frontend/src/components/canvas/custom-component/component-list.js
浏览文件 @
39503493
...
...
@@ -77,7 +77,8 @@ export const VIDEOLINKS = {
remainingTimeDisplay
:
false
,
currentTimeDisplay
:
false
,
// 当前时间
volumeControl
:
false
,
// 声音控制键
fullscreenToggle
:
false
fullscreenToggle
:
false
,
pause
:
false
},
sources
:
[{
}]
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论