From e4267c5c5605704ca8eae2dfc55efdb475f2ec1c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 10 五月 2022 23:45:33 +0800
Subject: [PATCH] update 优化 弹窗点击遮罩层 默认不关闭 可在 main.js 修改
---
ruoyi-ui/src/components/ImageUpload/index.vue | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/components/ImageUpload/index.vue b/ruoyi-ui/src/components/ImageUpload/index.vue
index 11573dd..2d1ed57 100644
--- a/ruoyi-ui/src/components/ImageUpload/index.vue
+++ b/ruoyi-ui/src/components/ImageUpload/index.vue
@@ -44,6 +44,7 @@
<script>
import { getToken } from "@/utils/auth";
+import { delOss } from "@/api/system/oss";
export default {
props: {
@@ -92,8 +93,12 @@
const list = Array.isArray(val) ? val : this.value.split(',');
// 鐒跺悗灏嗘暟缁勮浆涓哄璞℃暟缁�
this.fileList = list.map(item => {
+ // 瀛楃涓插洖鏄惧鐞� 濡傛灉姝ゅ瀛樼殑鏄痷rl鍙洿鎺ュ洖鏄� 濡傛灉瀛樼殑鏄痠d闇�瑕佽皟鐢ㄦ帴鍙ｆ煡鍑烘潵
if (typeof item === "string") {
item = { name: item, url: item };
+ } else {
+ // 姝ゅname浣跨敤ossId 闃叉鍒犻櫎鍑虹幇閲嶅悕
+ item = { name: item.ossId, url: item.url, ossId: item.ossId };
}
return item;
});
@@ -117,19 +122,21 @@
handleRemove(file, fileList) {
const findex = this.fileList.map(f => f.name).indexOf(file.name);
if(findex > -1) {
+ let ossId = this.fileList[findex].ossId;
+ delOss(ossId);
this.fileList.splice(findex, 1);
- this.$emit("input", this.listToString(this.fileList));
+ this.$emit("input", this.fileList);
}
},
// 涓婁紶鎴愬姛鍥炶皟
handleUploadSuccess(res) {
if (res.code == 200) {
- this.uploadList.push({ name: res.data.fileName, url: res.data.url });
+ 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.$emit("input", this.fileList);
this.$modal.closeLoading();
}
} else {
@@ -182,15 +189,6 @@
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
- // 瀵硅薄杞垚鎸囧畾瀛楃涓插垎闅�
- listToString(list, separator) {
- let strs = "";
- separator = separator || ",";
- for (let i in list) {
- strs += list[i].url + separator;
- }
- return strs != '' ? strs.substr(0, strs.length - 1) : '';
- }
}
};
</script>
--
Gitblit v1.9.3