From d7cf341eb3ea09e43a1ecad38385812ec5a30723 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 15 七月 2022 14:45:56 +0800
Subject: [PATCH] update 格式化代码
---
ruoyi-ui/src/components/FileUpload/index.vue | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/ruoyi-ui/src/components/FileUpload/index.vue
index 46da967..e999f14 100644
--- a/ruoyi-ui/src/components/FileUpload/index.vue
+++ b/ruoyi-ui/src/components/FileUpload/index.vue
@@ -1,6 +1,7 @@
<template>
<div class="upload-file">
<el-upload
+ multiple
:action="uploadFileUrl"
:before-upload="handleBeforeUpload"
:file-list="fileList"
@@ -40,6 +41,7 @@
<script>
import { getToken } from "@/utils/auth";
+import { listByIds, delOss } from "@/api/system/oss";
export default {
name: "FileUpload",
@@ -69,6 +71,8 @@
},
data() {
return {
+ number: 0,
+ uploadList: [],
baseUrl: process.env.VUE_APP_BASE_API,
uploadFileUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 涓婁紶鐨勫浘鐗囨湇鍔″櫒鍦板潃
headers: {
@@ -79,16 +83,24 @@
},
watch: {
value: {
- handler(val) {
+ async handler(val) {
if (val) {
let temp = 1;
// 棣栧厛灏嗗�艰浆涓烘暟缁�
- const list = Array.isArray(val) ? val : this.value.split(',');
+ 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;
+ });
+ })
+ }
// 鐒跺悗灏嗘暟缁勮浆涓哄璞℃暟缁�
this.fileList = list.map(item => {
- if (typeof item === "string") {
- item = { name: item, url: item };
- }
+ item = { name: item.name, url: item.url, ossId: item.ossId };
item.uid = item.uid || new Date().getTime() + temp++;
return item;
});
@@ -122,7 +134,7 @@
return false;
});
if (!isTypeOk) {
- this.$message.error(`鏂囦欢鏍煎紡涓嶆纭�, 璇蜂笂浼�${this.fileType.join("/")}鏍煎紡鏂囦欢!`);
+ this.$modal.msgError(`鏂囦欢鏍煎紡涓嶆纭�, 璇蜂笂浼�${this.fileType.join("/")}鏍煎紡鏂囦欢!`);
return false;
}
}
@@ -130,42 +142,53 @@
if (this.fileSize) {
const isLt = file.size / 1024 / 1024 < this.fileSize;
if (!isLt) {
- this.$message.error(`涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 ${this.fileSize} MB!`);
+ this.$modal.msgError(`涓婁紶鏂囦欢澶у皬涓嶈兘瓒呰繃 ${this.fileSize} MB!`);
return false;
}
}
+ this.$modal.loading("姝ｅ湪涓婁紶鏂囦欢锛岃绋嶅��...");
+ this.number++;
return true;
},
// 鏂囦欢涓暟瓒呭嚭
handleExceed() {
- this.$message.error(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${this.limit} 涓�!`);
+ this.$modal.msgError(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${this.limit} 涓�!`);
},
// 涓婁紶澶辫触
handleUploadError(err) {
- this.$message.error("涓婁紶澶辫触, 璇烽噸璇�");
+ this.$modal.msgError("涓婁紶鍥剧墖澶辫触锛岃閲嶈瘯");
+ this.$modal.closeLoading()
},
// 涓婁紶鎴愬姛鍥炶皟
handleUploadSuccess(res, file) {
if (res.code === 200) {
- this.$message.success("涓婁紶鎴愬姛");
- this.fileList.push({ name: res.data.fileName, url: res.data.url });
- this.$emit("input", this.listToString(this.fileList));
+ this.uploadList.push({ name: res.data.fileName, url: res.data.url, ossId: res.data.ossId });
+ if (this.uploadList.length === this.number) {
+ this.fileList = this.fileList.concat(this.uploadList);
+ this.uploadList = [];
+ this.number = 0;
+ this.$emit("input", this.listToString(this.fileList));
+ this.$modal.closeLoading();
+ }
} else {
- this.$message.error(res.msg);
- this.loading.close();
+ this.$modal.msgError(res.msg);
+ this.$modal.closeLoading();
}
},
// 鍒犻櫎鏂囦欢
handleDelete(index) {
+ let ossId = this.fileList[index].ossId;
+ delOss(ossId);
this.fileList.splice(index, 1);
this.$emit("input", this.listToString(this.fileList));
},
// 鑾峰彇鏂囦欢鍚嶇О
getFileName(name) {
+ // 濡傛灉鏄痷rl閭ｄ箞鍙栨渶鍚庣殑鍚嶅瓧 濡傛灉涓嶆槸鐩存帴杩斿洖
if (name.lastIndexOf("/") > -1) {
- return name.slice(name.lastIndexOf("/") + 1).toLowerCase();
+ return name.slice(name.lastIndexOf("/") + 1);
} else {
- return "";
+ return name;
}
},
// 瀵硅薄杞垚鎸囧畾瀛楃涓插垎闅�
@@ -173,7 +196,7 @@
let strs = "";
separator = separator || ",";
for (let i in list) {
- strs += list[i].url + separator;
+ strs += list[i].ossId + separator;
}
return strs != "" ? strs.substr(0, strs.length - 1) : "";
},
--
Gitblit v1.9.3