From 341e3be3a989075bd81cdc57ff6a385bf2635bf6 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 29 十月 2024 16:34:56 +0800
Subject: [PATCH] 优化字典数组条件判断
---
src/components/ImageUpload/index.vue | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 1c1dc74..d232da6 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -9,8 +9,8 @@
:limit="limit"
:on-error="handleUploadError"
:on-exceed="handleExceed"
- name="file"
- :on-remove="handleRemove"
+ ref="imageUpload"
+ :before-remove="handleDelete"
:show-file-list="true"
:headers="headers"
:file-list="fileList"
@@ -47,6 +47,7 @@
<script setup>
import { getToken } from "@/utils/auth";
+import { isExternal } from "@/utils/validate";
const props = defineProps({
modelValue: [String, Object, Array],
@@ -93,7 +94,7 @@
// 鐒跺悗灏嗘暟缁勮浆涓哄璞℃暟缁�
fileList.value = list.map(item => {
if (typeof item === "string") {
- if (item.indexOf(baseUrl) === -1) {
+ if (item.indexOf(baseUrl) === -1 && !isExternal(item)) {
item = { name: baseUrl + item, url: baseUrl + item };
} else {
item = { name: item, url: item };
@@ -106,23 +107,6 @@
return [];
}
},{ deep: true, immediate: true });
-
-// 鍒犻櫎鍥剧墖
-function handleRemove(file, files) {
- emit("update:modelValue", listToString(fileList.value));
-}
-
-// 涓婁紶鎴愬姛鍥炶皟
-function handleUploadSuccess(res) {
- uploadList.value.push({ name: res.fileName, url: res.fileName });
- if (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();
- }
-}
// 涓婁紶鍓峫oading鍔犺浇
function handleBeforeUpload(file) {
@@ -162,6 +146,41 @@
proxy.$modal.msgError(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${props.limit} 涓�!`);
}
+// 涓婁紶鎴愬姛鍥炶皟
+function handleUploadSuccess(res, file) {
+ if (res.code === 200) {
+ uploadList.value.push({ name: res.fileName, url: res.fileName });
+ uploadedSuccessfully();
+ } else {
+ number.value--;
+ proxy.$modal.closeLoading();
+ proxy.$modal.msgError(res.msg);
+ proxy.$refs.imageUpload.handleRemove(file);
+ uploadedSuccessfully();
+ }
+}
+
+// 鍒犻櫎鍥剧墖
+function handleDelete(file) {
+ const findex = fileList.value.map(f => f.name).indexOf(file.name);
+ if (findex > -1 && uploadList.value.length === number.value) {
+ fileList.value.splice(findex, 1);
+ emit("update:modelValue", listToString(fileList.value));
+ return false;
+ }
+}
+
+// 涓婁紶缁撴潫澶勭悊
+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();
+ }
+}
+
// 涓婁紶澶辫触
function handleUploadError() {
proxy.$modal.msgError("涓婁紶鍥剧墖澶辫触");
@@ -189,7 +208,7 @@
<style scoped lang="scss">
// .el-upload--picture-card 鎺у埗鍔犲彿閮ㄥ垎
-::v-deep.hide .el-upload--picture-card {
+:deep(.hide .el-upload--picture-card) {
display: none;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3