From 858df78951d5c29e8d4217cffcf81d2cc4fabcd4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 03 八月 2026 14:58:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/components/upload/image-upload.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/components/upload/image-upload.vue b/src/components/upload/image-upload.vue
index e1703d1..78b7aa0 100644
--- a/src/components/upload/image-upload.vue
+++ b/src/components/upload/image-upload.vue
@@ -8,15 +8,15 @@
import { computed, ref, toRefs, watch } from 'vue';
-import { IconifyIcon } from '..\..\packages\icons\src';
-import { $t } from '..\..\packages\locales\src';
+import { IconifyIcon } from '@vben/icons';
+import { $t } from '@vben/locales';
import {
defaultImageAccepts,
isFunction,
isImage,
isObject,
isString,
-} from '..\..\packages\utils\src';
+} from '@vben/utils';
import { message, Modal, Upload } from 'ant-design-vue';
@@ -239,8 +239,10 @@
// 娣诲姞鍒颁复鏃朵笂浼犲垪琛�
const fileUrl = res?.url || res?.data || res;
uploadList.value.push({
- name: file.name,
+ name: res?.name || file.name,
url: fileUrl,
+ id: res?.id,
+ response: res,
status: UploadResultStatus.DONE,
uid: file.name + Date.now(),
});
--
Gitblit v1.9.3