From f48271fc27e5af1b7ff2b76ccbd7dc092d7d3d60 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Tue, 22 Nov 2022 00:36:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6API=E5=85=A5=E5=8F=82=E8=B0=83=E6=95=B4=E4=B8=BA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 23d885a4963dd786a92305d84c7d263a2f882a10
---
 src/api/file/index.ts                 |  6 +++---
 src/components/Upload/MultiUpload.vue | 16 +++-------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/api/file/index.ts b/src/api/file/index.ts
index 80cc5e5f..350ce7df 100644
--- a/src/api/file/index.ts
+++ b/src/api/file/index.ts
@@ -23,12 +23,12 @@ export function uploadFileApi(file: File): AxiosPromise<FileInfo> {
 /**
  * 删除文件
  *
- * @param fileName 文件名
+ * @param filePath 文件完整路径
  */
-export function deleteFileApi(fileName?: string) {
+export function deleteFileApi(filePath?: string) {
   return request({
     url: '/api/v1/files',
     method: 'delete',
-    params: { fileName: fileName }
+    params: { filePath: filePath }
   });
 }
diff --git a/src/components/Upload/MultiUpload.vue b/src/components/Upload/MultiUpload.vue
index fec47b23..417eaef2 100644
--- a/src/components/Upload/MultiUpload.vue
+++ b/src/components/Upload/MultiUpload.vue
@@ -110,20 +110,10 @@ async function handleUpload(options: UploadRequestOptions): Promise<any> {
  * 删除图片
  */
 function handleRemove(removeFile: UploadFile) {
-  console.log('removeFile', removeFile);
+  const filePath = removeFile.url;
 
-  const fileUrl = removeFile.url;
-
-  if (fileUrl) {
-    let fileName = removeFile.name;
-
-    if (!fileName) {
-      // 文件名不存在，从URL得到文件名
-      // 例： https://oss.youlai.tech/default/2022/11/20/{uuid}.jpg  得到文件名 2022/11/20/{uuid}.jpg
-      fileName = fileUrl.substring(fileUrl.indexOf('/', -3) + 1);
-    }
-
-    deleteFileApi(fileName).then(() => {
+  if (filePath) {
+    deleteFileApi(filePath).then(() => {
       // 删除成功回调
       emit(
         'update:modelValue',