From e5a70efeaa9fd96ce1242e5d582c8237319fade4 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 10 四月 2026 11:13:15 +0800
Subject: [PATCH] Merge branch 'dev_天津_阳光印刷' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津_阳光印刷
---
src/components/FileUpload/index.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 57e62b7..3300aaa 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -100,7 +100,12 @@
// 鐒跺悗灏嗘暟缁勮浆涓哄璞℃暟缁�
fileList.value = list.map((item) => {
if (typeof item === "string") {
- item = { name: item, url: item };
+ item = { name: getFileName(item), url: item };
+ } else {
+ item = { ...item };
+ if (!item.name) {
+ item.name = getFileName(item.url || item.name || "");
+ }
}
item.uid = item.uid || new Date().getTime() + temp++;
return item;
@@ -184,7 +189,7 @@
.concat(uploadList.value);
uploadList.value = [];
number.value = 0;
- emit("update:modelValue", listToString(fileList.value));
+ emit("update:modelValue", fileList.value);
proxy.$modal.closeLoading();
}
}
@@ -221,7 +226,7 @@
onEnd: (evt) => {
const movedItem = fileList.value.splice(evt.oldIndex, 1)[0];
fileList.value.splice(evt.newIndex, 0, movedItem);
- emit("update:modelValue", listToString(fileList.value));
+ emit("update:modelValue", fileList.value);
},
});
});
--
Gitblit v1.9.3