Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
jing Tang
Dataease
Commits
39503493
Unverified
Commit
39503493
authored
3 years ago
by
fit2cloudrd
Committed by
GitHub
3 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fix: 视频链接第一次错误后再填写链接无法立即显示
Co-authored-by:
wangjiahao
<
1522128093@qq.com
>
parent
00c3d572
dev
fix_v.1.9-panel
main
pr@dev_compiler_optimizte_dll
pr@dev_filter_app_layout
pr@dev_filter_input_style_custom
pr@dev_project_optimizte
pr@dev_select_background_transprant
refactor_self-color
v1.10
v1.11
v1.9
v1.11.2
v1.11.1
v1.11.0
v1.10.0
v1.9.1
v1.9.0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
frontend/src/components/canvas/components/Editor/VideoLinks.vue
+2
-0
...nd/src/components/canvas/components/Editor/VideoLinks.vue
frontend/src/components/canvas/custom-component/DeStreamMedia.vue
+9
-2
.../src/components/canvas/custom-component/DeStreamMedia.vue
frontend/src/components/canvas/custom-component/DeVideo.vue
+14
-8
frontend/src/components/canvas/custom-component/DeVideo.vue
frontend/src/components/canvas/custom-component/component-list.js
+2
-1
.../src/components/canvas/custom-component/component-list.js
with
27 additions
and
11 deletions
+27
-11
frontend/src/components/canvas/components/Editor/VideoLinks.vue
+
2
-
0
View file @
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
()
{
...
...
This diff is collapsed.
Click to expand it.
frontend/src/components/canvas/custom-component/DeStreamMedia.vue
+
9
-
2
View file @
39503493
...
...
@@ -42,7 +42,8 @@ export default {
data
()
{
return
{
pOption
:
this
.
element
.
streamMediaLinks
[
this
.
element
.
streamMediaLinks
.
videoType
],
flvPlayer
:
null
flvPlayer
:
null
,
videoShow
:
true
}
},
...
...
@@ -70,7 +71,13 @@ export default {
mounted
()
{
this
.
initOption
()
bus
.
$on
(
'
streamMediaLinksChange-
'
+
this
.
element
.
id
,
()
=>
{
this
.
initOption
()
this
.
pOption
=
this
.
element
.
streamMediaLinks
[
this
.
element
.
streamMediaLinks
.
videoType
],
this
.
flvPlayer
=
null
,
this
.
videoShow
=
false
this
.
$nextTick
(()
=>
{
this
.
videoShow
=
true
this
.
initOption
()
})
})
},
methods
:
{
...
...
This diff is collapsed.
Click to expand it.
frontend/src/components/canvas/custom-component/DeVideo.vue
+
14
-
8
View file @
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)
},
...
...
This diff is collapsed.
Click to expand it.
frontend/src/components/canvas/custom-component/component-list.js
+
2
-
1
View file @
39503493
...
...
@@ -77,7 +77,8 @@ export const VIDEOLINKS = {
remainingTimeDisplay
:
false
,
currentTimeDisplay
:
false
,
// 当前时间
volumeControl
:
false
,
// 声音控制键
fullscreenToggle
:
false
fullscreenToggle
:
false
,
pause
:
false
},
sources
:
[{
}]
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help