From 67864e67b33e2c320e7ac5c8d5db48ab8124e1fc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 26 四月 2023 22:47:28 +0800
Subject: [PATCH] fix 修复 oss 路径漏改问题
---
src/components/FileUpload/index.vue | 243 +++++++++++++++++++++++++-----------------------
1 files changed, 126 insertions(+), 117 deletions(-)
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index a5c2734..a46d5ee 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -12,7 +12,7 @@
:show-file-list="false"
:headers="headers"
class="upload-file-uploader"
- ref="fileUpload"
+ ref="fileUploadRef"
>
<!-- 涓婁紶鎸夐挳 -->
<el-button type="primary">閫夊彇鏂囦欢</el-button>
@@ -20,8 +20,12 @@
<!-- 涓婁紶鎻愮ず -->
<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>
+ <template v-if="fileType">
+ 鏍煎紡涓� <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
+ </template>
鐨勬枃浠�
</div>
<!-- 鏂囦欢鍒楄〃 -->
@@ -38,161 +42,166 @@
</div>
</template>
-<script setup>
+<script setup lang="ts">
import { getToken } from "@/utils/auth";
import { listByIds, delOss } from "@/api/system/oss";
+import { ComponentInternalInstance } from "vue";
+import { ElUpload, UploadFile } from "element-plus";
const props = defineProps({
- modelValue: [String, Object, Array],
- // 鏁伴噺闄愬埗
- limit: {
- type: Number,
- default: 5,
- },
- // 澶у皬闄愬埗(MB)
- fileSize: {
- type: Number,
- default: 5,
- },
- // 鏂囦欢绫诲瀷, 渚嬪['png', 'jpg', 'jpeg']
- fileType: {
- type: Array,
- default: () => ["doc", "xls", "ppt", "txt", "pdf"],
- },
- // 鏄惁鏄剧ず鎻愮ず
- isShowTip: {
- type: Boolean,
- default: true
- }
+ modelValue: [String, Object, Array],
+ // 鏁伴噺闄愬埗
+ limit: {
+ type: Number,
+ default: 5,
+ },
+ // 澶у皬闄愬埗(MB)
+ fileSize: {
+ type: Number,
+ default: 5,
+ },
+ // 鏂囦欢绫诲瀷, 渚嬪['png', 'jpg', 'jpeg']
+ fileType: {
+ type: Array,
+ default: () => ["doc", "xls", "ppt", "txt", "pdf"],
+ },
+ // 鏄惁鏄剧ず鎻愮ず
+ isShowTip: {
+ type: Boolean,
+ default: true
+ }
});
-const { proxy } = getCurrentInstance();
-const emit = defineEmits();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const emit = defineEmits(['update:modelValue']);
const number = ref(0);
-const uploadList = ref([]);
+const uploadList = ref<any[]>([]);
+
const baseUrl = import.meta.env.VITE_APP_BASE_API;
-const uploadFileUrl = ref(baseUrl + "/system/oss/upload"); // 涓婁紶鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
+const uploadFileUrl = ref(baseUrl + "/resource/oss/upload"); // 涓婁紶鏂囦欢鏈嶅姟鍣ㄥ湴鍧�
const headers = ref({ Authorization: "Bearer " + getToken() });
-const fileList = ref([]);
+
+const fileList = ref<any[]>([]);
const showTip = computed(
- () => props.isShowTip && (props.fileType || props.fileSize)
+ () => props.isShowTip && (props.fileType || props.fileSize)
);
+const fileUploadRef = ref(ElUpload);
+
watch(() => props.modelValue, async val => {
- if (val) {
- let temp = 1;
- // 棣栧厛灏嗗�艰浆涓烘暟缁�
- let list;
- if (Array.isArray(val)) {
- list = val;
- } else {
- await listByIds(val).then(res => {
- list = res.data.map(oss => {
- oss = { name: oss.originalName, url: oss.url, ossId: oss.ossId };
- return oss;
+ 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 [];
}
- // 鐒跺悗灏嗘暟缁勮浆涓哄璞℃暟缁�
- 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 });
// 涓婁紶鍓嶆牎妫�鏍煎紡鍜屽ぇ灏�
-function handleBeforeUpload(file) {
- // 鏍℃鏂囦欢绫诲瀷
- 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;
+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.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;
+ proxy?.$modal.loading("姝ｅ湪涓婁紶鏂囦欢锛岃绋嶅��...");
+ number.value++;
+ return true;
}
// 鏂囦欢涓暟瓒呭嚭
-function handleExceed() {
- proxy.$modal.msgError(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${props.limit} 涓�!`);
+const handleExceed = () => {
+ proxy?.$modal.msgError(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${props.limit} 涓�!`);
}
// 涓婁紶澶辫触
-function handleUploadError(err) {
- proxy.$modal.msgError("涓婁紶鏂囦欢澶辫触");
+const handleUploadError = () => {
+ proxy?.$modal.msgError("涓婁紶鏂囦欢澶辫触");
}
// 涓婁紶鎴愬姛鍥炶皟
-function handleUploadSuccess(res, file) {
- 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);
- proxy.$refs.fileUpload.handleRemove(file);
- uploadedSuccessfully();
- }
+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();
+ }
}
// 鍒犻櫎鏂囦欢
-function handleDelete(index) {
- let ossId = fileList.value[index].ossId;
- delOss(ossId);
- fileList.value.splice(index, 1);
- emit("update:modelValue", listToString(fileList.value));
+const handleDelete = (index: number) => {
+ let ossId = fileList.value[index].ossId;
+ delOss(ossId);
+ fileList.value.splice(index, 1);
+ emit("update:modelValue", listToString(fileList.value));
}
// 涓婁紶缁撴潫澶勭悊
-function 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();
- }
+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();
+ }
}
// 鑾峰彇鏂囦欢鍚嶇О
-function getFileName(name) {
- // 濡傛灉鏄痷rl閭ｄ箞鍙栨渶鍚庣殑鍚嶅瓧 濡傛灉涓嶆槸鐩存帴杩斿洖
- if (name.lastIndexOf("/") > -1) {
- return name.slice(name.lastIndexOf("/") + 1);
- } else {
- return name;
- }
+const getFileName = (name: string) => {
+ // 濡傛灉鏄痷rl閭ｄ箞鍙栨渶鍚庣殑鍚嶅瓧 濡傛灉涓嶆槸鐩存帴杩斿洖
+ if (name.lastIndexOf("/") > -1) {
+ return name.slice(name.lastIndexOf("/") + 1);
+ } else {
+ return name;
+ }
}
// 瀵硅薄杞垚鎸囧畾瀛楃涓插垎闅�
-function listToString(list, separator) {
- let strs = "";
- separator = separator || ",";
- for (let i in list) {
- if(list[i].ossId) {
- strs += list[i].ossId + separator;
- }
- }
- return strs != "" ? strs.substr(0, strs.length - 1) : "";
+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) : "";
}
</script>
--
Gitblit v1.9.3