From f3d58432c362120c2a8fa5bb5d194d8cc8e9ab50 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 30 十二月 2024 10:08:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/FileUpload/index.vue | 226 ++++++++++++++++++++++++++++----------------------------
1 files changed, 112 insertions(+), 114 deletions(-)
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 8cf4924..073e97c 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -16,39 +16,37 @@
>
<!-- 涓婁紶鎸夐挳 -->
<el-button type="primary">閫夊彇鏂囦欢</el-button>
- <!-- <el-progress :percentage="downloadProgress" />-->
</el-upload>
- <div class="el-upload__tip">
- <span style="color:red;">涓嶆敮鎸佷笂浼�.py銆�.js銆�.bat銆�.vbs銆�.cmd銆�.exe绛夋枃浠�</span>
- </div>
<!-- 涓婁紶鎻愮ず -->
<div class="el-upload__tip" v-if="showTip">
<span>涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃200MB</span>
</div>
+
</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';
+import router from "@/router";
let downloadLoadingInstance: LoadingInstance;
+
const props = defineProps({
- 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', 'zip', 'rar', '7z']),
- // 鏄惁鏄剧ず鎻愮ず
- 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', 'zip', 'rar', '7z']),
+ // 鏄惁鏄剧ず鎻愮ず
+ isShowTip: propTypes.bool.def(true),
});
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const emit = defineEmits(['update:modelValue', 'closePopup', 'openPopup']);
+const emit = defineEmits(['update:modelValue','closePopup','openPopup']);
const number = ref(0);
const uploadList = ref<any[]>([]);
//浜掕仈缃戠
@@ -56,14 +54,16 @@
// 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.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) {
@@ -91,12 +91,12 @@
// }
// }, { deep: true, immediate: true });
// const fileUploadRef = ref<UploadInstance>()
-
const handleCilck = async () => {
console.log('瀛愮粍浠舵柟娉�');
- await fileUploadRef.value!.submit();
- return number.value;
+ await fileUploadRef.value!.submit()
+
+
// let val = props.modelValue
// if (val) {
// let temp = 1;
@@ -121,44 +121,45 @@
// 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;
+ }
}
- }
- number.value++;
- return true;
-};
+ proxy?.$modal.loading("姝ｅ湪涓婁紶鏂囦欢锛岃绋嶅��...");
+ 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[]) => {
@@ -168,100 +169,97 @@
timer = setTimeout(() => {
fn(...args);
}, delay);
- };
-};
-const handleUploadProgress = (e: any) => {
- console.log('handleUploadProgress锛�');
+ }
+}
+const handleUploadProgress=(e: any) => {
// downloadProgress.value = downloadProgress.value + 50
// emit('closePopup','123123');
- // emit('openPopup','123123');
-};
+ emit('openPopup','123123');
+}
// 涓婁紶鎴愬姛鍥炶皟
const handleUploadSuccess = (res: any, file: UploadFile) => {
- 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();
- }
-};
+ console.log(res,'resresres');
+ if (res.code === 200) {
+ proxy?.$modal.msgSuccess("涓婁紶鏂囦欢鎴愬姛");
+ emit('closePopup',res.data)
+ console.log('璋冪敤鐖剁粍浠�',res);
+ fileUploadRef.value!.clearFiles()
+ 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