From 035bcc1e9fe4b099a8f32108191a7c7842906782 Mon Sep 17 00:00:00 2001 From: Flex <q1406482700@163.com> Date: 星期五, 06 六月 2025 16:07:26 +0800 Subject: [PATCH] 修改文件上传,添加文件上传状态提示 --- easegen-front/src/views/digitalcourse/digitalhumans/FileUploadComent.vue | 298 +++++++++++++++++++++++++++++++++++++ easegen-front/src/views/digitalcourse/digitalhumans/DigitalHumansForm.vue | 169 ++++++++++++++------- 2 files changed, 411 insertions(+), 56 deletions(-) diff --git a/easegen-front/src/views/digitalcourse/digitalhumans/DigitalHumansForm.vue b/easegen-front/src/views/digitalcourse/digitalhumans/DigitalHumansForm.vue index 5179f76..5007d1a 100644 --- a/easegen-front/src/views/digitalcourse/digitalhumans/DigitalHumansForm.vue +++ b/easegen-front/src/views/digitalcourse/digitalhumans/DigitalHumansForm.vue @@ -8,13 +8,23 @@ v-loading="formLoading" > <el-form-item :label="t('digitalhumans.name')" prop="name"> - <el-input v-model="formData.name" :placeholder="t('common.inputText') + t('digitalhumans.name')" /> + <el-input + v-model="formData.name" + :placeholder="t('common.inputText') + t('digitalhumans.name')" + /> </el-form-item> - <el-form-item :label="t('digitalhumans.code')" prop="code" v-if="false" > // 褰撳墠鏁板瓧浜鸿棰戠殑缂栫爜绫诲瀷 - <el-input v-model="formData.code" :placeholder="t('common.inputText') + t('digitalhumans.code')" /> + <el-form-item :label="t('digitalhumans.code')" prop="code" v-if="false"> + // 褰撳墠鏁板瓧浜鸿棰戠殑缂栫爜绫诲瀷 + <el-input + v-model="formData.code" + :placeholder="t('common.inputText') + t('digitalhumans.code')" + /> </el-form-item> <el-form-item :label="t('digitalhumans.gender')" prop="gender"> - <el-select v-model="formData.gender" :placeholder="t('common.selectText')+t('digitalhumans.gender')"> + <el-select + v-model="formData.gender" + :placeholder="t('common.selectText') + t('digitalhumans.gender')" + > <el-option v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)" :key="dict.value" @@ -23,8 +33,12 @@ /> </el-select> </el-form-item> - <el-form-item :label="t('digitalhumans.useModel')" prop="useModel" v-if="false" > //鏁板瓧浜烘ā寮忛�夋嫨妗� - <el-select v-model="formData.useModel" :placeholder="t('common.selectText')+t('digitalhumans.useModel')"> + <el-form-item :label="t('digitalhumans.useModel')" prop="useModel" v-if="false"> + //鏁板瓧浜烘ā寮忛�夋嫨妗� + <el-select + v-model="formData.useModel" + :placeholder="t('common.selectText') + t('digitalhumans.useModel')" + > <el-option v-for="dict in getIntDictOptions(DICT_TYPE.USE_MODEL)" :key="dict.value" @@ -35,11 +49,15 @@ </el-form-item> <el-form-item label="鑳屾櫙鏍峰紡" prop="isTransparent"> <el-select v-model="formData.isTransparent" placeholder="璇烽�夋嫨鏄惁鍘婚櫎鑳屾櫙"> - <el-option value="1" label="閫忔槑鑳屾櫙"/> - <el-option value="2" label="缁垮箷鑳屾櫙"/> + <el-option value="1" label="閫忔槑鑳屾櫙" /> + <el-option value="2" label="缁垮箷鑳屾櫙" /> </el-select> </el-form-item> - <el-form-item v-if="formData.useModel == 1" :label="t('digitalhumans.picture')" prop="pictureUrl"> + <el-form-item + v-if="formData.useModel == 1" + :label="t('digitalhumans.picture')" + prop="pictureUrl" + > <UploadImg v-if="formData" v-model="formData.fixPictureUrl" /> <UploadImg v-else v-model="formData.pictureUrl" /> </el-form-item> @@ -47,13 +65,26 @@ <el-form-item v-if="formData.useModel == 2" :label="t('digitalhumans.video')" prop="videoUrl"> <!-- 鍘熸湰鑷甫鐨勮棰戜笂浼� --> <!-- <UploadFile v-if="!(formData.videoUrl || formData.fixVideoUrl)" v-model="formData.videoUrl" :fileType="['mp4','mov']" :limit="1" @on-success="handleFileSuccess('videoUrl', $event)"/> --> - <UploadFile v-if="!(formData.fixVideoUrl)" v-model="formData.videoUrl" :fileType="['mp4','mov']" :limit="1" @on-success="handleFileSuccess('videoUrl', $event)"/> + <!-- <UploadFile v-if="!(formData.fixVideoUrl)" v-model="formData.videoUrl" :fileType="['mp4','mov']" :limit="1" @on-success="handleFileSuccess('videoUrl', $event)"/> --> + <!-- 淇敼瀹屽杽鍚庣殑鏂囦欢涓婁紶缁勪欢锛屽師缁勪欢鏃犳硶鍒ゆ柇鏂囦欢涓婁紶涓笌鏂囦欢涓婁紶缁撴潫涓ょ鐘舵�� --> + <FileUploadComent + v-if="!formData.fixVideoUrl" + v-model="formData.videoUrl" + :fileType="['mp4', 'mov']" + :limit="1" + @fileUploadEnd="FileUploadEnd" + @fileUploadStart="FileUploadStart" + @on-success="handleFileSuccess('videoUrl', $event)" + /> <!-- 鍘熻棰戞挱鏀惧櫒 --> <!-- <video-player v-if="formData.videoUrl || formData.fixVideoUrl" :property="videoProperty"/> --> - <!-- 鏂扮殑瑙嗛鎾斁鍣� --> - <VideoPlayerMov v-if="formData.videoUrl || formData.fixVideoUrl" :property="videoProperty"/> + <!-- 鏂扮殑瑙嗛鎾斁鍣� --> + <VideoPlayerMov + v-if="formData.videoUrl || formData.fixVideoUrl" + :property="videoProperty" + /> </el-form-item> -<!-- <el-form-item :label="鎶犲浘鏍囪瘑" prop="matting"> + <!-- <el-form-item :label="鎶犲浘鏍囪瘑" prop="matting"> <el-select v-model="formData.matting" :placeholder="璇烽�夋嫨鎶犲浘鏍囪瘑"> <el-option v-for="dict in getIntDictOptions(DICT_TYPE.DIGITALCOURSE_DIGITALHUMAN_MATTING)" @@ -64,7 +95,10 @@ </el-select> </el-form-item>--> <el-form-item :label="t('digitalhumans.posture')" prop="posture"> - <el-select v-model="formData.posture" :placeholder="t('common.selectText') + t('digitalhumans.posture')"> + <el-select + v-model="formData.posture" + :placeholder="t('common.selectText') + t('digitalhumans.posture')" + > <el-option v-for="dict in getIntDictOptions(DICT_TYPE.DIGITALCOURSE_DIGITALHUMAN_POSTURE)" :key="dict.value" @@ -74,7 +108,10 @@ </el-select> </el-form-item> <el-form-item :label="t('digitalhumans.type')" prop="type"> - <el-select v-model="formData.type" :placeholder="t('common.selectText') + t('digitalhumans.type')"> + <el-select + v-model="formData.type" + :placeholder="t('common.selectText') + t('digitalhumans.type')" + > <el-option v-for="dict in getIntDictOptions(DICT_TYPE.DIGITALCOURSE_DIGITALHUMAN_TYPE)" :key="dict.value" @@ -85,21 +122,29 @@ </el-form-item> </el-form> <template #footer> - <el-button @click="submitForm" type="primary" :disabled="formLoading" :loading="isUploading" >{{t('common.ok')}}</el-button> - <el-button @click="dialogVisible = false">{{t('common.cancel')}}</el-button> + <el-button + @click="submitForm" + type="primary" + :disabled="formLoading" + :loading="isUploading" + >{{ t('common.ok') }}</el-button + > + <el-button @click="dialogVisible = false">{{ t('common.cancel') }}</el-button> </template> </Dialog> </template> <script setup lang="ts"> +import FileUploadComent from './FileUploadComent.vue' import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import * as DigitalHumansApi from '@/api/digitalcourse/digitalhumans' -import VideoPlayer from "@/components/DiyEditor/components/mobile/VideoPlayer/index.vue"; -import VideoPlayerMov from "@/components/DiyEditor/components/mobile/VideoPlayer_mov/index.vue"; -import {DiyComponent} from "@/components/DiyEditor/util"; -import {VideoPlayerProperty} from "@/components/DiyEditor/components/mobile/VideoPlayer/config"; +import VideoPlayer from '@/components/DiyEditor/components/mobile/VideoPlayer/index.vue' +import VideoPlayerMov from '@/components/DiyEditor/components/mobile/VideoPlayer_mov/index.vue' +import { DiyComponent } from '@/components/DiyEditor/util' +import { VideoPlayerProperty } from '@/components/DiyEditor/components/mobile/VideoPlayer/config' import { useUpload } from '@/components/UploadFile/src/useUpload' -import { el } from 'element-plus/es/locale'; -import { any } from 'vue-types'; +import { el } from 'element-plus/es/locale' +import { any } from 'vue-types' +import { start } from 'nprogress' const { t } = useI18n() // 鍥介檯鍖� const message = useMessage() // 娑堟伅寮圭獥 @@ -126,7 +171,7 @@ useGeneralModel: undefined, useModel: undefined, status: undefined, - isTransparent: undefined, + isTransparent: undefined }) // 褰撳墠鏄惁姝e湪涓婁紶瑙嗛 @@ -144,11 +189,14 @@ } } as DiyComponent<VideoPlayerProperty> -watch(()=> formData.value.videoUrl,(newVal,oldValue)=>{ - if (newVal && newVal.length > 0){ - videoProperty.videoUrl = formData.value.fixVideoUrl || newVal +watch( + () => formData.value.videoUrl, + (newVal, oldValue) => { + if (newVal && newVal.length > 0) { + videoProperty.videoUrl = formData.value.fixVideoUrl || newVal + } } -}) +) const formRules = reactive({ gender: [{ required: true, message: '鎬у埆涓嶈兘涓虹┖', trigger: 'change' }], name: [{ required: true, message: '鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }], @@ -165,22 +213,31 @@ }) const formRef = ref() // 琛ㄥ崟 Ref -const StartCes = () => { - console.log( " ----- 寮�濮� ----- " ) +const FileUploadStart = () => { isUploading.value = true } -const End = (res)=>{ - const FileObject = { - file:res - } - httpRequest( FileObject ).then( response =>{ - console.log(response) - formData.value.videoUrl = response.data; - } ).finally( res => { - isUploading.value = false - } ) +const FileUploadEnd = () => { + isUploading.value = false +} +const StartCes = () => { + console.log(' ----- 寮�濮� ----- ') + isUploading.value = true +} + +const End = (res) => { + const FileObject = { + file: res + } + httpRequest(FileObject) + .then((response) => { + console.log(response) + formData.value.videoUrl = response.data + }) + .finally((res) => { + isUploading.value = false + }) } /** 鎵撳紑寮圭獥 */ @@ -197,7 +254,7 @@ } finally { formLoading.value = false } - }else{ + } else { InitHumMODEL() } } @@ -245,26 +302,26 @@ type: undefined, useGeneralModel: undefined, useModel: undefined, - status: undefined, + status: undefined } formRef.value?.resetFields() } -const handleFileSuccess = (fileType,response) => { +const handleFileSuccess = (fileType, response) => { + alert('Pause') if (fileType === 'videoUrl') { - formData.value.videoUrl = response.data; - } -}; - -// 淇敼榛樿鐨勬暟瀛椾汉瑙嗛妯″紡涓鸿棰� - -const InitHumMODEL = ()=>{ - let ModelList = getIntDictOptions( DICT_TYPE.USE_MODEL ) - for (let index = 0; index < ModelList.length; index++) { - const element = ModelList[index]; - if( element.label === "瑙嗛" ){ - formData.value.useModel = Number( element.value ) - } + formData.value.videoUrl = response.data } } +// 淇敼榛樿鐨勬暟瀛椾汉瑙嗛妯″紡涓鸿棰� + +const InitHumMODEL = () => { + let ModelList = getIntDictOptions(DICT_TYPE.USE_MODEL) + for (let index = 0; index < ModelList.length; index++) { + const element = ModelList[index] + if (element.label === '瑙嗛') { + formData.value.useModel = Number(element.value) + } + } +} </script> diff --git a/easegen-front/src/views/digitalcourse/digitalhumans/FileUploadComent.vue b/easegen-front/src/views/digitalcourse/digitalhumans/FileUploadComent.vue new file mode 100644 index 0000000..bdc9728 --- /dev/null +++ b/easegen-front/src/views/digitalcourse/digitalhumans/FileUploadComent.vue @@ -0,0 +1,298 @@ +<template> + <div v-if="!disabled" class="upload-file"> + <el-upload + ref="uploadRef" + v-model:file-list="fileList" + :action="uploadUrl" + :accept="acceptFormat" + :auto-upload="autoUpload" + :before-upload="beforeUpload" + :disabled="disabled" + :drag="drag" + :http-request="httpRequest" + :limit="props.limit" + :multiple="props.limit > 1" + :on-error="excelUploadError" + :on-exceed="handleExceed" + :on-preview="handlePreview" + :on-remove="handleRemove" + :on-success="handleFileSuccess" + :show-file-list="isShowFileList" + class="upload-file-uploader" + name="file" + > + <el-button type="primary"> + <Icon icon="ep:upload-filled" /> + 閫夊彇鏂囦欢 + </el-button> + <template v-if="isShowTip" #tip> +<!-- <div style="font-size: 8px"> + 澶у皬涓嶈秴杩� <b style="color: #f56c6c">{{ fileSize }}MB</b> + </div>--> + <div style="font-size: 8px"> + 鏍煎紡涓� <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 鐨勬枃浠� + </div> + <div v-if="describe" class="upload-describe"> + <b style="color: #f56c6c">璇存槑锛� {{ describe }}</b> + </div> + </template> + + <template #file="row"> + <div v-show="isShowFileList" class="flex items-center"> + <span>{{ row.file.name }}</span> + <div class="ml-10px"> + <el-link + :href="row.file.url" + :underline="false" + download + target="_blank" + type="primary" + > + 涓嬭浇 + </el-link> + </div> + <div class="ml-10px" v-if="isShowDelete"> + <el-button link type="danger" @click="handleRemove(row.file)"> 鍒犻櫎</el-button> + </div> + </div> + </template> + </el-upload> + </div> + + <!-- 涓婁紶鎿嶄綔绂佺敤鏃� --> + <div v-if="disabled" class="upload-file"> + <div v-for="(file, index) in fileList" :key="index" class="flex items-center file-list-item"> + <span>{{ file.name }}</span> + <div class="ml-10px"> + <el-link :href="file.url" :underline="false" download target="_blank" type="primary"> + 涓嬭浇 + </el-link> + </div> + </div> + </div> +</template> +<script lang="ts" setup> +import { propTypes } from '@/utils/propTypes' +import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus' +import { isString } from '@/utils/is' +import { useUpload } from '@/components/UploadFile/src/useUpload' +import { UploadFile } from 'element-plus/es/components/upload/src/upload' + +defineOptions({ name: 'FileUploadComent' }) + +const message = useMessage() // 娑堟伅寮圭獥 +const emit = defineEmits(['update:modelValue']) +const duration = ref(undefined) +const fileName = ref('') +const props = defineProps({ + modelValue: propTypes.oneOfType<string | string[]>([String, Array<String>]).isRequired, + fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 鏂囦欢绫诲瀷, 渚嬪['png', 'jpg', 'jpeg'] + fileSize: propTypes.number.def(2048), // 澶у皬闄愬埗(MB) + limit: propTypes.number.def(5), // 鏁伴噺闄愬埗 + autoUpload: propTypes.bool.def(true), // 鑷姩涓婁紶 + drag: propTypes.bool.def(false), // 鎷栨嫿涓婁紶 + isShowTip: propTypes.bool.def(true), // 鏄惁鏄剧ず鎻愮ず + isShowFileList: propTypes.bool.def(true), // 鏄惁鏄剧ず鎻愮ず + isShowDelete: propTypes.bool.def(true), // 鏄惁鏄剧ず鍒犻櫎 + disabled: propTypes.bool.def(false), // 鏄惁绂佺敤涓婁紶缁勪欢 ==> 闈炲繀浼狅紙榛樿涓� false锛� + describe: propTypes.bool.def(false) +}) + +const getVideoDuration = (file) =>{ + const url = URL.createObjectURL(file); + const audioElement = new Audio(url); + audioElement.addEventListener("loadedmetadata", function() { + // 瑙嗛鏃堕暱鍊肩殑鑾峰彇瑕佺瓑鍒拌繖涓尶鍚嶅嚱鏁版墽琛屽畬姣曟墠浜х敓 + duration.value = parseInt(audioElement.duration); //寰楀埌鏃堕暱涓虹锛屽皬鏁帮紝182.36 + fileName.value = file.name; //寰楀埌鏃堕暱涓虹锛屽皬鏁帮紝182.36 + emitUpdateDuration() + }); +} + +// ========== 涓婁紶鐩稿叧 ========== +const uploadRef = ref<UploadInstance>() +const uploadList = ref<UploadUserFile[]>([]) +const fileList = ref<UploadUserFile[]>([]) +const uploadNumber = ref<number>(0) + +const { uploadUrl, httpRequest } = useUpload() + +// 鏂囦欢涓婁紶涔嬪墠鍒ゆ柇 +const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => { + if (fileList.value.length >= props.limit) { + message.error(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃${props.limit}涓�!`) + return false + } + try { + getVideoDuration(file) + }catch (e) { + console.log('瑙嗛鏂囦欢瑙f瀽寮傚父') + } + let fileExtension = '' + if (file.name.lastIndexOf('.') > -1) { + fileExtension = file.name.slice(file.name.lastIndexOf('.') + 1) + } + const isImg = props.fileType.some((type: string) => { + if (file.type.indexOf(type) > -1) return true + return !!(fileExtension && fileExtension.indexOf(type) > -1) + }) + const isLimit = file.size < props.fileSize * 1024 * 1024 + if (!isImg) { + message.error(`鏂囦欢鏍煎紡涓嶆纭�, 璇蜂笂浼�${props.fileType.join('/')}鏍煎紡!`) + return false + } + if (!isLimit) { + message.error(`涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃${props.fileSize}MB!`) + return false + } + message.success('姝e湪涓婁紶鏂囦欢锛岃绋嶅��...') + emit( "fileUploadStart" ) + uploadNumber.value++ +} +// 澶勭悊涓婁紶鐨勬枃浠跺彂鐢熷彉鍖� +// const handleFileChange = (uploadFile: UploadFile): void => { +// uploadRef.value.data.path = uploadFile.name +// } +// 鏂囦欢涓婁紶鎴愬姛 +const handleFileSuccess: UploadProps['onSuccess'] = (res: any): void => { + message.success('涓婁紶鎴愬姛') + // 鍒犻櫎鑷韩 + const index = fileList.value.findIndex((item) => item.response?.data === res.data) + fileList.value.splice(index, 1) + uploadList.value.push({ name: res.data, url: res.data }) + if (uploadList.value.length == uploadNumber.value) { + fileList.value.push(...uploadList.value) + uploadList.value = [] + uploadNumber.value = 0 + emitUpdateModelValue() + } + emit( "fileUploadEnd" ) +} +// 鏂囦欢鏁拌秴鍑烘彁绀� +const handleExceed: UploadProps['onExceed'] = (): void => { + message.error(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃${props.limit}涓�!`) +} +// 涓婁紶閿欒鎻愮ず +const excelUploadError: UploadProps['onError'] = (): void => { + message.error('瀵煎叆鏁版嵁澶辫触锛岃鎮ㄩ噸鏂颁笂浼狅紒') + emit( "fileUploadEnd" ) +} +// 鍒犻櫎涓婁紶鏂囦欢 +const handleRemove = (file: UploadFile) => { + const index = fileList.value.map((f) => f.name).indexOf(file.name) + if (index > -1) { + fileList.value.splice(index, 1) + emitUpdateModelValue() + } +} +const handlePreview: UploadProps['onPreview'] = (uploadFile) => { + console.log(uploadFile) +} + +// 鐩戝惉妯″瀷缁戝畾鍊煎彉鍔� +watch( + () => props.modelValue, + (val: string | string[]) => { + if (!val) { + fileList.value = [] // fix锛氬鐞嗘帀缂撳瓨锛岃〃鍗曢噸缃悗涓婁紶缁勪欢鐨勫唴瀹瑰苟娌℃湁閲嶇疆 + return + } + + fileList.value = [] // 淇濋殰鏁版嵁涓虹┖ + // 鎯呭喌1锛氬瓧绗︿覆 + if (isString(val)) { + fileList.value.push( + ...val.split(',').map((url) => ({ name: url.substring(url.lastIndexOf('/') + 1), url })) + ) + return + } + // 鎯呭喌2锛氭暟缁� + fileList.value.push( + ...(val as string[]).map((url) => ({ name: url.substring(url.lastIndexOf('/') + 1), url })) + ) + }, + { immediate: true, deep: true } +) +// 鍙戦�佹枃浠堕摼鎺ュ垪琛ㄦ洿鏂� +const emitUpdateModelValue = () => { + // 鎯呭喌1锛氭暟缁勭粨鏋� + let result: string | string[] = fileList.value.map((file) => file.url!) + // 鎯呭喌2锛氶�楀彿鍒嗛殧鐨勫瓧绗︿覆 + if (props.limit === 1 || isString(props.modelValue)) { + result = result.join(',') + } + emit('update:modelValue', result) +} +// 鍙戦�佹枃浠堕摼鎺ュ垪琛ㄦ洿鏂� +const emitUpdateDuration = () => { + emit('getDuration', duration,fileName.value) +} +// 璁$畻鏂囦欢绫诲瀷鐨� accept 灞炴�у�� +const acceptFormat = computed(() => { + return props.fileType.map(type => { + // 瀵瑰父瑙佹枃浠剁被鍨嬭繘琛� MIME type 鏄犲皠 + const mimeTypes = { + // 鍥剧墖绫诲瀷 + 'png': 'image/png', + 'jpg': 'image/jpeg', + 'jpeg': 'image/jpeg', + 'gif': 'image/gif', + // 闊抽绫诲瀷 + 'mp3': 'audio/mpeg', + 'wav': 'audio/wav', + 'm4a': 'audio/mp4', + // 瑙嗛绫诲瀷 + 'mp4': 'video/mp4', + // 鏂囨。绫诲瀷 + 'doc': '.doc', + 'docx': '.docx', + 'xls': '.xls', + 'xlsx': '.xlsx', + 'pdf': 'application/pdf', + 'txt': 'text/plain', + 'ppt': '.ppt', + 'pptx': '.pptx' + }[type.toLowerCase()] || `.${type}` + + return mimeTypes + }).join(',') +}) +</script> +<style lang="scss" scoped> +.upload-file-uploader { + margin-bottom: 5px; +} + +:deep(.upload-file-list .el-upload-list__item) { + position: relative; + margin-bottom: 10px; + line-height: 2; + border: 1px solid #e4e7ed; +} + +:deep(.el-upload-list__item-file-name) { + max-width: 250px; +} + +:deep(.upload-file-list .ele-upload-list__item-content) { + display: flex; + justify-content: space-between; + align-items: center; + color: inherit; +} + +:deep(.ele-upload-list__item-content-action .el-link) { + margin-right: 10px; +} + +.file-list-item { + border: 1px dashed var(--el-border-color-darker); + border-radius: 8px; +} +.upload-describe { + b { + white-space: pre-line; + display: inline-block; + } +} +</style> -- Gitblit v1.9.3