fix(upload): make sure to carry custom parameters, fix #802

vbenjs · Jun 23, 2021 · c4b22a2 · c4b22a2
1 parent 60b80c9
commit c4b22a2
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,8 @@ dist
 .npmrc
 .cache
 
-test/server/static
+tests/server/static
+tests/server/static/upload
 
 .local
 # local env files

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
@@ -3,6 +3,7 @@
 ### 🐛 Bug Fixes
 
 - **Table** 修复分页抖动问题
+- **Upload** 确保携带自定义参数
 
 ## 2.5.0(2021-06-20)
 

diff --git a/src/utils/http/axios/Axios.ts b/src/utils/http/axios/Axios.ts
@@ -5,7 +5,7 @@ import axios from 'axios';
 import qs from 'qs';
 import { AxiosCanceler } from './axiosCancel';
 import { isFunction } from '/@/utils/is';
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep, omit } from 'lodash-es';
 import { ContentTypeEnum } from '/@/enums/httpEnum';
 import { RequestEnum } from '/@/enums/httpEnum';
 
@@ -136,8 +136,12 @@ export class VAxios {
         formData.append(key, params.data[key]);
       });
     }
-
     formData.append(params.name || 'file', params.file, params.filename);
+    const customParams = omit(params, 'file', 'filename', 'file');
+
+    Object.keys(customParams).forEach((key) => {
+      formData.append(key, customParams[key]);
+    });
 
     return this.axiosInstance.request<T>({
       ...config,

diff --git a/tests/server/static/upload/11.jpg b/tests/server/static/upload/11.jpg
diff --git a/tests/server/static/upload/5ab46a3cN616bdc41.jpg b/tests/server/static/upload/5ab46a3cN616bdc41.jpg
diff --git a/tests/server/static/upload/5ac1bf5fN2522b9dc.jpg b/tests/server/static/upload/5ac1bf5fN2522b9dc.jpg
diff --git a/tests/server/static/upload/5c9ccca8a27f0.png b/tests/server/static/upload/5c9ccca8a27f0.png
diff --git a/tests/server/static/upload/5c9ccca8b27f1.jpg b/tests/server/static/upload/5c9ccca8b27f1.jpg
diff --git a/tests/server/static/upload/5c9ccca8bc1e0.png b/tests/server/static/upload/5c9ccca8bc1e0.png