From b08db2d2a75bd8df5f648d856cb160ada7ff0068 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 09 十一月 2023 10:30:01 +0800
Subject: [PATCH] 修改视频专网
---
src/components/FileUpload/index.vue | 164 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 102 insertions(+), 62 deletions(-)
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index bd9f099..681185a 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -3,16 +3,14 @@
<el-upload
multiple
:action="uploadFileUrl"
- :before-upload="handleBeforeUpload"
- :file-list="fileList"
- :limit="limit"
- :on-error="handleUploadError"
- :on-exceed="handleExceed"
:on-success="handleUploadSuccess"
- :show-file-list="false"
+ :limit="limit"
+ :on-progress="handleUploadProgress"
+ :show-file-list="true"
:headers="headers"
class="upload-file-uploader"
ref="fileUploadRef"
+ :auto-upload="false"
>
<!-- 涓婁紶鎸夐挳 -->
<el-button type="primary">閫夊彇鏂囦欢</el-button>
@@ -20,25 +18,23 @@
<!-- 涓婁紶鎻愮ず -->
<div class="el-upload__tip" v-if="showTip">
璇蜂笂浼�
- <template v-if="fileSize">
- 澶у皬涓嶈秴杩� <b style="color: #f56c6c">{{ fileSize }}MB</b>
- </template>
- <template v-if="fileType">
- 鏍煎紡涓� <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
- </template>
- 鐨勬枃浠�
+<!-- <template v-if="fileSize">-->
+<!-- 澶у皬涓嶈秴杩� <b style="color: #f56c6c">{{ fileSize }}MB</b>-->
+<!-- </template>-->
+
+ 鏂囦欢
</div>
<!-- 鏂囦欢鍒楄〃 -->
- <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
- <li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
- <el-link :href="`${file.url}`" :underline="false" target="_blank">
- <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
- </el-link>
- <div class="ele-upload-list__item-content-action">
- <el-link :underline="false" @click="handleDelete(index)" type="danger">鍒犻櫎</el-link>
- </div>
- </li>
- </transition-group>
+<!-- <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">-->
+<!-- <li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">-->
+<!-- <el-link :href="`${file.url}`" :underline="false" target="_blank">-->
+<!-- <span class="el-icon-document"> {{ getFileName(file.name) }} </span>-->
+<!-- </el-link>-->
+<!-- <div class="ele-upload-list__item-content-action">-->
+<!-- <el-link :underline="false" @click="handleDelete(index)" type="danger">鍒犻櫎</el-link>-->
+<!-- </div>-->
+<!-- </li>-->
+<!-- </transition-group>-->
</div>
</template>
@@ -46,11 +42,12 @@
import { listByIds, delOss } from "@/api/system/oss";
import { propTypes } from '@/utils/propTypes';
import { globalHeaders } from "@/utils/request";
-
+import { LoadingInstance } from 'element-plus/es/components/loading/src/loading';
+let downloadLoadingInstance: LoadingInstance;
const props = defineProps({
modelValue: [String, Object, Array],
// 鏁伴噺闄愬埗
- limit: propTypes.number.def(5),
+ limit: propTypes.number.def(10),
// 澶у皬闄愬埗(MB)
fileSize: propTypes.number.def(5),
// 鏂囦欢绫诲瀷, 渚嬪['png', 'jpg', 'jpeg']
@@ -60,7 +57,7 @@
});
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const emit = defineEmits(['update:modelValue']);
+const emit = defineEmits(['update:modelValue','closePopup']);
const number = ref(0);
const uploadList = ref<any[]>([]);
@@ -70,49 +67,85 @@
const fileList = ref<any[]>([]);
const showTip = computed(
- () => props.isShowTip && (props.fileType || props.fileSize)
+ () => props.isShowTip && (props.fileSize)
);
const fileUploadRef = ref<ElUploadInstance>();
-watch(() => props.modelValue, async val => {
- if (val) {
- let temp = 1;
- // 棣栧厛灏嗗�艰浆涓烘暟缁�
- let list = [];
- if (Array.isArray(val)) {
- list = val;
- } else {
- const res = await listByIds(val as string)
- list = res.data.map((oss) => {
- const data = { name: oss.originalName, url: oss.url, ossId: oss.ossId };
- return data;
- });
- }
- // 鐒跺悗灏嗘暟缁勮浆涓哄璞℃暟缁�
- fileList.value = list.map(item => {
- item = { name: item.name, url: item.url, ossId: item.ossId };
- item.uid = item.uid || new Date().getTime() + temp++;
- return item;
- });
- } else {
- fileList.value = [];
- return [];
- }
-}, { deep: true, immediate: true });
+// watch(() => props.modelValue, async val => {
+// console.log(val,props.modelValue);
+// if (val) {
+// let temp = 1;
+// // 棣栧厛灏嗗�艰浆涓烘暟缁�
+// let list = [];
+// if (Array.isArray(val)) {
+// list = val;
+// } else {
+// const res = await listByIds(val as string)
+// list = res.data.map((oss) => {
+// const data = { name: oss.originalName, url: oss.url, ossId: oss.ossId };
+// return data;
+// });
+// }
+// // 鐒跺悗灏嗘暟缁勮浆涓哄璞℃暟缁�
+// fileList.value = list.map(item => {
+// item = { name: item.name, url: item.url, ossId: item.ossId };
+// item.uid = item.uid || new Date().getTime() + temp++;
+// return item;
+// });
+// } else {
+// fileList.value = [];
+// return [];
+// }
+// }, { deep: true, immediate: true });
+// const fileUploadRef = ref<UploadInstance>()
+const handleCilck = async () => {
+ console.log('瀛愮粍浠舵柟娉�');
+ await fileUploadRef.value!.submit()
+
+
+ // let val = props.modelValue
+ // if (val) {
+ // let temp = 1;
+ // // 棣栧厛灏嗗�艰浆涓烘暟缁�
+ // let list = [];
+ // if (Array.isArray(val)) {
+ // list = val;
+ // } else {
+ // const res = await listByIds(val as string)
+ // list = res.data.map((oss) => {
+ // const data = { name: oss.originalName, url: oss.url, ossId: oss.ossId };
+ // return data;
+ // });
+ // }
+ // // 鐒跺悗灏嗘暟缁勮浆涓哄璞℃暟缁�
+ // fileList.value = list.map(item => {
+ // item = { name: item.name, url: item.url, ossId: item.ossId };
+ // item.uid = item.uid || new Date().getTime() + temp++;
+ // return item;
+ // });
+ // } else {
+ // fileList.value = [];
+ // return [];
+ // }
+}
+// 绗簩閮細鏆撮湶鏂规硶
+defineExpose({
+ handleCilck
+})
// 涓婁紶鍓嶆牎妫�鏍煎紡鍜屽ぇ灏�
const handleBeforeUpload = (file: any) => {
// 鏍℃鏂囦欢绫诲瀷
- if (props.fileType.length) {
- const fileName = file.name.split('.');
- const fileExt = fileName[fileName.length - 1];
- const isTypeOk = props.fileType.indexOf(fileExt) >= 0;
- if (!isTypeOk) {
- proxy?.$modal.msgError(`鏂囦欢鏍煎紡涓嶆纭�, 璇蜂笂浼�${props.fileType.join("/")}鏍煎紡鏂囦欢!`);
- return false;
- }
- }
+ // if (props.fileType.length) {
+ // const fileName = file.name.split('.');
+ // const fileExt = fileName[fileName.length - 1];
+ // const isTypeOk = props.fileType.indexOf(fileExt) >= 0;
+ // if (!isTypeOk) {
+ // proxy?.$modal.msgError(`鏂囦欢鏍煎紡涓嶆纭�, 璇蜂笂浼�${props.fileType.join("/")}鏍煎紡鏂囦欢!`);
+ // return false;
+ // }
+ // }
// 鏍℃鏂囦欢澶у皬
if (props.fileSize) {
const isLt = file.size / 1024 / 1024 < props.fileSize;
@@ -135,10 +168,16 @@
const handleUploadError = () => {
proxy?.$modal.msgError("涓婁紶鏂囦欢澶辫触");
}
-
+const handleUploadProgress=(e: any) => {
+ downloadLoadingInstance = ElLoading.service({ text: '姝ｅ湪涓婁紶鏂囦欢锛岃绋嶅��', background: 'rgba(0, 0, 0, 0.7)' });
+}
// 涓婁紶鎴愬姛鍥炶皟
const handleUploadSuccess = (res: any, file: UploadFile) => {
if (res.code === 200) {
+ emit('closePopup')
+ console.log('璋冪敤鐖剁粍浠�');
+ fileUploadRef.value!.clearFiles()
+ downloadLoadingInstance.close();
uploadList.value.push({ name: res.data.fileName, url: res.data.url, ossId: res.data.ossId });
uploadedSuccessfully();
} else {
@@ -147,6 +186,7 @@
proxy?.$modal.msgError(res.msg);
fileUploadRef.value?.handleRemove(file);
uploadedSuccessfully();
+ downloadLoadingInstance.close();
}
}
--
Gitblit v1.8.0