From 0692f4289ee0046a50602adc065f1ececa90dfea Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期日, 19 十月 2025 16:54:29 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobAdminBClient into dev-1.2.0.1
---
src/utils/common/file.ts | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/utils/common/file.ts b/src/utils/common/file.ts
index 25cbd9a..7346b89 100644
--- a/src/utils/common/file.ts
+++ b/src/utils/common/file.ts
@@ -8,12 +8,17 @@
return _url.startsWith('/') ? _url : '/' + _url;
}
+type ConvertApi2FormUrlOptions = {
+ fileName?: string;
+};
+
/**
* 鎶奱pi杩斿洖鐨勮矾寰勮浆鎹负upload鐨勮矾寰�
*/
-export function convertApi2FormUrl(path: string) {
+export function convertApi2FormUrl(path: string, options: ConvertApi2FormUrlOptions = {}) {
+ const { fileName } = options;
return {
- name: setOssFileName(path),
+ name: fileName ? fileName : setOssFileName(path),
path: urlOmitDomain(path),
url: setOSSLink(path),
status: 'success',
@@ -21,8 +26,8 @@
} as UploadUserFile;
}
-export function convertApi2FormUrlOnlyOne(path: string) {
- return path ? [convertApi2FormUrl(path)] : [];
+export function convertApi2FormUrlOnlyOne(path: string, options: ConvertApi2FormUrlOptions = {}) {
+ return path ? [convertApi2FormUrl(path, options)] : [];
}
/**
--
Gitblit v1.9.1