From 663024ac7fe2c1a60d151e4e645e5e0f553366a4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 20 九月 2022 10:46:43 +0800
Subject: [PATCH] update 优化 pr235 解决小问题与优化写法
---
ruoyi-ui/src/components/FileUpload/index.vue | 61 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/ruoyi-ui/src/components/FileUpload/index.vue b/ruoyi-ui/src/components/FileUpload/index.vue
index f41a712..1095824 100644
--- a/ruoyi-ui/src/components/FileUpload/index.vue
+++ b/ruoyi-ui/src/components/FileUpload/index.vue
@@ -12,7 +12,7 @@
:show-file-list="false"
:headers="headers"
class="upload-file-uploader"
- ref="upload"
+ ref="fileUpload"
>
<!-- 涓婁紶鎸夐挳 -->
<el-button size="mini" type="primary">閫夊彇鏂囦欢</el-button>
@@ -41,7 +41,7 @@
<script>
import { getToken } from "@/utils/auth";
-import { delOss } from "@/api/system/oss";
+import { listByIds, delOss } from "@/api/system/oss";
export default {
name: "FileUpload",
@@ -83,19 +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 => {
- // 瀛楃涓插洖鏄惧鐞� 濡傛灉姝ゅ瀛樼殑鏄痷rl鍙洿鎺ュ洖鏄� 濡傛灉瀛樼殑鏄痠d闇�瑕佽皟鐢ㄦ帴鍙ｆ煡鍑烘潵
- if (typeof item === "string") {
- item = { name: item, url: item };
- } else {
- item = { name: item.name, url: item.url, ossId: item.ossId };
- }
+ item = { name: item.name, url: item.url, ossId: item.ossId };
item.uid = item.uid || new Date().getTime() + temp++;
return item;
});
@@ -152,22 +157,19 @@
// 涓婁紶澶辫触
handleUploadError(err) {
this.$modal.msgError("涓婁紶鍥剧墖澶辫触锛岃閲嶈瘯");
- this.$modal.closeLoading()
+ this.$modal.closeLoading();
},
// 涓婁紶鎴愬姛鍥炶皟
handleUploadSuccess(res, file) {
if (res.code === 200) {
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.fileList);
- this.$modal.closeLoading();
- }
+ this.uploadedSuccessfully();
} else {
- this.$modal.msgError(res.msg);
+ this.number--;
this.$modal.closeLoading();
+ this.$modal.msgError(res.msg);
+ this.$refs.fileUpload.handleRemove(file);
+ this.uploadedSuccessfully();
}
},
// 鍒犻櫎鏂囦欢
@@ -175,7 +177,17 @@
let ossId = this.fileList[index].ossId;
delOss(ossId);
this.fileList.splice(index, 1);
- this.$emit("input", this.fileList);
+ this.$emit("input", this.listToString(this.fileList));
+ },
+ // 涓婁紶缁撴潫澶勭悊
+ uploadedSuccessfully() {
+ if (this.number > 0 && 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();
+ }
},
// 鑾峰彇鏂囦欢鍚嶇О
getFileName(name) {
@@ -186,6 +198,15 @@
return name;
}
},
+ // 瀵硅薄杞垚鎸囧畾瀛楃涓插垎闅�
+ listToString(list, separator) {
+ let strs = "";
+ separator = separator || ",";
+ for (let i in list) {
+ strs += list[i].ossId + separator;
+ }
+ return strs != "" ? strs.substr(0, strs.length - 1) : "";
+ },
},
};
</script>
--
Gitblit v1.9.3