From 4de087b1ad80218d5619f14038d94c3d213ca583 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期一, 21 十月 2024 16:05:26 +0800
Subject: [PATCH] !937 update ruoyi-ui/src/components/ImageUpload/index.vue. Merge pull request !937 from AZP/N/A
---
ruoyi-ui/src/components/ImageUpload/index.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/components/ImageUpload/index.vue b/ruoyi-ui/src/components/ImageUpload/index.vue
index e0140f5..4bb2983 100644
--- a/ruoyi-ui/src/components/ImageUpload/index.vue
+++ b/ruoyi-ui/src/components/ImageUpload/index.vue
@@ -19,7 +19,7 @@
>
<i class="el-icon-plus"></i>
</el-upload>
-
+
<!-- 上传提示 -->
<div class="el-upload__tip" slot="tip" v-if="showTip">
请上传
@@ -44,6 +44,7 @@
<script>
import { getToken } from "@/utils/auth";
+import { isExternal } from "@/utils/validate";
export default {
props: {
@@ -93,7 +94,7 @@
// 然后将数组转为对象数组
this.fileList = list.map(item => {
if (typeof item === "string") {
- if (item.indexOf(this.baseUrl) === -1) {
+ if (item.indexOf(this.baseUrl) === -1 && !isExternal(item)) {
item = { name: this.baseUrl + item, url: this.baseUrl + item };
} else {
item = { name: item, url: item };
@@ -168,7 +169,7 @@
// 删除图片
handleDelete(file) {
const findex = this.fileList.map(f => f.name).indexOf(file.name);
- if(findex > -1) {
+ if (findex > -1) {
this.fileList.splice(findex, 1);
this.$emit("input", this.listToString(this.fileList));
}
@@ -219,8 +220,8 @@
}
::v-deep .el-list-enter, .el-list-leave-active {
- opacity: 0;
- transform: translateY(0);
+ opacity: 0;
+ transform: translateY(0);
}
</style>
--
Gitblit v1.9.2