lyc-dev #153

Merged
lyc merged 6 commits from lyc-dev into main 2024-08-23 11:22:54 +08:00
3 changed files with 25 additions and 15 deletions
Showing only changes of commit 146784bf26 - Show all commits

View File

@ -150,7 +150,6 @@ async function createLinkWin(data) {
// 初始化完成 // 初始化完成
app.on('ready', () => { app.on('ready', () => {
process.env.LANG = 'en_US.UTF-8' process.env.LANG = 'en_US.UTF-8'
process.env['ELECTRON_DISABLE_SANDBOX'] = true;
// 设置应用程序用户模型标识符 // 设置应用程序用户模型标识符
electronApp.setAppUserModelId('com.electron') electronApp.setAppUserModelId('com.electron')

View File

@ -8,7 +8,7 @@
http-equiv="Content-Security-Policy" http-equiv="Content-Security-Policy"
content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:" content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
/> --> /> -->
<meta http-equiv="Content-Security-Policy" content="connect-src *; default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src * 'self' ;img-src * 'self' data: blob:" /> <meta http-equiv="Content-Security-Policy" content="connect-src *; default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *;img-src * 'self' data: blob:" />
</head> </head>

View File

@ -1,33 +1,43 @@
<template> <template>
<el-drawer v-model="model" class="preview-drawer" title="title" :modal="false" :with-header="false" append-to-body <el-drawer v-model="model" class="preview-drawer" title="title" :modal="false" :with-header="false" append-to-body
size="50%" :before-close="handleClose"> size="50%">
<div class="flex drawer-header"> <div class="flex drawer-header">
<div> <div>
<div class="flex file-name"> <div class="flex file-name">
<FileImage :size="30" :file-name="'xx.jpg'" /> <FileImage :size="30" :file-name="'row.fileName'" />
<span class="name">地理0831-10</span> <span class="name">{{ row.fileShowName }}</span>
</div> </div>
<div class="flex file-tag"> <div class="flex file-tag">
<el-tag type="info" class="tag">图片</el-tag> <el-tag type="info" class="tag">{{ row.fileSuffix }}</el-tag>
<el-tag type="info" class="tag">扩展素材</el-tag> <el-tag type="info" class="tag">{{ row.fileFlag }}</el-tag>
</div> </div>
</div> </div>
<div class="header-close" @click="onClose"><i class="iconfont icon-guanbi"></i></div> <div class="header-close" @click="onClose"><i class="iconfont icon-guanbi"></i></div>
</div> </div>
<div class="drawer-content"> <div class="drawer-content">
<!-- <iframe src="./aaa.pdf" width="600px" height="600px"></iframe> --> <!-- <iframe src="./aaa.pdf" width="600px" height="600px"></iframe> -->
<div ref="playerRef" class="video-box"></div> <!-- <div ref="playerRef" class="video-box"></div> -->
<!-- <video src="" controls autoplay></video> -->
<el-image style="width: 100%;" src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg" />
</div> </div>
</el-drawer> </el-drawer>
</template> </template>
<script setup> <script setup>
import { watch, ref, nextTick } from 'vue' import { watch, ref, nextTick } from 'vue'
import Player from 'xgplayer'; import Player from 'xgplayer'
import 'xgplayer/dist/index.min.css' import 'xgplayer/dist/index.min.css'
import FileImage from '@/components/file-image/index.vue' import FileImage from '@/components/file-image/index.vue'
const model = defineModel() const model = defineModel()
const props = defineProps({
row: {
type: Object,
default(){
return {}
}
},
})
const playerRef = ref(); const playerRef = ref();
const handleClose = () => { const handleClose = () => {
@ -39,19 +49,20 @@ const onClose = () => {
const init = () => { const init = () => {
nextTick(() => { nextTick(() => {
//
let player = new Player({ let player = new Player({
el: playerRef.value, el: playerRef.value,
url: 'https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-360p.mp4', url: '//sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-360p.mp4',
width: '100%', width: '100%',
autoplay: false,// false autoplay: false,// false
autoplayMuted: true,// false
screenShot: true,// 使false
videoAttributes: {// video videoAttributes: {// video
crossOrigin: 'anonymous',// CORS crossOrigin: 'anonymous',// CORS
}, },
marginControls: false,// false cssFullscreen: false,
loop:true,// false loop:true,// false
volume:0.3,// ,0 ~ 1(0.6) commonStyle:{
progressColor: '#cccccce6',//
},
}); });
}) })
@ -59,7 +70,7 @@ const init = () => {
watch(model, (newVal) => { watch(model, (newVal) => {
if (newVal) { if (newVal) {
init() // init()
} }
}) })
</script> </script>