forked from github/dataease
Merge branch 'v1.9' of github.com:dataease/dataease into v1.9
This commit is contained in:
commit
8ec3e7f837
@ -28,6 +28,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: {
|
||||
@ -73,6 +74,7 @@ export default {
|
||||
this.linkInfoTemp.src = checkAddHttp(this.linkInfoTemp.src)
|
||||
this.curComponent.frameLinks = this.linkInfoTemp
|
||||
this.$store.state.styleChangeTimes++
|
||||
bus.$emit('frameLinksChange-' + this.curComponent.id)
|
||||
this.popoverClose()
|
||||
},
|
||||
onClose() {
|
||||
|
@ -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() {
|
||||
|
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<el-row class="main-frame">
|
||||
<div v-if="element.frameLinks.src" class="main-frame">
|
||||
<iframe id="iframe" :src="element.frameLinks.src" scrolling="auto" frameborder="0" class="main-frame" @load="loaded" @error="onError" />
|
||||
<iframe v-if="frameShow" id="iframe" :src="element.frameLinks.src" scrolling="auto" frameborder="0" class="main-frame" @load="loaded" @error="onError" />
|
||||
<div v-if="editMode==='edit'" class="frame-mask">
|
||||
<span style="opacity: 1;">
|
||||
<span style="font-weight: bold;color: lawngreen;">{{ $t('panel.edit_web_tips') }}</span>
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
<script>
|
||||
import { mapState } from 'vuex'
|
||||
import NProgress from 'nprogress'
|
||||
import bus from '@/utils/bus'
|
||||
export default {
|
||||
name: 'DeFrame',
|
||||
props: {
|
||||
@ -45,7 +45,8 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
pOption: {}
|
||||
pOption: {},
|
||||
frameShow: true
|
||||
}
|
||||
},
|
||||
|
||||
@ -62,6 +63,12 @@ export default {
|
||||
created() {
|
||||
},
|
||||
mounted() {
|
||||
bus.$on('frameLinksChange-' + this.element.id, () => {
|
||||
this.frameShow = false
|
||||
this.$nextTick(() => {
|
||||
this.frameShow = true
|
||||
})
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
loaded(e) {
|
||||
|
@ -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: {
|
||||
|
@ -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)
|
||||
},
|
||||
|
@ -77,7 +77,8 @@ export const VIDEOLINKS = {
|
||||
remainingTimeDisplay: false,
|
||||
currentTimeDisplay: false, // 当前时间
|
||||
volumeControl: false, // 声音控制键
|
||||
fullscreenToggle: false
|
||||
fullscreenToggle: false,
|
||||
pause: false
|
||||
},
|
||||
sources: [{
|
||||
}]
|
||||
|
Loading…
Reference in New Issue
Block a user