From a0e2a39aabfaffbe6861187fd99268b2529f2b9e Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 07 八月 2026 09:41:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/components/upload/file-upload.vue | 31 +++----------------------------
1 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/src/components/upload/file-upload.vue b/src/components/upload/file-upload.vue
index 15eb640..6296579 100644
--- a/src/components/upload/file-upload.vue
+++ b/src/components/upload/file-upload.vue
@@ -10,12 +10,9 @@
import { IconifyIcon } from '@vben/icons';
import { $t } from '@vben/locales';
-import { checkFileType, isFunction, isImage, isObject, isString } from '@vben/utils';
+import { checkFileType, isFunction, isObject, isString } from '@vben/utils';
import { Button, message, Upload } from 'ant-design-vue';
-
-import { requestClient } from '#/api/request';
-import { FilePreviewModal, useFilePreview } from '#/components/file-preview';
import { UploadResultStatus } from './typing';
import { useUpload, useUploadType } from './use-upload';
@@ -142,31 +139,14 @@
}
}
-const { openPreview, previewState } = useFilePreview();
-const previewLoading = ref(false);
-
/** 澶勭悊鏂囦欢棰勮 */
-async function handlePreview(file: UploadFile) {
+function handlePreview(file: UploadFile) {
const url = (file as any)?.url || (file as any)?.response?.url || (file as any)?.response;
if (!url) {
message.warning('鏂囦欢鍦板潃涓嶅瓨鍦紝鏃犳硶棰勮');
return;
}
- const name = file.name || (file as any)?.fileName || '';
- if (isImage(name || url)) {
- window.open(url, '_blank');
- return;
- }
- previewLoading.value = true;
- try {
- const blob = await requestClient.get(url, { responseType: 'blob' }) as unknown as Blob;
- const blobUrl = URL.createObjectURL(blob);
- openPreview(blobUrl, name);
- } catch {
- message.error('鏂囦欢鍔犺浇澶辫触锛岃灏濊瘯涓嬭浇鍚庢煡鐪�');
- } finally {
- previewLoading.value = false;
- }
+ window.open(url, '_blank');
emit('preview', file);
}
@@ -345,11 +325,6 @@
鏍煎紡鏂囦欢
</div>
</Upload>
- <FilePreviewModal
- v-model:visible="previewState.visible.value"
- :file-url="previewState.fileUrl.value"
- :file-name="previewState.fileName.value"
- />
</div>
</template>
--
Gitblit v1.9.3