@zwa73/utils 1.0.248 → 1.0.250

package/dist/UtilHttp.d.ts

@@ -237,15 +237,6 @@ export declare class UtilHttp<D extends Partial<RequestOption> & Required<Pick<R
         /**附加的查询表单数据 */
         query: QueryRequestData;
     }) => MPromise<SendProcData>, A>;
-    /**发送form-data包提供的表单数据  */
-    sendFormData(): UtilHttp<D & {
-        headers: {
-            "Content-Type": "multipart/form-data";
-        };
-    }, (opt: RequestOption, arg: {
-        /**form-data包提供的FormData表单数据 */
-        formdata: FormData;
-    }) => MPromise<SendProcData>, A>;
     /**发送表单 */
     sendForm(): UtilHttp<D & {
         headers: {
@@ -255,12 +246,13 @@ export declare class UtilHttp<D extends Partial<RequestOption> & Required<Pick<R
         /**表单 */
         form: QueryRequestData;
     }) => MPromise<SendProcData>, A>;
+    /**发送form-data包提供的表单数据  */
+    sendFormData(): UtilHttp<D, (opt: RequestOption, arg: {
+        /**form-data包提供的FormData表单数据 */
+        formdata: FormData;
+    }) => MPromise<SendProcData>, A>;
     /**发送文件 */
-    sendFile(): UtilHttp<D & {
-        headers: {
-            "Content-Type": "multipart/form-data";
-        };
-    }, (opt: RequestOption, arg: {
+    sendFile(): UtilHttp<D, (opt: RequestOption, arg: {
         /**文件路径 */
         filepath: string;
         /**文件名 */
@@ -268,7 +260,7 @@ export declare class UtilHttp<D extends Partial<RequestOption> & Required<Pick<R
     }) => MPromise<SendProcData>, A>;
     sendNone(): UtilHttp<D, typeof SendNoneProc, A>;
     /**自定的发送数据类型 */
-    sendRaw<T extends any[]>(proc: SendProcCtor<T>): UtilHttp<D, typeof proc, A>;
+    sendRaw<T extends {}>(proc: SendProcCtor<T>): UtilHttp<D, typeof proc, A>;
     /**发送请求
      * @param datas  - 数据对象
      */

package/dist/UtilHttp.js

@@ -268,26 +268,6 @@ class UtilHttp {
         this._send = sendProc;
         return this;
     }
-    /**发送form-data包提供的表单数据  */
-    sendFormData() {
-        const sendProc = (opt, arg) => {
-            const { method } = opt;
-            const isPost = (method == "POST");
-            opt.headers = arg.formdata.getHeaders();
-            return {
-                proc: (req) => {
-                    if (isPost)
-                        arg.formdata.pipe(req);
-                    else
-                        req.end();
-                }
-            };
-        };
-        this._send = sendProc;
-        this._data.headers ??= {};
-        this._data.headers['Content-Type'] = 'multipart/form-data';
-        return this;
-    }
     /**发送表单 */
     sendForm() {
         const snedProc = (opt, arg) => {
@@ -312,6 +292,27 @@ class UtilHttp {
         this._data.headers['Content-Type'] = 'application/x-www-form-urlencoded';
         return this;
     }
+    /**发送form-data包提供的表单数据  */
+    sendFormData() {
+        const sendProc = (opt, arg) => {
+            const { method } = opt;
+            const isPost = (method == "POST");
+            opt.headers = {
+                ...arg.formdata.getHeaders(),
+                ...opt.headers,
+            };
+            return {
+                proc: (req) => {
+                    if (isPost)
+                        arg.formdata.pipe(req);
+                    else
+                        req.end();
+                }
+            };
+        };
+        this._send = sendProc;
+        return this;
+    }
     /**发送文件 */
     sendFile() {
         const proc = (opt, arg) => {
@@ -321,7 +322,10 @@ class UtilHttp {
             const formData = new form_data_1.default();
             filename = filename ?? pathe_1.default.basename(filepath);
             formData.append(filename, fs_1.default.createReadStream(filepath));
-            opt.headers = formData.getHeaders();
+            opt.headers = {
+                ...formData.getHeaders(),
+                ...opt.headers
+            };
             return {
                 proc: req => {
                     if (isPost)
@@ -332,8 +336,6 @@ class UtilHttp {
             };
         };
         this._send = proc;
-        this._data.headers ??= {};
-        this._data.headers['Content-Type'] = 'multipart/form-data';
         return this;
     }
     sendNone() {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.248",
+	"version": "1.0.250",
 	"description": "my utils",
 	"main": "dist/index.js",
 	"scripts": {