Merge remote-tracking branch 'origin/master'

du

2025-04-01 4b80e89973960907915dedddbd73fd2dd4578261

 easegen-front/src/views/digitalcourse/digitalhumans/DigitalHumansForm.vue

@@ -54,7 +54,10 @@
              当前正在处理并上传中，请耐心等待...
          </div>
        </div> -->
        <video-player v-if="formData.videoUrl || formData.fixVideoUrl" :property="videoProperty"/>
        <!-- 原视频播放器 -->
        <!-- <video-player 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-select v-model="formData.matting" :placeholder="请选择抠图标识">
@@ -97,6 +100,7 @@
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 { useUpload } from '@/components/UploadFile/src/useUpload'