add some code

Author: obpt123

example/WebProject1.Client.TypeScript/package.json

@@ -5,7 +5,8 @@
   "main": "index.js",
   "scripts": {
     "test": "jest",
-    "fetch": "download http://localhost:5077/rest-model/ts?SendFunctionImportModelName=../base > src/client/api.ts"
+    "fetch": "download http://localhost:5077/rest-model/ts?SendFunctionImportModelName=../base > src/client/api.ts",
+    "fetchTest": "download http://localhost:5077/rest-model/ts?SendFunctionImportModelName=../base > test/test.ts"
   },
   "author": "",
   "license": "ISC",

example/WebProject1.Client.TypeScript/src/base.ts

@@ -1,4 +1,4 @@
-import axios from 'axios';
+import axios, { AxiosRequestConfig } from 'axios';
 
 export interface RestInfo {
     url: string,
@@ -14,10 +14,18 @@ axios.defaults.timeout = 100000;
 
 const multipartFormDataHeader = { 'Content-type': 'multipart/form-data' };
 const applicationJsonDataHeader = { 'Content-type': 'application/json' }
+const formUrlEncodedHeader = { 'Content-type': 'application/x-www-form-urlencoded' }
 
 function paramsSerializer(params: any): string {
-    let entries = Object.entries(params || {}).flatMap(([k, v]) =>
-        Array.isArray(v) ? v.map(t => [k, t]) : [[k, v]]
+    let entries = Object.entries(params || {}).flatMap(([k, v]) => {
+        if (Array.isArray(v)) {
+            return v.map(t => [k, t]);
+        } else if (v instanceof Object) {
+           return Object.entries(v);
+        } else {
+            return [[k, v]];
+        }
+    }
     );
     let segments = entries.map(p => `${p[0]}=${encodeURIComponent(p[1] ?? '')}`);
     return segments.join('&');
@@ -26,27 +34,55 @@ function buildFormData(forms: any) {
     let formData = new FormData();
     Object.entries(forms).forEach(([k, v]) => {
         if (v instanceof Blob) {
-
+            formData.append(k, v);
         } else {
-
+            formData.append(k, String(v));
         }
     });
     return formData;
 }
 
 export async function send<T>(req: RestInfo): Promise<T> {
-    let reqInfo = {
+    let reqInfo = req.forms ? (
+        req.method.toLowerCase() === "get" ? buildUrlEncodedFormRequest(req)
+            : buildMultipartFormDataFormRequest(req))
+        : buildCommonRequest(req);
+    const res = await axios.request(reqInfo);
+    return res.data;
+}
+function buildUrlEncodedFormRequest(req: RestInfo): AxiosRequestConfig<any> {
+    return {
+        url: req.url,
+        method: req.method,
+        headers: { ...formUrlEncodedHeader, ...req.headers },
+        params: { ...req.params, ...req.forms },
+        paramsSerializer: {
+            serialize: paramsSerializer
+        }
+    }
+}
+function buildMultipartFormDataFormRequest(req: RestInfo): AxiosRequestConfig<any> {
+    return {
         url: req.url,
         method: req.method,
-        headers: req.forms ? { ...multipartFormDataHeader, ...req.headers } : { ...applicationJsonDataHeader, ...req.headers },
+        headers: { ...multipartFormDataHeader, ...req.headers },
         params: req.params,
-        data: req.forms ? req.forms : req.body,
-
+        data: req.forms,
         paramsSerializer: {
             serialize: paramsSerializer
-        },
-
+        }
     }
-    const res = await axios.request(reqInfo);
-    return res.data;
 }
+function buildCommonRequest(req: RestInfo): AxiosRequestConfig<any> {
+    return {
+        url: req.url,
+        method: req.method,
+        headers: { ...applicationJsonDataHeader, ...req.headers },
+        params: req.params,
+        data: req.body,
+        paramsSerializer: {
+            serialize: paramsSerializer
+        },
+    };
+}
+