From 79b9c73e0717c244391ab1e15c6f6da9975f2610 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 12 十一月 2024 15:58:30 +0800
Subject: [PATCH] 打包bug
---
src/components/FileUpload/index.vue | 333 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 190 insertions(+), 143 deletions(-)
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index be99ac0..f102321 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -3,215 +3,262 @@
<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"
+ :on-exceed="handleExceed"
+ :before-upload="handleBeforeUpload"
>
<!-- 涓婁紶鎸夐挳 -->
<el-button type="primary">閫夊彇鏂囦欢</el-button>
+ <!-- <el-progress :percentage="downloadProgress" />-->
</el-upload>
<!-- 涓婁紶鎻愮ず -->
<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>
- 鐨勬枃浠�
+ <span>涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃200MB</span>
</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>
</div>
</template>
<script setup lang="ts">
-import { listByIds, delOss } from "@/api/system/oss";
+import { listByIds, delOss } from '@/api/system/oss';
import { propTypes } from '@/utils/propTypes';
-import { globalHeaders } from "@/utils/request";
-
+import { globalHeaders } from '@/utils/request';
+import { LoadingInstance } from 'element-plus/es/components/loading/src/loading';
+import router from '@/router';
+let downloadLoadingInstance: LoadingInstance;
const props = defineProps({
- modelValue: [String, Object, Array],
- // 鏁伴噺闄愬埗
- limit: propTypes.number.def(5),
- // 澶у皬闄愬埗(MB)
- fileSize: propTypes.number.def(5),
- // 鏂囦欢绫诲瀷, 渚嬪['png', 'jpg', 'jpeg']
- fileType: propTypes.array.def(["doc", "xls", "ppt", "txt", "pdf"]),
- // 鏄惁鏄剧ず鎻愮ず
- isShowTip: propTypes.bool.def(true),
+ modelValue: [String, Object, Array],
+ // 鏁伴噺闄愬埗
+ limit: propTypes.number.def(1),
+ // 澶у皬闄愬埗(MB)
+ fileSize: propTypes.number.def(200),
+ // 鏂囦欢绫诲瀷, 渚嬪['png', 'jpg', 'jpeg']
+ fileType: propTypes.array.def(['doc', 'docx', 'xlsx', 'xls', 'ppt', 'txt', 'pdf', 'mp3', 'mp4', 'mov', 'png', 'jpg', 'jpeg']),
+ // 鏄惁鏄剧ず鎻愮ず
+ isShowTip: propTypes.bool.def(true)
});
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const emit = defineEmits(['update:modelValue']);
+const emit = defineEmits(['update:modelValue', 'closePopup', 'openPopup']);
const number = ref(0);
const uploadList = ref<any[]>([]);
-
+//浜掕仈缃戠
+// const baseUrl = import.meta.env.VITE_APP_BASE_API;
+// const uploadFileUrl = ref('http://10.248.255.130:18080' + "/resource/oss/upload"); // 涓婁紶鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
+// 鍐呯綉绔�
const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadFileUrl = ref(baseUrl + "/resource/oss/upload"); // 涓婁紶鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
+const uploadFileUrl = ref(baseUrl + '/resource/oss/upload'); // 涓婁紶鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
const headers = ref(globalHeaders());
const fileList = ref<any[]>([]);
-const showTip = computed(
- () => props.isShowTip && (props.fileType || props.fileSize)
-);
+const showTip = computed(() => props.isShowTip && props.fileSize);
const fileUploadRef = ref<ElUploadInstance>();
+const downloadProgress = ref(0);
+// 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>()
-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 });
+const handleCilck = async () => {
+ console.log('瀛愮粍浠舵柟娉�');
+ await fileUploadRef.value!.submit();
+ return number.value;
+ // 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;
- if (!isLt) {
- proxy?.$modal.msgError(`涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 ${props.fileSize} MB!`);
- return false;
- }
+ }
+ // 鏍℃鏂囦欢澶у皬
+ if (props.fileSize) {
+ const isLt = file.size / 1024 / 1024 < props.fileSize;
+ if (!isLt) {
+ proxy?.$modal.msgError(`涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 ${props.fileSize} MB!`);
+ return false;
}
- proxy?.$modal.loading("姝ｅ湪涓婁紶鏂囦欢锛岃绋嶅��...");
- number.value++;
- return true;
-}
+ }
+ number.value++;
+ return true;
+};
// 鏂囦欢涓暟瓒呭嚭
const handleExceed = () => {
- proxy?.$modal.msgError(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${props.limit} 涓�!`);
-}
+ proxy?.$modal.msgError(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${props.limit} 涓�!`);
+};
// 涓婁紶澶辫触
const handleUploadError = () => {
- proxy?.$modal.msgError("涓婁紶鏂囦欢澶辫触");
-}
-
+ proxy?.$modal.msgError('涓婁紶鏂囦欢澶辫触');
+};
+const debounce = (fn: Function, delay = 1500) => {
+ let timer: number | null = null;
+ return (...args: any[]) => {
+ if (timer) {
+ clearTimeout(timer);
+ }
+ timer = setTimeout(() => {
+ fn(...args);
+ }, delay);
+ };
+};
+const handleUploadProgress = (e: any) => {
+ console.log('handleUploadProgress锛�');
+ // downloadProgress.value = downloadProgress.value + 50
+ // emit('closePopup','123123');
+ // emit('openPopup','123123');
+};
// 涓婁紶鎴愬姛鍥炶皟
const handleUploadSuccess = (res: any, file: UploadFile) => {
- if (res.code === 200) {
- uploadList.value.push({ name: res.data.fileName, url: res.data.url, ossId: res.data.ossId });
- uploadedSuccessfully();
- } else {
- number.value--;
- proxy?.$modal.closeLoading();
- proxy?.$modal.msgError(res.msg);
- fileUploadRef.value?.handleRemove(file);
- uploadedSuccessfully();
- }
-}
+ console.log(res, 'resresres');
+ if (res.code === 200) {
+ proxy?.$modal.msgSuccess('涓婁紶鏂囦欢鎴愬姛');
+ setTimeout(() => {
+ emit('closePopup', res);
+ }, 1000);
+ console.log('璋冪敤鐖剁粍浠�', res);
+ fileUploadRef.value!.clearFiles();
+ downloadLoadingInstance.close();
+ // uploadList.value.push({ name: res.data.fileName, url: res.data.url, ossId: res.data.ossId });
+ uploadedSuccessfully();
+ } else if (res.code == 401) {
+ location.reload();
+ } else {
+ number.value--;
+ // proxy?.$modal.closeLoading();
+ proxy?.$modal.msgError(res.msg);
+ fileUploadRef.value?.handleRemove(file);
+ uploadedSuccessfully();
+ }
+};
// 鍒犻櫎鏂囦欢
const handleDelete = (index: number) => {
- let ossId = fileList.value[index].ossId;
- delOss(ossId);
- fileList.value.splice(index, 1);
- emit("update:modelValue", listToString(fileList.value));
-}
+ let ossId = fileList.value[index].ossId;
+ delOss(ossId);
+ fileList.value.splice(index, 1);
+ emit('update:modelValue', listToString(fileList.value));
+};
// 涓婁紶缁撴潫澶勭悊
const uploadedSuccessfully = () => {
- if (number.value > 0 && uploadList.value.length === number.value) {
- fileList.value = fileList.value.filter(f => f.url !== undefined).concat(uploadList.value);
- uploadList.value = [];
- number.value = 0;
- emit("update:modelValue", listToString(fileList.value));
- proxy?.$modal.closeLoading();
- }
-}
+ if (number.value > 0 && uploadList.value.length === number.value) {
+ fileList.value = fileList.value.filter((f) => f.url !== undefined).concat(uploadList.value);
+ uploadList.value = [];
+ number.value = 0;
+ emit('update:modelValue', listToString(fileList.value));
+ proxy?.$modal.closeLoading();
+ }
+};
// 鑾峰彇鏂囦欢鍚嶇О
const getFileName = (name: string) => {
- // 濡傛灉鏄痷rl閭ｄ箞鍙栨渶鍚庣殑鍚嶅瓧 濡傛灉涓嶆槸鐩存帴杩斿洖
- if (name.lastIndexOf("/") > -1) {
- return name.slice(name.lastIndexOf("/") + 1);
- } else {
- return name;
- }
-}
+ // 濡傛灉鏄痷rl閭ｄ箞鍙栨渶鍚庣殑鍚嶅瓧 濡傛灉涓嶆槸鐩存帴杩斿洖
+ if (name.lastIndexOf('/') > -1) {
+ return name.slice(name.lastIndexOf('/') + 1);
+ } else {
+ return name;
+ }
+};
// 瀵硅薄杞垚鎸囧畾瀛楃涓插垎闅�
const listToString = (list: any[], separator?: string) => {
- let strs = "";
- separator = separator || ",";
- list.forEach(item => {
- if (item.ossId) {
- strs += item.ossId + separator;
- }
- })
- return strs != "" ? strs.substring(0, strs.length - 1) : "";
-}
+ let strs = '';
+ separator = separator || ',';
+ list.forEach((item) => {
+ if (item.ossId) {
+ strs += item.ossId + separator;
+ }
+ });
+ return strs != '' ? strs.substring(0, strs.length - 1) : '';
+};
</script>
<style scoped lang="scss">
.upload-file-uploader {
- margin-bottom: 5px;
+ margin-bottom: 5px;
}
.upload-file-list .el-upload-list__item {
- border: 1px solid #e4e7ed;
- line-height: 2;
- margin-bottom: 10px;
- position: relative;
+ border: 1px solid #e4e7ed;
+ line-height: 2;
+ margin-bottom: 10px;
+ position: relative;
}
.upload-file-list .ele-upload-list__item-content {
- display: flex;
- justify-content: space-between;
- align-items: center;
- color: inherit;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ color: inherit;
}
.ele-upload-list__item-content-action .el-link {
- margin-right: 10px;
+ margin-right: 10px;
}
</style>
--
Gitblit v1.8.0